com php-src: Remove cURL close policy related constants: ext/curl/interface.c
| From: | rdlowrey@php.net | Date: | Wed, 26 Feb 2014 17:48:14 +0000 |
| Subject: | com php-src: Remove cURL close policy related constants: ext/curl/interface.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76239@lists.php.net to get a copy of this message | ||
Commit: afc24da436da20843e024538f03479df42d46ee3
Author: Chris Wright <daverandom@php.net> Wed, 26 Feb 2014 17:48:14 +0000
Parents: 96d0bb7bcab6bba97838bff6178b5f9d25c955cc
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=afc24da436da20843e024538f03479df42d46ee3
Log:
Remove cURL close policy related constants
These options don't do anything and they never have.
Refs:
http://curl.haxx.se/libcurl/c/curl_easy_setopt.html#CURLOPTCLOSEPOLICY
http://curl.haxx.se/mail/lib-2006-11/0301.html
Changed paths:
M ext/curl/interface.c
Diff:
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index a9282ec..0aa91c6 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: