aboutsummaryrefslogtreecommitdiffstats
path: root/mod/dfrn_confirm.php
diff options
context:
space:
mode:
authorroot <root@diekershoff.homeunix.net>2010-12-12 10:34:34 +0100
committerroot <root@diekershoff.homeunix.net>2010-12-12 10:34:34 +0100
commit2e9dca7c9f0e50956723505ad576bf32e762d11e (patch)
treedbe956c31285682bc620ccb7c5f03f2e3785c6e7 /mod/dfrn_confirm.php
parent037cd5d80993dedfccfe9ef25679c54297ef1546 (diff)
parenta50343830f87966b5857be295633d8dff576931a (diff)
downloadvolse-hubzilla-2e9dca7c9f0e50956723505ad576bf32e762d11e.tar.gz
volse-hubzilla-2e9dca7c9f0e50956723505ad576bf32e762d11e.tar.bz2
volse-hubzilla-2e9dca7c9f0e50956723505ad576bf32e762d11e.zip
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'mod/dfrn_confirm.php')
-rw-r--r--mod/dfrn_confirm.php10
1 files changed, 9 insertions, 1 deletions
diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index 7018bf52b..c20770481 100644
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -201,7 +201,15 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
logger('dfrn_confirm: Confirm: posting data to ' . $dfrn_confirm . ': ' . print_r($params,true), LOGGER_DATA);
- // POST all this stuff to the other site.
+ /**
+ *
+ * POST all this stuff to the other site.
+ * Temporarily raise the network timeout to 120 seconds because the default 60
+ * doesn't always give the other side quite enough time to decrypt everything.
+ *
+ */
+
+ $a->config['system']['curl_timeout'] = 120;
$res = post_url($dfrn_confirm,$params);