diff options
author | Mario Vavti <mario@mariovavti.com> | 2016-06-28 11:09:22 +0200 |
---|---|---|
committer | Mario Vavti <mario@mariovavti.com> | 2016-06-28 11:09:22 +0200 |
commit | 9f576369a97009bc93f4f724f85024410c3899df (patch) | |
tree | adc2c68e8729ff783eca9cd259bc5b8fe394d2e6 /include/network.php | |
parent | 911510f9996dc43bd3440884325326b7e99ea12f (diff) | |
parent | 7d7f43c2056fd50ff26aed5df553bf4936ead196 (diff) | |
download | volse-hubzilla-9f576369a97009bc93f4f724f85024410c3899df.tar.gz volse-hubzilla-9f576369a97009bc93f4f724f85024410c3899df.tar.bz2 volse-hubzilla-9f576369a97009bc93f4f724f85024410c3899df.zip |
Merge branch 'dev' into sabre32
Diffstat (limited to 'include/network.php')
-rw-r--r-- | include/network.php | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/network.php b/include/network.php index 96bf714f6..47863b680 100644 --- a/include/network.php +++ b/include/network.php @@ -101,6 +101,9 @@ function z_fetch_url($url, $binary = false, $redirects = 0, $opts = array()) { if(x($opts,'cookiefile')) @curl_setopt($ch, CURLOPT_COOKIEFILE, $opts['cookiefile']); + if(x($opts,'cookie')) + @curl_setopt($ch, CURLOPT_COOKIE, $opts['cookie']); + @curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, ((x($opts,'novalidate') && intval($opts['novalidate'])) ? false : true)); @@ -258,6 +261,10 @@ function z_post_url($url,$params, $redirects = 0, $opts = array()) { if(x($opts,'cookiefile')) @curl_setopt($ch, CURLOPT_COOKIEFILE, $opts['cookiefile']); + + if(x($opts,'cookie')) + @curl_setopt($ch, CURLOPT_COOKIE, $opts['cookie']); + @curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, ((x($opts,'novalidate') && intval($opts['novalidate'])) ? false : true)); |