aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-07-04 15:45:01 -0700
committerFriendika <info@friendika.com>2011-07-04 15:45:01 -0700
commit308ffe500a7ea4a2e9c55565b0bc7510b4e8bb26 (patch)
tree74eb544db76b261927c106ea919a309b22104b88
parent246b0f1efeeefba94e477bc4a06c566591cd8bb2 (diff)
parent300f59ff3e8bc56e8a17cb30c915fcd8ec2c8877 (diff)
downloadvolse-hubzilla-308ffe500a7ea4a2e9c55565b0bc7510b4e8bb26.tar.gz
volse-hubzilla-308ffe500a7ea4a2e9c55565b0bc7510b4e8bb26.tar.bz2
volse-hubzilla-308ffe500a7ea4a2e9c55565b0bc7510b4e8bb26.zip
Merge branch 'pull'
-rw-r--r--boot.php11
1 files changed, 9 insertions, 2 deletions
diff --git a/boot.php b/boot.php
index 97ea42ff0..97aee73cd 100644
--- a/boot.php
+++ b/boot.php
@@ -756,8 +756,15 @@ function post_url($url,$params, $headers = null, &$redirects = 0) {
$curl_time = intval(get_config('system','curl_timeout'));
curl_setopt($ch, CURLOPT_TIMEOUT, (($curl_time !== false) ? $curl_time : 60));
- if(is_array($headers))
- curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
+ if(!is_array($headers)) {
+ $headers = array('Expect:');
+ } else {
+ if(!in_array('Expect:', $headers)) {
+ array_push($headers, 'Expect:');
+ }
+ }
+
+ curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
$check_cert = get_config('system','verifyssl');
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, (($check_cert) ? true : false));