diff options
| author | Daniel Lowrey <rdlowrey@php.net> | 2014-02-26 13:29:10 -0700 |
|---|---|---|
| committer | Daniel Lowrey <rdlowrey@php.net> | 2014-02-26 13:40:16 -0700 |
| commit | 4b06e0a2d089997868a026e35094998c3a3c4d39 (patch) | |
| tree | 255dc1b5195b52fdc54ea753ef201b2618d3af15 | |
| parent | d0a6f8c68ec1044e936735f28bdc1bbd35f81362 (diff) | |
| parent | afc24da436da20843e024538f03479df42d46ee3 (diff) | |
| download | php-git-4b06e0a2d089997868a026e35094998c3a3c4d39.tar.gz | |
Merge branch 'curlClosePolicy' of https://github.com/DaveRandom/php-src into PHP-5.6
* 'curlClosePolicy' of https://github.com/DaveRandom/php-src:
Remove cURL close policy related constants
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | ext/curl/interface.c | 9 |
2 files changed, 2 insertions, 9 deletions
@@ -12,6 +12,8 @@ PHP NEWS - Curl . Check for openssl.cafile ini directive when loading CA certs. (Daniel Lowrey) + . Remove cURL close policy related constants as these have no effect and are + no longer used in libcurl. (Chris Wright) - Fileinfo . Upgraded to libmagic-5.17 (Anatol) diff --git a/ext/curl/interface.c b/ext/curl/interface.c index a9282ec95a..0aa91c6a15 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -621,7 +621,6 @@ PHP_MINIT_FUNCTION(curl) REGISTER_CURL_CONSTANT(CURLOPT_BUFFERSIZE); REGISTER_CURL_CONSTANT(CURLOPT_CAINFO); REGISTER_CURL_CONSTANT(CURLOPT_CAPATH); - REGISTER_CURL_CONSTANT(CURLOPT_CLOSEPOLICY); REGISTER_CURL_CONSTANT(CURLOPT_CONNECTTIMEOUT); REGISTER_CURL_CONSTANT(CURLOPT_COOKIE); REGISTER_CURL_CONSTANT(CURLOPT_COOKIEFILE); @@ -711,13 +710,6 @@ PHP_MINIT_FUNCTION(curl) REGISTER_CURL_CONSTANT(CURLOPT_WRITEFUNCTION); REGISTER_CURL_CONSTANT(CURLOPT_WRITEHEADER); - /* Constants effecting the way CURLOPT_CLOSEPOLICY works */ - REGISTER_CURL_CONSTANT(CURLCLOSEPOLICY_CALLBACK); - REGISTER_CURL_CONSTANT(CURLCLOSEPOLICY_LEAST_RECENTLY_USED); - REGISTER_CURL_CONSTANT(CURLCLOSEPOLICY_LEAST_TRAFFIC); - REGISTER_CURL_CONSTANT(CURLCLOSEPOLICY_OLDEST); - REGISTER_CURL_CONSTANT(CURLCLOSEPOLICY_SLOWEST); - /* */ REGISTER_CURL_CONSTANT(CURLE_ABORTED_BY_CALLBACK); REGISTER_CURL_CONSTANT(CURLE_BAD_CALLING_ORDER); @@ -2079,7 +2071,6 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu } case CURLOPT_AUTOREFERER: case CURLOPT_BUFFERSIZE: - case CURLOPT_CLOSEPOLICY: case CURLOPT_CONNECTTIMEOUT: case CURLOPT_COOKIESESSION: case CURLOPT_CRLF: |