summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Foster <savetheinternet@tinyboard.org>2013-08-19 18:54:10 +1000
committerMichael Foster <savetheinternet@tinyboard.org>2013-08-19 18:54:10 +1000
commite45ffb8592cacecb90443dc77f09f9a9823a029f (patch)
treec8e62e181aa313cd5f19dd179d3790648d7c42b2
parentc8fcba943958f736582838591f5632cb214e0f15 (diff)
custom timeouet for curl'ing upload urls
-rw-r--r--inc/config.php2
-rw-r--r--post.php2
2 files changed, 3 insertions, 1 deletions
diff --git a/inc/config.php b/inc/config.php
index fbe20d3e..ae45a746 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -355,6 +355,8 @@
// Allow "uploading" images via URL as well. Users can enter the URL of the image and then Tinyboard will
// download it. Not usually recommended.
$config['allow_upload_by_url'] = false;
+ // The timeout for the above, in seconds.
+ $config['upload_by_url_timeout'] = 15;
// A wordfilter (sometimes referred to as just a "filter" or "censor") automatically scans users’ posts
// as they are submitted and changes or censors particular words or phrases.
diff --git a/post.php b/post.php
index 02d97e24..df7fe435 100644
--- a/post.php
+++ b/post.php
@@ -291,7 +291,7 @@ if (isset($_POST['delete'])) {
curl_setopt($curl, CURLOPT_FAILONERROR, true);
curl_setopt($curl, CURLOPT_FOLLOWLOCATION, false);
curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, 5);
- curl_setopt($curl, CURLOPT_TIMEOUT, 15);
+ curl_setopt($curl, CURLOPT_TIMEOUT, $config['upload_by_url_timeout']);
curl_setopt($curl, CURLOPT_USERAGENT, 'Tinyboard');
curl_setopt($curl, CURLOPT_BINARYTRANSFER, true);
curl_setopt($curl, CURLOPT_FILE, $fp);