add a whole bunch of constants that make the interface somewhat up-to-date.

diff --git a/ext/curl/curl.c b/ext/curl/curl.c
index e3f42f8038e7f2b6d72f98b5d875dc6d41ee249a..639dd668b7fda5a9748e00e4a80e51771d578d64 100644 (file)
--- a/ext/curl/curl.c
+++ b/ext/curl/curl.c
@@ -179,9 +179,21 @@ PHP_MINIT_FUNCTION(curl)
        REGISTER_CURL_CONSTANT(CURLOPT_CONNECTTIMEOUT);
        REGISTER_CURL_CONSTANT(CURLOPT_SSL_VERIFYPEER);
        REGISTER_CURL_CONSTANT(CURLOPT_CAINFO);
+       REGISTER_CURL_CONSTANT(CURLOPT_CAPATH);
        REGISTER_CURL_CONSTANT(CURLOPT_COOKIEJAR);
        REGISTER_CURL_CONSTANT(CURLOPT_SSL_CIPHER_LIST);
        REGISTER_CURL_CONSTANT(CURLOPT_BINARYTRANSFER);
+       REGISTER_CURL_CONSTANT(CURLOPT_NOSIGNAL);
+       REGISTER_CURL_CONSTANT(CURLOPT_PROXYTYPE);
+       REGISTER_CURL_CONSTANT(CURLOPT_BUFFERSIZE);
+       REGISTER_CURL_CONSTANT(CURLOPT_HTTPGET);
+       REGISTER_CURL_CONSTANT(CURLOPT_HTTP_VERSION);
+       REGISTER_CURL_CONSTANT(CURLOPT_SSLKEY);
+       REGISTER_CURL_CONSTANT(CURLOPT_SSLKEYTYPE);
+       REGISTER_CURL_CONSTANT(CURLOPT_SSLKEYPASSWD);
+       REGISTER_CURL_CONSTANT(CURLOPT_SSLENGINE);
+       REGISTER_CURL_CONSTANT(CURLOPT_SSLENGINE_DEFAULT);
+       REGISTER_CURL_CONSTANT(CURLOPT_CRLF);
        
        /* Constants effecting the way CURLOPT_CLOSEPOLICY works */
        REGISTER_CURL_CONSTANT(CURLCLOSEPOLICY_LEAST_RECENTLY_USED);
@@ -275,6 +287,18 @@ PHP_MINIT_FUNCTION(curl)
        REGISTER_CURL_CONSTANT(CURLE_OBSOLETE);
        REGISTER_CURL_CONSTANT(CURLE_SSL_PEER_CERTIFICATE);
 
+       REGISTER_CURL_CONSTANT(CURLPROXY_HTTP);
+       REGISTER_CURL_CONSTANT(CURLPROXY_SOCKS5);
+
+       REGISTER_CURL_CONSTANT(CURL_NETRC_OPTIONAL);
+       REGISTER_CURL_CONSTANT(CURL_NETRC_IGNORED);
+       REGISTER_CURL_CONSTANT(CURL_NETRC_REQUIRED);
+
+       REGISTER_CURL_CONSTANT(CURL_HTTP_VERSION_NONE);
+       REGISTER_CURL_CONSTANT(CURL_HTTP_VERSION_1_0);
+       REGISTER_CURL_CONSTANT(CURL_HTTP_VERSION_1_1);
+       
+       
        if (curl_global_init(CURL_GLOBAL_SSL) != CURLE_OK) {
                return FAILURE;
        }
@@ -728,6 +752,12 @@ PHP_FUNCTION(curl_setopt)
                case CURLOPT_SSL_VERIFYHOST:
                case CURLOPT_SSL_VERIFYPEER:
                case CURLOPT_DNS_USE_GLOBAL_CACHE:
+               case CURLOPT_NOSIGNAL:
+               case CURLOPT_PROXYTYPE:
+               case CURLOPT_BUFFERSIZE:
+               case CURLOPT_HTTPGET:
+               case CURLOPT_HTTP_VERSION:
+               case CURLOPT_CRLF:
                        convert_to_long_ex(zvalue);
                        error = curl_easy_setopt(ch->cp, option, Z_LVAL_PP(zvalue));
                        break;
@@ -740,8 +770,6 @@ PHP_FUNCTION(curl_setopt)
                case CURLOPT_USERAGENT:
                case CURLOPT_FTPPORT:
                case CURLOPT_COOKIE:
-               case CURLOPT_SSLCERT:
-               case CURLOPT_SSLCERTPASSWD:
                case CURLOPT_COOKIEFILE:
                case CURLOPT_REFERER:
                case CURLOPT_INTERFACE:
@@ -749,8 +777,14 @@ PHP_FUNCTION(curl_setopt)
                case CURLOPT_RANDOM_FILE:
                case CURLOPT_EGDSOCKET:
                case CURLOPT_CAINFO: 
+               case CURLOPT_CAPATH:
                case CURLOPT_COOKIEJAR:
-               case CURLOPT_SSL_CIPHER_LIST: {
+               case CURLOPT_SSL_CIPHER_LIST: 
+               case CURLOPT_SSLKEY:
+               case CURLOPT_SSLKEYTYPE: 
+               case CURLOPT_SSLKEYPASSWD: 
+               case CURLOPT_SSLENGINE: 
+               case CURLOPT_SSLENGINE_DEFAULT: {
                        char *copystr = NULL;
        
                        convert_to_string_ex(zvalue);