|
|
@@ -72,24 +72,9 @@ class Zend_Http_Client_Adapter_Curl implements Zend_Http_Client_Adapter_Interfac
|
|
|
* List of cURL options that should never be overwritten
|
|
|
*
|
|
|
* @var array
|
|
|
+ * @group ZF-9784
|
|
|
*/
|
|
|
- protected $_invalidOverwritableCurlOptions = array(
|
|
|
- CURLOPT_HTTPGET,
|
|
|
- CURLOPT_POST,
|
|
|
- CURLOPT_PUT,
|
|
|
- CURLOPT_CUSTOMREQUEST,
|
|
|
- CURLOPT_HEADER,
|
|
|
- CURLOPT_RETURNTRANSFER,
|
|
|
- CURLOPT_HTTPHEADER,
|
|
|
- CURLOPT_POSTFIELDS,
|
|
|
- CURLOPT_INFILE,
|
|
|
- CURLOPT_INFILESIZE,
|
|
|
- CURLOPT_PORT,
|
|
|
- CURLOPT_MAXREDIRS,
|
|
|
- CURLOPT_CONNECTTIMEOUT,
|
|
|
- CURL_HTTP_VERSION_1_1,
|
|
|
- CURL_HTTP_VERSION_1_0,
|
|
|
- );
|
|
|
+ protected $_invalidOverwritableCurlOptions;
|
|
|
|
|
|
/**
|
|
|
* Response gotten from server
|
|
|
@@ -119,6 +104,26 @@ class Zend_Http_Client_Adapter_Curl implements Zend_Http_Client_Adapter_Interfac
|
|
|
require_once 'Zend/Http/Client/Adapter/Exception.php';
|
|
|
throw new Zend_Http_Client_Adapter_Exception('cURL extension has to be loaded to use this Zend_Http_Client adapter.');
|
|
|
}
|
|
|
+ /**
|
|
|
+ * @fix ZF-9784
|
|
|
+ */
|
|
|
+ $this->_invalidOverwritableCurlOptions = array(
|
|
|
+ CURLOPT_HTTPGET,
|
|
|
+ CURLOPT_POST,
|
|
|
+ CURLOPT_PUT,
|
|
|
+ CURLOPT_CUSTOMREQUEST,
|
|
|
+ CURLOPT_HEADER,
|
|
|
+ CURLOPT_RETURNTRANSFER,
|
|
|
+ CURLOPT_HTTPHEADER,
|
|
|
+ CURLOPT_POSTFIELDS,
|
|
|
+ CURLOPT_INFILE,
|
|
|
+ CURLOPT_INFILESIZE,
|
|
|
+ CURLOPT_PORT,
|
|
|
+ CURLOPT_MAXREDIRS,
|
|
|
+ CURLOPT_CONNECTTIMEOUT,
|
|
|
+ CURL_HTTP_VERSION_1_1,
|
|
|
+ CURL_HTTP_VERSION_1_0,
|
|
|
+ );
|
|
|
}
|
|
|
|
|
|
/**
|