]> granicus.if.org Git - php/commitdiff
Remove cURL close policy related constants
authorChris Wright <daverandom@php.net>
Wed, 26 Feb 2014 17:48:14 +0000 (17:48 +0000)
committerChris Wright <daverandom@php.net>
Wed, 26 Feb 2014 17:48:14 +0000 (17:48 +0000)
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

ext/curl/interface.c

index a9282ec95aed413cba66aad8224d137a6565a199..0aa91c6a150e4e1010beb9c8cfedb44c24ba6608 100644 (file)
@@ -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: