]> granicus.if.org Git - php/commitdiff
Clean / Improve the curl extension
authorPierrick Charron <pierrick@php.net>
Thu, 1 Dec 2011 21:48:07 +0000 (21:48 +0000)
committerPierrick Charron <pierrick@php.net>
Thu, 1 Dec 2011 21:48:07 +0000 (21:48 +0000)
# NEWS file will come soon

ext/curl/config.m4
ext/curl/config.w32
ext/curl/curl.dsp
ext/curl/interface.c
ext/curl/package.xml
ext/curl/php_curl.h
ext/curl/share.c [new file with mode: 0644]
ext/curl/tests/curl_escape.phpt [new file with mode: 0644]
ext/curl/tests/curl_reset.phpt [new file with mode: 0644]

index fbb4f5b4e59def310f4d23c073e183415a8aeb48..19d3e59c477af24379ce6d078ee64fa07b009f12 100644 (file)
@@ -156,6 +156,6 @@ int main(int argc, char *argv[])
     AC_DEFINE(PHP_CURL_URL_WRAPPERS,1,[ ])
   fi
 
-  PHP_NEW_EXTENSION(curl, interface.c multi.c streams.c, $ext_shared)
+  PHP_NEW_EXTENSION(curl, interface.c multi.c share.c streams.c, $ext_shared)
   PHP_SUBST(CURL_SHARED_LIBADD)
 fi
index 930adcfd412e79d7559cfb2e0ca9d654528b1e4d..0d18318288c55ddb0e0dbcac84ef2326572d60c3 100644 (file)
@@ -13,7 +13,7 @@ if (PHP_CURL != "no") {
                && (((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib;zlib.lib", "curl", PHP_CURL))) || 
                        (PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "curl", PHP_CURL)) || (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED)))
                ) {
-               EXTENSION("curl", "interface.c multi.c streams.c", true);
+               EXTENSION("curl", "interface.c multi.c share.c streams.c", true);
                AC_DEFINE('HAVE_CURL', 1, 'Have cURL library');
                AC_DEFINE('HAVE_CURL_SSL', 1, 'Have SSL suppurt in cURL');
                AC_DEFINE('HAVE_CURL_EASY_STRERROR', 1, 'Have curl_easy_strerror in cURL');
index 81d823183d28a00b99c40a4464236e52740301bb..6524fceb899748c71e2f9179f9875f6c4e515ac2 100644 (file)
@@ -165,6 +165,10 @@ SOURCE=.\interface.c
 SOURCE=.\multi.c\r
 # End Source File\r
 \r
+# Begin Source File\r
+SOURCE=.\share.c\r
+# End Source File\r
+\r
 # Begin Source File\r
 SOURCE=.\streams.c\r
 # End Source File\r
index 176a7fea929d7965769006e026ec00e1e196121e..f96641a30732c2024f5a4e3f067716c712390464 100644 (file)
@@ -90,6 +90,7 @@
 
 int  le_curl;
 int  le_curl_multi_handle;
+int  le_curl_share_handle;
 
 #ifdef PHP_CURL_NEED_OPENSSL_TSL /* {{{ */
 static MUTEX_T *php_curl_openssl_tsl = NULL;
@@ -313,6 +314,24 @@ ZEND_BEGIN_ARG_INFO(arginfo_curl_close, 0)
        ZEND_ARG_INFO(0, ch)
 ZEND_END_ARG_INFO()
 
+#if LIBCURL_VERSION_NUM >= 0x070c01 /* 7.12.1 */
+ZEND_BEGIN_ARG_INFO(arginfo_curl_reset, 0)
+       ZEND_ARG_INFO(0, ch)
+ZEND_END_ARG_INFO()    
+#endif
+
+#if LIBCURL_VERSION_NUM > 0x070f03 /* 7.15.4 */
+ZEND_BEGIN_ARG_INFO(arginfo_curl_escape, 0)
+       ZEND_ARG_INFO(0, ch)
+       ZEND_ARG_INFO(0, str)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO(arginfo_curl_unescape, 0)
+       ZEND_ARG_INFO(0, ch)
+       ZEND_ARG_INFO(0, str)
+ZEND_END_ARG_INFO()
+#endif
+
 ZEND_BEGIN_ARG_INFO(arginfo_curl_multi_init, 0)
 ZEND_END_ARG_INFO()
 
@@ -348,6 +367,19 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_INFO(arginfo_curl_multi_close, 0)
        ZEND_ARG_INFO(0, mh)
 ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO(arginfo_curl_share_init, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO(arginfo_curl_share_close, 0)
+       ZEND_ARG_INFO(0, sh)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO(arginfo_curl_share_setopt, 0)
+       ZEND_ARG_INFO(0, sh)
+       ZEND_ARG_INFO(0, option)
+       ZEND_ARG_INFO(0, value)
+ZEND_END_ARG_INFO()
 /* }}} */
 
 /* {{{ curl_functions[]
@@ -363,6 +395,13 @@ const zend_function_entry curl_functions[] = {
        PHP_FE(curl_error,               arginfo_curl_error)
        PHP_FE(curl_errno,               arginfo_curl_errno)
        PHP_FE(curl_close,               arginfo_curl_close)
+#if LIBCURL_VERSION_NUM >= 0x070c01 /* 7.12.1 */
+       PHP_FE(curl_reset,               arginfo_curl_reset)
+#endif
+#if LIBCURL_VERSION_NUM >= 0x070f04 /* 7.15.4 */
+       PHP_FE(curl_escape,              arginfo_curl_escape)
+       PHP_FE(curl_unescape,            arginfo_curl_unescape)
+#endif
        PHP_FE(curl_multi_init,          arginfo_curl_multi_init)
        PHP_FE(curl_multi_add_handle,    arginfo_curl_multi_add_handle)
        PHP_FE(curl_multi_remove_handle, arginfo_curl_multi_remove_handle)
@@ -371,6 +410,9 @@ const zend_function_entry curl_functions[] = {
        PHP_FE(curl_multi_getcontent,    arginfo_curl_multi_getcontent)
        PHP_FE(curl_multi_info_read,     arginfo_curl_multi_info_read)
        PHP_FE(curl_multi_close,         arginfo_curl_multi_close)
+       PHP_FE(curl_share_init,          arginfo_curl_share_init)
+       PHP_FE(curl_share_close,         arginfo_curl_share_close)
+       PHP_FE(curl_share_setopt,        arginfo_curl_share_setopt)
        PHP_FE_END
 };
 /* }}} */
@@ -527,6 +569,7 @@ PHP_MINIT_FUNCTION(curl)
 {
        le_curl = zend_register_list_destructors_ex(_php_curl_close, NULL, "curl", module_number);
        le_curl_multi_handle = zend_register_list_destructors_ex(_php_curl_multi_close, NULL, "curl_multi", module_number);
+       le_curl_share_handle = zend_register_list_destructors_ex(_php_curl_share_close, NULL, "curl_share", module_number);
 
        REGISTER_INI_ENTRIES();
 
@@ -535,458 +578,508 @@ PHP_MINIT_FUNCTION(curl)
           of options and which version they were introduced */
 
        /* Constants for curl_setopt() */
-#if LIBCURL_VERSION_NUM > 0x070a07 /* CURLOPT_IPRESOLVE and CURLOPT_FTP_RESPONSE_TIMEOUT are available since curl 7.10.8 */
-       REGISTER_CURL_CONSTANT(CURLOPT_IPRESOLVE);
-       REGISTER_CURL_CONSTANT(CURL_IPRESOLVE_WHATEVER);
-       REGISTER_CURL_CONSTANT(CURL_IPRESOLVE_V4);
-       REGISTER_CURL_CONSTANT(CURL_IPRESOLVE_V6);
-       REGISTER_CURL_CONSTANT(CURLOPT_FTP_RESPONSE_TIMEOUT);
-#endif
-       REGISTER_CURL_CONSTANT(CURLOPT_DNS_USE_GLOBAL_CACHE);
+       REGISTER_CURL_CONSTANT(CURLOPT_AUTOREFERER);
+       REGISTER_CURL_CONSTANT(CURLOPT_BINARYTRANSFER);
+       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);
+       REGISTER_CURL_CONSTANT(CURLOPT_COOKIEJAR);
+       REGISTER_CURL_CONSTANT(CURLOPT_COOKIESESSION);
+       REGISTER_CURL_CONSTANT(CURLOPT_CRLF);
+       REGISTER_CURL_CONSTANT(CURLOPT_CUSTOMREQUEST);
        REGISTER_CURL_CONSTANT(CURLOPT_DNS_CACHE_TIMEOUT);
-       REGISTER_CURL_CONSTANT(CURLOPT_PORT);
+       REGISTER_CURL_CONSTANT(CURLOPT_DNS_USE_GLOBAL_CACHE);
+       REGISTER_CURL_CONSTANT(CURLOPT_EGDSOCKET);
+       REGISTER_CURL_CONSTANT(CURLOPT_ENCODING);
+       REGISTER_CURL_CONSTANT(CURLOPT_FAILONERROR);
        REGISTER_CURL_CONSTANT(CURLOPT_FILE);
-       REGISTER_CURL_CONSTANT(CURLOPT_READDATA);
-       REGISTER_CURL_CONSTANT(CURLOPT_INFILE);
-       REGISTER_CURL_CONSTANT(CURLOPT_INFILESIZE);
-       REGISTER_CURL_CONSTANT(CURLOPT_URL);
-       REGISTER_CURL_CONSTANT(CURLOPT_PROXY);
-       REGISTER_CURL_CONSTANT(CURLOPT_VERBOSE);
+       REGISTER_CURL_CONSTANT(CURLOPT_FILETIME);
+       REGISTER_CURL_CONSTANT(CURLOPT_FOLLOWLOCATION);
+       REGISTER_CURL_CONSTANT(CURLOPT_FORBID_REUSE);
+       REGISTER_CURL_CONSTANT(CURLOPT_FRESH_CONNECT);
+       REGISTER_CURL_CONSTANT(CURLOPT_FTPAPPEND);
+       REGISTER_CURL_CONSTANT(CURLOPT_FTPLISTONLY);
+       REGISTER_CURL_CONSTANT(CURLOPT_FTPPORT);
+       REGISTER_CURL_CONSTANT(CURLOPT_FTP_USE_EPRT);
+       REGISTER_CURL_CONSTANT(CURLOPT_FTP_USE_EPSV);
        REGISTER_CURL_CONSTANT(CURLOPT_HEADER);
+       REGISTER_CURL_CONSTANT(CURLOPT_HEADERFUNCTION);
+       REGISTER_CURL_CONSTANT(CURLOPT_HTTP200ALIASES);
+       REGISTER_CURL_CONSTANT(CURLOPT_HTTPGET);
        REGISTER_CURL_CONSTANT(CURLOPT_HTTPHEADER);
-       REGISTER_CURL_CONSTANT(CURLOPT_NOPROGRESS);
-       REGISTER_CURL_CONSTANT(CURLOPT_PROGRESSFUNCTION);
+       REGISTER_CURL_CONSTANT(CURLOPT_HTTPPROXYTUNNEL);
+       REGISTER_CURL_CONSTANT(CURLOPT_HTTP_VERSION);
+       REGISTER_CURL_CONSTANT(CURLOPT_INFILE);
+       REGISTER_CURL_CONSTANT(CURLOPT_INFILESIZE);
+       REGISTER_CURL_CONSTANT(CURLOPT_INTERFACE);
+       REGISTER_CURL_CONSTANT(CURLOPT_KRB4LEVEL);
+       REGISTER_CURL_CONSTANT(CURLOPT_LOW_SPEED_LIMIT);
+       REGISTER_CURL_CONSTANT(CURLOPT_LOW_SPEED_TIME);
+       REGISTER_CURL_CONSTANT(CURLOPT_MAXCONNECTS);
+       REGISTER_CURL_CONSTANT(CURLOPT_MAXREDIRS);
+       REGISTER_CURL_CONSTANT(CURLOPT_NETRC);
        REGISTER_CURL_CONSTANT(CURLOPT_NOBODY);
-       REGISTER_CURL_CONSTANT(CURLOPT_FAILONERROR);
-       REGISTER_CURL_CONSTANT(CURLOPT_UPLOAD);
+       REGISTER_CURL_CONSTANT(CURLOPT_NOPROGRESS);
+       REGISTER_CURL_CONSTANT(CURLOPT_NOSIGNAL);
+       REGISTER_CURL_CONSTANT(CURLOPT_PORT);
        REGISTER_CURL_CONSTANT(CURLOPT_POST);
-       REGISTER_CURL_CONSTANT(CURLOPT_FTPLISTONLY);
-       REGISTER_CURL_CONSTANT(CURLOPT_FTPAPPEND);
-#if LIBCURL_VERSION_NUM >= 0x071100 /* Available since 7.17.0 */
-       REGISTER_CURL_CONSTANT(CURLOPT_APPEND);
-       REGISTER_CURL_CONSTANT(CURLOPT_DIRLISTONLY);
-       REGISTER_CURL_CONSTANT(CURLOPT_NEW_DIRECTORY_PERMS);
-       REGISTER_CURL_CONSTANT(CURLOPT_NEW_FILE_PERMS);
-#endif 
-       REGISTER_CURL_CONSTANT(CURLOPT_NETRC);
-#if LIBCURL_VERSION_NUM >= 0x070b00 /* Option available since 7.11.0 */
-       REGISTER_CURL_CONSTANT(CURLOPT_NETRC_FILE);
-#endif 
-       REGISTER_CURL_CONSTANT(CURLOPT_FOLLOWLOCATION);
-#if CURLOPT_FTPASCII != 0
-       REGISTER_CURL_CONSTANT(CURLOPT_FTPASCII);
-#endif
-       REGISTER_CURL_CONSTANT(CURLOPT_PUT);
-#if CURLOPT_MUTE != 0
-       REGISTER_CURL_CONSTANT(CURLOPT_MUTE);
-#endif
-       REGISTER_CURL_CONSTANT(CURLOPT_USERPWD);
+       REGISTER_CURL_CONSTANT(CURLOPT_POSTFIELDS);
+       REGISTER_CURL_CONSTANT(CURLOPT_POSTQUOTE);
+       REGISTER_CURL_CONSTANT(CURLOPT_PREQUOTE);
+       REGISTER_CURL_CONSTANT(CURLOPT_PRIVATE);
+       REGISTER_CURL_CONSTANT(CURLOPT_PROGRESSFUNCTION);
+       REGISTER_CURL_CONSTANT(CURLOPT_PROXY);
+       REGISTER_CURL_CONSTANT(CURLOPT_PROXYPORT);
+       REGISTER_CURL_CONSTANT(CURLOPT_PROXYTYPE);
        REGISTER_CURL_CONSTANT(CURLOPT_PROXYUSERPWD);
+       REGISTER_CURL_CONSTANT(CURLOPT_PUT);
+       REGISTER_CURL_CONSTANT(CURLOPT_QUOTE);
+       REGISTER_CURL_CONSTANT(CURLOPT_RANDOM_FILE);
        REGISTER_CURL_CONSTANT(CURLOPT_RANGE);
-       REGISTER_CURL_CONSTANT(CURLOPT_TIMEOUT);
-#if LIBCURL_VERSION_NUM > 0x071002
-       REGISTER_CURL_CONSTANT(CURLOPT_TIMEOUT_MS);
-#endif
-       REGISTER_CURL_CONSTANT(CURLOPT_POSTFIELDS);
+       REGISTER_CURL_CONSTANT(CURLOPT_READDATA);
+       REGISTER_CURL_CONSTANT(CURLOPT_READFUNCTION);
        REGISTER_CURL_CONSTANT(CURLOPT_REFERER);
-       REGISTER_CURL_CONSTANT(CURLOPT_USERAGENT);
-       REGISTER_CURL_CONSTANT(CURLOPT_FTPPORT);
-       REGISTER_CURL_CONSTANT(CURLOPT_FTP_USE_EPSV);
-       REGISTER_CURL_CONSTANT(CURLOPT_LOW_SPEED_LIMIT);
-       REGISTER_CURL_CONSTANT(CURLOPT_LOW_SPEED_TIME);
        REGISTER_CURL_CONSTANT(CURLOPT_RESUME_FROM);
-       REGISTER_CURL_CONSTANT(CURLOPT_COOKIE);
-       REGISTER_CURL_CONSTANT(CURLOPT_COOKIESESSION);
-       REGISTER_CURL_CONSTANT(CURLOPT_AUTOREFERER);
+       REGISTER_CURL_CONSTANT(CURLOPT_RETURNTRANSFER);
+       REGISTER_CURL_CONSTANT(CURLOPT_SHARE);
        REGISTER_CURL_CONSTANT(CURLOPT_SSLCERT);
        REGISTER_CURL_CONSTANT(CURLOPT_SSLCERTPASSWD);
-       REGISTER_CURL_CONSTANT(CURLOPT_WRITEHEADER);
-       REGISTER_CURL_CONSTANT(CURLOPT_SSL_VERIFYHOST);
-       REGISTER_CURL_CONSTANT(CURLOPT_COOKIEFILE);
+       REGISTER_CURL_CONSTANT(CURLOPT_SSLCERTTYPE);
+       REGISTER_CURL_CONSTANT(CURLOPT_SSLENGINE);
+       REGISTER_CURL_CONSTANT(CURLOPT_SSLENGINE_DEFAULT);
+       REGISTER_CURL_CONSTANT(CURLOPT_SSLKEY);
+       REGISTER_CURL_CONSTANT(CURLOPT_SSLKEYPASSWD);
+       REGISTER_CURL_CONSTANT(CURLOPT_SSLKEYTYPE);
        REGISTER_CURL_CONSTANT(CURLOPT_SSLVERSION);
+       REGISTER_CURL_CONSTANT(CURLOPT_SSL_CIPHER_LIST);
+       REGISTER_CURL_CONSTANT(CURLOPT_SSL_VERIFYHOST);
+       REGISTER_CURL_CONSTANT(CURLOPT_SSL_VERIFYPEER);
+       REGISTER_CURL_CONSTANT(CURLOPT_STDERR);
        REGISTER_CURL_CONSTANT(CURLOPT_TIMECONDITION);
+       REGISTER_CURL_CONSTANT(CURLOPT_TIMEOUT);
        REGISTER_CURL_CONSTANT(CURLOPT_TIMEVALUE);
-       REGISTER_CURL_CONSTANT(CURLOPT_CUSTOMREQUEST);
-       REGISTER_CURL_CONSTANT(CURLOPT_STDERR);
        REGISTER_CURL_CONSTANT(CURLOPT_TRANSFERTEXT);
-       REGISTER_CURL_CONSTANT(CURLOPT_RETURNTRANSFER);
-       REGISTER_CURL_CONSTANT(CURLOPT_QUOTE);
-       REGISTER_CURL_CONSTANT(CURLOPT_POSTQUOTE);
-#if LIBCURL_VERSION_NUM >= 0x070905 /* Available since 7.9.5 */
-       REGISTER_CURL_CONSTANT(CURLOPT_PREQUOTE);
-#endif 
-       REGISTER_CURL_CONSTANT(CURLOPT_INTERFACE);
-       REGISTER_CURL_CONSTANT(CURLOPT_KRB4LEVEL);
-#if LIBCURL_VERSION_NUM >= 0x071004 /* Available since 7.16.4 */
-       REGISTER_CURL_CONSTANT(CURLOPT_KRBLEVEL);
-#endif
-       REGISTER_CURL_CONSTANT(CURLOPT_HTTPPROXYTUNNEL);
-       REGISTER_CURL_CONSTANT(CURLOPT_FILETIME);
-       REGISTER_CURL_CONSTANT(CURLOPT_WRITEFUNCTION);
-       REGISTER_CURL_CONSTANT(CURLOPT_READFUNCTION);
-#if CURLOPT_PASSWDFUNCTION != 0
-       REGISTER_CURL_CONSTANT(CURLOPT_PASSWDFUNCTION);
-#endif
-       REGISTER_CURL_CONSTANT(CURLOPT_HEADERFUNCTION);
-       REGISTER_CURL_CONSTANT(CURLOPT_MAXREDIRS);
-       REGISTER_CURL_CONSTANT(CURLOPT_MAXCONNECTS);
-       REGISTER_CURL_CONSTANT(CURLOPT_CLOSEPOLICY);
-       REGISTER_CURL_CONSTANT(CURLOPT_FRESH_CONNECT);
-       REGISTER_CURL_CONSTANT(CURLOPT_FORBID_REUSE);
-       REGISTER_CURL_CONSTANT(CURLOPT_RANDOM_FILE);
-       REGISTER_CURL_CONSTANT(CURLOPT_EGDSOCKET);
-       REGISTER_CURL_CONSTANT(CURLOPT_CONNECTTIMEOUT);
-#if LIBCURL_VERSION_NUM > 0x071002
-       REGISTER_CURL_CONSTANT(CURLOPT_CONNECTTIMEOUT_MS);
-#endif
-       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_SSLCERTTYPE);
-       REGISTER_CURL_CONSTANT(CURLOPT_CRLF);
-       REGISTER_CURL_CONSTANT(CURLOPT_ENCODING);
-       REGISTER_CURL_CONSTANT(CURLOPT_PROXYPORT);
        REGISTER_CURL_CONSTANT(CURLOPT_UNRESTRICTED_AUTH);
-       REGISTER_CURL_CONSTANT(CURLOPT_FTP_USE_EPRT);
-#if LIBCURL_VERSION_NUM > 0x070b01 /* CURLOPT_TCP_NODELAY is available since curl 7.11.2 */
-       REGISTER_CURL_CONSTANT(CURLOPT_TCP_NODELAY);
-#endif
-       REGISTER_CURL_CONSTANT(CURLOPT_HTTP200ALIASES);
-       REGISTER_CURL_CONSTANT(CURL_TIMECOND_IFMODSINCE);
-       REGISTER_CURL_CONSTANT(CURL_TIMECOND_IFUNMODSINCE);
-       REGISTER_CURL_CONSTANT(CURL_TIMECOND_LASTMOD);
-
-#if LIBCURL_VERSION_NUM > 0x070f04 /* CURLOPT_MAX_RECV_SPEED_LARGE & CURLOPT_MAX_SEND_SPEED_LARGE  are available since curl 7.15.5 */
-       REGISTER_CURL_CONSTANT(CURLOPT_MAX_RECV_SPEED_LARGE);
-       REGISTER_CURL_CONSTANT(CURLOPT_MAX_SEND_SPEED_LARGE);
-#endif 
-
-#if LIBCURL_VERSION_NUM > 0x070a05 /* CURLOPT_HTTPAUTH is available since curl 7.10.6 */
-       REGISTER_CURL_CONSTANT(CURLOPT_HTTPAUTH);
-       /* http authentication options */
-       REGISTER_CURL_CONSTANT(CURLAUTH_BASIC);
-       REGISTER_CURL_CONSTANT(CURLAUTH_DIGEST);
-       REGISTER_CURL_CONSTANT(CURLAUTH_GSSNEGOTIATE);
-       REGISTER_CURL_CONSTANT(CURLAUTH_NTLM);
-       REGISTER_CURL_CONSTANT(CURLAUTH_ANY);
-       REGISTER_CURL_CONSTANT(CURLAUTH_ANYSAFE);
-#endif
+       REGISTER_CURL_CONSTANT(CURLOPT_UPLOAD);
+       REGISTER_CURL_CONSTANT(CURLOPT_URL);
+       REGISTER_CURL_CONSTANT(CURLOPT_USERAGENT);
+       REGISTER_CURL_CONSTANT(CURLOPT_USERPWD);
+       REGISTER_CURL_CONSTANT(CURLOPT_VERBOSE);
+       REGISTER_CURL_CONSTANT(CURLOPT_WRITEFUNCTION);
+       REGISTER_CURL_CONSTANT(CURLOPT_WRITEHEADER);
 
-#if LIBCURL_VERSION_NUM > 0x070a06 /* CURLOPT_PROXYAUTH & CURLOPT_FTP_CREATE_MISSING_DIRS are available since curl 7.10.7 */
-       REGISTER_CURL_CONSTANT(CURLOPT_PROXYAUTH);
-       REGISTER_CURL_CONSTANT(CURLOPT_FTP_CREATE_MISSING_DIRS);
-#endif
+       /* 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(CURLOPT_PRIVATE);
-#if LIBCURL_VERSION_NUM >= 0x070a08 /* Available since 7.10.8 */
-       REGISTER_CURL_CONSTANT(CURLOPT_MAXFILESIZE);
-#endif
-#if LIBCURL_VERSION_NUM >= 0x070d00 /* Available since 7.13.0 */
-       REGISTER_CURL_CONSTANT(CURLOPT_FTP_ACCOUNT);
-#endif 
-#if LIBCURL_VERSION_NUM >= 0x070e01 /* Available since 7.14.1 */
-       REGISTER_CURL_CONSTANT(CURLOPT_COOKIELIST);
-       REGISTER_CURL_CONSTANT(CURLOPT_IGNORE_CONTENT_LENGTH);
-#endif
-#if LIBCURL_VERSION_NUM >= 0x070f02 /* Available since 7.15.2 */
-       REGISTER_CURL_CONSTANT(CURLOPT_CONNECT_ONLY);
-       REGISTER_CURL_CONSTANT(CURLOPT_LOCALPORT);
-       REGISTER_CURL_CONSTANT(CURLOPT_LOCALPORTRANGE);
-#endif
-#if LIBCURL_VERSION_NUM >= 0x070f05 /* Available since 7.15.5 */
-       REGISTER_CURL_CONSTANT(CURLOPT_FTP_ALTERNATIVE_TO_USER);
-#endif 
-#if LIBCURL_VERSION_NUM >= 0x071000 /* Available since 7.16.0 */
-       REGISTER_CURL_CONSTANT(CURLOPT_SSL_SESSIONID_CACHE);
-#endif
-#if LIBCURL_VERSION_NUM >= 0x071001 /* Available since 7.16.1 */
-       REGISTER_CURL_CONSTANT(CURLOPT_FTP_SSL_CCC);
-       REGISTER_CURL_CONSTANT(CURLFTPSSL_CCC_NONE);
-       REGISTER_CURL_CONSTANT(CURLFTPSSL_CCC_ACTIVE);
-       REGISTER_CURL_CONSTANT(CURLFTPSSL_CCC_PASSIVE);
-#endif
-#if LIBCURL_VERSION_NUM >= 0x071002 /* Available since 7.16.2 */
-       REGISTER_CURL_CONSTANT(CURLOPT_HTTP_CONTENT_DECODING);
-       REGISTER_CURL_CONSTANT(CURLOPT_HTTP_TRANSFER_DECODING);
-#endif
-#if LIBCURL_VERSION_NUM >= 0x071200 /* Available since 7.18.0 */
-       REGISTER_CURL_CONSTANT(CURLOPT_PROXY_TRANSFER_MODE);
-#endif
-#if LIBCURL_VERSION_NUM >= 0x071300 /* Available since 7.19.0 */
-       REGISTER_CURL_CONSTANT(CURLOPT_ADDRESS_SCOPE);
-       REGISTER_CURL_CONSTANT(CURLOPT_CRLFILE);
-       REGISTER_CURL_CONSTANT(CURLOPT_ISSUERCERT);
-#endif
-#if LIBCURL_VERSION_NUM >= 0x071301 /* Available since 7.19.1 */
-       REGISTER_CURL_CONSTANT(CURLOPT_USERNAME);
-       REGISTER_CURL_CONSTANT(CURLOPT_PASSWORD);
-       REGISTER_CURL_CONSTANT(CURLOPT_PROXYUSERNAME);
-       REGISTER_CURL_CONSTANT(CURLOPT_PROXYPASSWORD);
-#endif
-#if LIBCURL_VERSION_NUM >= 0x071304 /* Available since 7.19.4 */
-       REGISTER_CURL_CONSTANT(CURLOPT_NOPROXY);
-       REGISTER_CURL_CONSTANT(CURLOPT_SOCKS5_GSSAPI_NEC);
-       REGISTER_CURL_CONSTANT(CURLOPT_SOCKS5_GSSAPI_SERVICE);
-       REGISTER_CURL_CONSTANT(CURLOPT_TFTP_BLKSIZE);
-#endif
-#if LIBCURL_VERSION_NUM >= 0x071306 /* Available since 7.19.6 */
-       REGISTER_CURL_CONSTANT(CURLOPT_SSH_KNOWNHOSTS);
-#endif
-#if LIBCURL_VERSION_NUM >= 0x071400 /* Available since 7.20.0 */
-       REGISTER_CURL_CONSTANT(CURLOPT_FTP_USE_PRET);
-       REGISTER_CURL_CONSTANT(CURLOPT_MAIL_FROM);
-       REGISTER_CURL_CONSTANT(CURLOPT_MAIL_RCPT);
-       REGISTER_CURL_CONSTANT(CURLOPT_RTSP_CLIENT_CSEQ);
-       REGISTER_CURL_CONSTANT(CURLOPT_RTSP_SERVER_CSEQ);
-       REGISTER_CURL_CONSTANT(CURLOPT_RTSP_SESSION_ID);
-       REGISTER_CURL_CONSTANT(CURLOPT_RTSP_STREAM_URI);
-       REGISTER_CURL_CONSTANT(CURLOPT_RTSP_TRANSPORT);
-       REGISTER_CURL_CONSTANT(CURLOPT_RTSP_REQUEST);
-       REGISTER_CURL_CONSTANT(CURL_RTSPREQ_OPTIONS);
-       REGISTER_CURL_CONSTANT(CURL_RTSPREQ_DESCRIBE);
-       REGISTER_CURL_CONSTANT(CURL_RTSPREQ_ANNOUNCE);
-       REGISTER_CURL_CONSTANT(CURL_RTSPREQ_SETUP);
-       REGISTER_CURL_CONSTANT(CURL_RTSPREQ_PLAY);
-       REGISTER_CURL_CONSTANT(CURL_RTSPREQ_PAUSE);
-       REGISTER_CURL_CONSTANT(CURL_RTSPREQ_TEARDOWN);
-       REGISTER_CURL_CONSTANT(CURL_RTSPREQ_GET_PARAMETER);
-       REGISTER_CURL_CONSTANT(CURL_RTSPREQ_SET_PARAMETER);
-       REGISTER_CURL_CONSTANT(CURL_RTSPREQ_RECORD);
-       REGISTER_CURL_CONSTANT(CURL_RTSPREQ_RECEIVE);
-#endif
-#if LIBCURL_VERSION_NUM >= 0x071503 /* Available since 7.21.3 */
-       REGISTER_CURL_CONSTANT(CURLOPT_RESOLVE);
-#endif
-#if LIBCURL_VERSION_NUM >= 0x071506 /* Available since 7.21.6 */
-       REGISTER_CURL_CONSTANT(CURLOPT_ACCEPT_ENCODING);
-       REGISTER_CURL_CONSTANT(CURLOPT_TRANSFER_ENCODING);
-#endif
-#if LIBCURL_VERSION_NUM >= 0x071800 /* Available since 7.24.0 */
-       REGISTER_CURL_CONSTANT(CURLOPT_DNS_SERVERS);
-#endif
-       
-       /* Constants effecting the way CURLOPT_CLOSEPOLICY works */
-       REGISTER_CURL_CONSTANT(CURLCLOSEPOLICY_LEAST_RECENTLY_USED);
-       REGISTER_CURL_CONSTANT(CURLCLOSEPOLICY_LEAST_TRAFFIC);
-       REGISTER_CURL_CONSTANT(CURLCLOSEPOLICY_SLOWEST);
-       REGISTER_CURL_CONSTANT(CURLCLOSEPOLICY_CALLBACK);
-       REGISTER_CURL_CONSTANT(CURLCLOSEPOLICY_OLDEST);
-
-       /* Info constants */
-       REGISTER_CURL_CONSTANT(CURLINFO_EFFECTIVE_URL);
-       REGISTER_CURL_CONSTANT(CURLINFO_HTTP_CODE);
-       REGISTER_CURL_CONSTANT(CURLINFO_RESPONSE_CODE);
-       REGISTER_CURL_CONSTANT(CURLINFO_HEADER_SIZE);
-       REGISTER_CURL_CONSTANT(CURLINFO_REQUEST_SIZE);
-       REGISTER_CURL_CONSTANT(CURLINFO_TOTAL_TIME);
-       REGISTER_CURL_CONSTANT(CURLINFO_NAMELOOKUP_TIME);
-       REGISTER_CURL_CONSTANT(CURLINFO_CONNECT_TIME);
-       REGISTER_CURL_CONSTANT(CURLINFO_PRETRANSFER_TIME);
-       REGISTER_CURL_CONSTANT(CURLINFO_SIZE_UPLOAD);
-       REGISTER_CURL_CONSTANT(CURLINFO_SIZE_DOWNLOAD);
-       REGISTER_CURL_CONSTANT(CURLINFO_SPEED_DOWNLOAD);
-       REGISTER_CURL_CONSTANT(CURLINFO_SPEED_UPLOAD);
-       REGISTER_CURL_CONSTANT(CURLINFO_FILETIME);
-       REGISTER_CURL_CONSTANT(CURLINFO_SSL_VERIFYRESULT);
-       REGISTER_CURL_CONSTANT(CURLINFO_CONTENT_LENGTH_DOWNLOAD);
-       REGISTER_CURL_CONSTANT(CURLINFO_CONTENT_LENGTH_UPLOAD);
-       REGISTER_CURL_CONSTANT(CURLINFO_STARTTRANSFER_TIME);
-       REGISTER_CURL_CONSTANT(CURLINFO_CONTENT_TYPE);
-       REGISTER_CURL_CONSTANT(CURLINFO_REDIRECT_TIME);
-       REGISTER_CURL_CONSTANT(CURLINFO_REDIRECT_COUNT);
-       REGISTER_CURL_CONSTANT(CURLINFO_HEADER_OUT);
-       REGISTER_CURL_CONSTANT(CURLINFO_PRIVATE);
-#if LIBCURL_VERSION_NUM >  0x071301
-       REGISTER_CURL_CONSTANT(CURLINFO_CERTINFO);
-#endif
-#if LIBCURL_VERSION_NUM >= 0x071202
-    REGISTER_CURL_CONSTANT(CURLINFO_REDIRECT_URL);
-#endif
-
-
-       /* cURL protocol constants (curl_version) */
-       REGISTER_CURL_CONSTANT(CURL_VERSION_IPV6);
-       REGISTER_CURL_CONSTANT(CURL_VERSION_KERBEROS4);
-       REGISTER_CURL_CONSTANT(CURL_VERSION_SSL);
-       REGISTER_CURL_CONSTANT(CURL_VERSION_LIBZ);
-
-       /* version constants */
-       REGISTER_CURL_CONSTANT(CURLVERSION_NOW);
-
-       /* Error Constants */
-       REGISTER_CURL_CONSTANT(CURLE_OK);
-       REGISTER_CURL_CONSTANT(CURLE_UNSUPPORTED_PROTOCOL);
-       REGISTER_CURL_CONSTANT(CURLE_FAILED_INIT);
-       REGISTER_CURL_CONSTANT(CURLE_URL_MALFORMAT);
-       REGISTER_CURL_CONSTANT(CURLE_URL_MALFORMAT_USER);
-       REGISTER_CURL_CONSTANT(CURLE_COULDNT_RESOLVE_PROXY);
-       REGISTER_CURL_CONSTANT(CURLE_COULDNT_RESOLVE_HOST);
+       /* */
+       REGISTER_CURL_CONSTANT(CURLE_ABORTED_BY_CALLBACK);
+       REGISTER_CURL_CONSTANT(CURLE_BAD_CALLING_ORDER);
+       REGISTER_CURL_CONSTANT(CURLE_BAD_CONTENT_ENCODING);
+       REGISTER_CURL_CONSTANT(CURLE_BAD_FUNCTION_ARGUMENT);
+       REGISTER_CURL_CONSTANT(CURLE_BAD_PASSWORD_ENTERED);
        REGISTER_CURL_CONSTANT(CURLE_COULDNT_CONNECT);
-       REGISTER_CURL_CONSTANT(CURLE_FTP_WEIRD_SERVER_REPLY);
+       REGISTER_CURL_CONSTANT(CURLE_COULDNT_RESOLVE_HOST);
+       REGISTER_CURL_CONSTANT(CURLE_COULDNT_RESOLVE_PROXY);
+       REGISTER_CURL_CONSTANT(CURLE_FAILED_INIT);
+       REGISTER_CURL_CONSTANT(CURLE_FILE_COULDNT_READ_FILE);
        REGISTER_CURL_CONSTANT(CURLE_FTP_ACCESS_DENIED);
-       REGISTER_CURL_CONSTANT(CURLE_FTP_USER_PASSWORD_INCORRECT);
-       REGISTER_CURL_CONSTANT(CURLE_FTP_WEIRD_PASS_REPLY);
-       REGISTER_CURL_CONSTANT(CURLE_FTP_WEIRD_USER_REPLY);
-       REGISTER_CURL_CONSTANT(CURLE_FTP_WEIRD_PASV_REPLY);
-       REGISTER_CURL_CONSTANT(CURLE_FTP_WEIRD_227_FORMAT);
+       REGISTER_CURL_CONSTANT(CURLE_FTP_BAD_DOWNLOAD_RESUME);
        REGISTER_CURL_CONSTANT(CURLE_FTP_CANT_GET_HOST);
        REGISTER_CURL_CONSTANT(CURLE_FTP_CANT_RECONNECT);
-       REGISTER_CURL_CONSTANT(CURLE_FTP_COULDNT_SET_BINARY);
-       REGISTER_CURL_CONSTANT(CURLE_PARTIAL_FILE);
+       REGISTER_CURL_CONSTANT(CURLE_FTP_COULDNT_GET_SIZE);
        REGISTER_CURL_CONSTANT(CURLE_FTP_COULDNT_RETR_FILE);
-       REGISTER_CURL_CONSTANT(CURLE_FTP_WRITE_ERROR);
-       REGISTER_CURL_CONSTANT(CURLE_FTP_QUOTE_ERROR);
-       REGISTER_CURL_CONSTANT(CURLE_HTTP_NOT_FOUND);
-       REGISTER_CURL_CONSTANT(CURLE_WRITE_ERROR);
-       REGISTER_CURL_CONSTANT(CURLE_MALFORMAT_USER);
-       REGISTER_CURL_CONSTANT(CURLE_FTP_COULDNT_STOR_FILE);
-       REGISTER_CURL_CONSTANT(CURLE_READ_ERROR);
-       REGISTER_CURL_CONSTANT(CURLE_OUT_OF_MEMORY);
-       REGISTER_CURL_CONSTANT(CURLE_OPERATION_TIMEOUTED);
        REGISTER_CURL_CONSTANT(CURLE_FTP_COULDNT_SET_ASCII);
-       REGISTER_CURL_CONSTANT(CURLE_FTP_PORT_FAILED);
+       REGISTER_CURL_CONSTANT(CURLE_FTP_COULDNT_SET_BINARY);
+       REGISTER_CURL_CONSTANT(CURLE_FTP_COULDNT_STOR_FILE);
        REGISTER_CURL_CONSTANT(CURLE_FTP_COULDNT_USE_REST);
-       REGISTER_CURL_CONSTANT(CURLE_FTP_COULDNT_GET_SIZE);
-       REGISTER_CURL_CONSTANT(CURLE_HTTP_RANGE_ERROR);
+       REGISTER_CURL_CONSTANT(CURLE_FTP_PORT_FAILED);
+       REGISTER_CURL_CONSTANT(CURLE_FTP_QUOTE_ERROR);
+       REGISTER_CURL_CONSTANT(CURLE_FTP_USER_PASSWORD_INCORRECT);
+       REGISTER_CURL_CONSTANT(CURLE_FTP_WEIRD_227_FORMAT);
+       REGISTER_CURL_CONSTANT(CURLE_FTP_WEIRD_PASS_REPLY);
+       REGISTER_CURL_CONSTANT(CURLE_FTP_WEIRD_PASV_REPLY);
+       REGISTER_CURL_CONSTANT(CURLE_FTP_WEIRD_SERVER_REPLY);
+       REGISTER_CURL_CONSTANT(CURLE_FTP_WEIRD_USER_REPLY);
+       REGISTER_CURL_CONSTANT(CURLE_FTP_WRITE_ERROR);
+       REGISTER_CURL_CONSTANT(CURLE_FUNCTION_NOT_FOUND);
+       REGISTER_CURL_CONSTANT(CURLE_GOT_NOTHING);
+       REGISTER_CURL_CONSTANT(CURLE_HTTP_NOT_FOUND);
+       REGISTER_CURL_CONSTANT(CURLE_HTTP_PORT_FAILED);
        REGISTER_CURL_CONSTANT(CURLE_HTTP_POST_ERROR);
-       REGISTER_CURL_CONSTANT(CURLE_SSL_CONNECT_ERROR);
-       REGISTER_CURL_CONSTANT(CURLE_FTP_BAD_DOWNLOAD_RESUME);
-       REGISTER_CURL_CONSTANT(CURLE_FILE_COULDNT_READ_FILE);
+       REGISTER_CURL_CONSTANT(CURLE_HTTP_RANGE_ERROR);
        REGISTER_CURL_CONSTANT(CURLE_LDAP_CANNOT_BIND);
        REGISTER_CURL_CONSTANT(CURLE_LDAP_SEARCH_FAILED);
        REGISTER_CURL_CONSTANT(CURLE_LIBRARY_NOT_FOUND);
-       REGISTER_CURL_CONSTANT(CURLE_FUNCTION_NOT_FOUND);
-       REGISTER_CURL_CONSTANT(CURLE_ABORTED_BY_CALLBACK);
-       REGISTER_CURL_CONSTANT(CURLE_BAD_FUNCTION_ARGUMENT);
-       REGISTER_CURL_CONSTANT(CURLE_BAD_CALLING_ORDER);
-       REGISTER_CURL_CONSTANT(CURLE_HTTP_PORT_FAILED);
-       REGISTER_CURL_CONSTANT(CURLE_BAD_PASSWORD_ENTERED);
-       REGISTER_CURL_CONSTANT(CURLE_TOO_MANY_REDIRECTS);
-       REGISTER_CURL_CONSTANT(CURLE_UNKNOWN_TELNET_OPTION);
-       REGISTER_CURL_CONSTANT(CURLE_TELNET_OPTION_SYNTAX);
+       REGISTER_CURL_CONSTANT(CURLE_MALFORMAT_USER);
        REGISTER_CURL_CONSTANT(CURLE_OBSOLETE);
-       REGISTER_CURL_CONSTANT(CURLE_SSL_PEER_CERTIFICATE);
-       REGISTER_CURL_CONSTANT(CURLE_GOT_NOTHING);
-       REGISTER_CURL_CONSTANT(CURLE_SSL_ENGINE_NOTFOUND);
-       REGISTER_CURL_CONSTANT(CURLE_SSL_ENGINE_SETFAILED);
-       REGISTER_CURL_CONSTANT(CURLE_SEND_ERROR);
+       REGISTER_CURL_CONSTANT(CURLE_OK);
+       REGISTER_CURL_CONSTANT(CURLE_OPERATION_TIMEOUTED);
+       REGISTER_CURL_CONSTANT(CURLE_OUT_OF_MEMORY);
+       REGISTER_CURL_CONSTANT(CURLE_PARTIAL_FILE);
+       REGISTER_CURL_CONSTANT(CURLE_READ_ERROR);
        REGISTER_CURL_CONSTANT(CURLE_RECV_ERROR);
+       REGISTER_CURL_CONSTANT(CURLE_SEND_ERROR);
        REGISTER_CURL_CONSTANT(CURLE_SHARE_IN_USE);
+       REGISTER_CURL_CONSTANT(CURLE_SSL_CACERT);
        REGISTER_CURL_CONSTANT(CURLE_SSL_CERTPROBLEM);
        REGISTER_CURL_CONSTANT(CURLE_SSL_CIPHER);
-       REGISTER_CURL_CONSTANT(CURLE_SSL_CACERT);
-       REGISTER_CURL_CONSTANT(CURLE_BAD_CONTENT_ENCODING);
-#if LIBCURL_VERSION_NUM >= 0x070a08
-       REGISTER_CURL_CONSTANT(CURLE_LDAP_INVALID_URL);
-       REGISTER_CURL_CONSTANT(CURLE_FILESIZE_EXCEEDED);
-#endif
-#if LIBCURL_VERSION_NUM >= 0x070b00
-       REGISTER_CURL_CONSTANT(CURLE_FTP_SSL_FAILED);
-#endif
+       REGISTER_CURL_CONSTANT(CURLE_SSL_CONNECT_ERROR);
+       REGISTER_CURL_CONSTANT(CURLE_SSL_ENGINE_NOTFOUND);
+       REGISTER_CURL_CONSTANT(CURLE_SSL_ENGINE_SETFAILED);
+       REGISTER_CURL_CONSTANT(CURLE_SSL_PEER_CERTIFICATE);
+       REGISTER_CURL_CONSTANT(CURLE_TELNET_OPTION_SYNTAX);
+       REGISTER_CURL_CONSTANT(CURLE_TOO_MANY_REDIRECTS);
+       REGISTER_CURL_CONSTANT(CURLE_UNKNOWN_TELNET_OPTION);
+       REGISTER_CURL_CONSTANT(CURLE_UNSUPPORTED_PROTOCOL);
+       REGISTER_CURL_CONSTANT(CURLE_URL_MALFORMAT);
+       REGISTER_CURL_CONSTANT(CURLE_URL_MALFORMAT_USER);
+       REGISTER_CURL_CONSTANT(CURLE_WRITE_ERROR);
+
+       /* cURL info constants */
+       REGISTER_CURL_CONSTANT(CURLINFO_CONNECT_TIME);
+       REGISTER_CURL_CONSTANT(CURLINFO_CONTENT_LENGTH_DOWNLOAD);
+       REGISTER_CURL_CONSTANT(CURLINFO_CONTENT_LENGTH_UPLOAD);
+       REGISTER_CURL_CONSTANT(CURLINFO_CONTENT_TYPE);
+       REGISTER_CURL_CONSTANT(CURLINFO_EFFECTIVE_URL);
+       REGISTER_CURL_CONSTANT(CURLINFO_FILETIME);
+       REGISTER_CURL_CONSTANT(CURLINFO_HEADER_OUT);
+       REGISTER_CURL_CONSTANT(CURLINFO_HEADER_SIZE);
+       REGISTER_CURL_CONSTANT(CURLINFO_HTTP_CODE);
+       REGISTER_CURL_CONSTANT(CURLINFO_NAMELOOKUP_TIME);
+       REGISTER_CURL_CONSTANT(CURLINFO_PRETRANSFER_TIME);
+       REGISTER_CURL_CONSTANT(CURLINFO_PRIVATE);
+       REGISTER_CURL_CONSTANT(CURLINFO_REDIRECT_COUNT);
+       REGISTER_CURL_CONSTANT(CURLINFO_REDIRECT_TIME);
+       REGISTER_CURL_CONSTANT(CURLINFO_REQUEST_SIZE);
+       REGISTER_CURL_CONSTANT(CURLINFO_SIZE_DOWNLOAD);
+       REGISTER_CURL_CONSTANT(CURLINFO_SIZE_UPLOAD);
+       REGISTER_CURL_CONSTANT(CURLINFO_SPEED_DOWNLOAD);
+       REGISTER_CURL_CONSTANT(CURLINFO_SPEED_UPLOAD);
+       REGISTER_CURL_CONSTANT(CURLINFO_SSL_VERIFYRESULT);
+       REGISTER_CURL_CONSTANT(CURLINFO_STARTTRANSFER_TIME);
+       REGISTER_CURL_CONSTANT(CURLINFO_TOTAL_TIME);
+
+       /* Other */     
+       REGISTER_CURL_CONSTANT(CURLMSG_DONE);
+       REGISTER_CURL_CONSTANT(CURLVERSION_NOW);
+
+       /* Curl Multi Constants */
+       REGISTER_CURL_CONSTANT(CURLM_BAD_EASY_HANDLE);
+       REGISTER_CURL_CONSTANT(CURLM_BAD_HANDLE);
+       REGISTER_CURL_CONSTANT(CURLM_CALL_MULTI_PERFORM);
+       REGISTER_CURL_CONSTANT(CURLM_INTERNAL_ERROR);
+       REGISTER_CURL_CONSTANT(CURLM_OK);
+       REGISTER_CURL_CONSTANT(CURLM_OUT_OF_MEMORY);
+
+       /* Curl proxy constants */
        REGISTER_CURL_CONSTANT(CURLPROXY_HTTP);
        REGISTER_CURL_CONSTANT(CURLPROXY_SOCKS4);
        REGISTER_CURL_CONSTANT(CURLPROXY_SOCKS5);
 
-       REGISTER_CURL_CONSTANT(CURL_NETRC_OPTIONAL);
-       REGISTER_CURL_CONSTANT(CURL_NETRC_IGNORED);
-       REGISTER_CURL_CONSTANT(CURL_NETRC_REQUIRED);
+       /* Curl Share constants */
+       REGISTER_CURL_CONSTANT(CURLSHOPT_SHARE);
+       REGISTER_CURL_CONSTANT(CURLSHOPT_UNSHARE);
 
-       REGISTER_CURL_CONSTANT(CURL_HTTP_VERSION_NONE);
+       /* Curl Http Version constants (CURLOPT_HTTP_VERSION) */
        REGISTER_CURL_CONSTANT(CURL_HTTP_VERSION_1_0);
        REGISTER_CURL_CONSTANT(CURL_HTTP_VERSION_1_1);
+       REGISTER_CURL_CONSTANT(CURL_HTTP_VERSION_NONE);
 
-       REGISTER_CURL_CONSTANT(CURLM_CALL_MULTI_PERFORM);
-       REGISTER_CURL_CONSTANT(CURLM_OK);
-       REGISTER_CURL_CONSTANT(CURLM_BAD_HANDLE);
-       REGISTER_CURL_CONSTANT(CURLM_BAD_EASY_HANDLE);
-       REGISTER_CURL_CONSTANT(CURLM_OUT_OF_MEMORY);
-       REGISTER_CURL_CONSTANT(CURLM_INTERNAL_ERROR);
+       /* Curl Lock constants */
+       REGISTER_CURL_CONSTANT(CURL_LOCK_DATA_COOKIE);
+       REGISTER_CURL_CONSTANT(CURL_LOCK_DATA_DNS);
+       REGISTER_CURL_CONSTANT(CURL_LOCK_DATA_SSL_SESSION);
 
-       REGISTER_CURL_CONSTANT(CURLMSG_DONE);
+       /* Curl NETRC constants (CURLOPT_NETRC) */
+       REGISTER_CURL_CONSTANT(CURL_NETRC_IGNORED);
+       REGISTER_CURL_CONSTANT(CURL_NETRC_OPTIONAL);
+       REGISTER_CURL_CONSTANT(CURL_NETRC_REQUIRED);
+
+       /* Curl SSL Version constants (CURLOPT_SSLVERSION) */
+       REGISTER_CURL_CONSTANT(CURL_SSLVERSION_DEFAULT);
+       REGISTER_CURL_CONSTANT(CURL_SSLVERSION_SSLv2);
+       REGISTER_CURL_CONSTANT(CURL_SSLVERSION_SSLv3);
+       REGISTER_CURL_CONSTANT(CURL_SSLVERSION_TLSv1);
+       
+       /* Curl TIMECOND constants (CURLOPT_TIMECONDITION) */
+       REGISTER_CURL_CONSTANT(CURL_TIMECOND_IFMODSINCE);
+       REGISTER_CURL_CONSTANT(CURL_TIMECOND_IFUNMODSINCE);
+       REGISTER_CURL_CONSTANT(CURL_TIMECOND_LASTMOD);
+
+       /* Curl version constants */
+       REGISTER_CURL_CONSTANT(CURL_VERSION_IPV6);
+       REGISTER_CURL_CONSTANT(CURL_VERSION_KERBEROS4);
+       REGISTER_CURL_CONSTANT(CURL_VERSION_LIBZ);
+       REGISTER_CURL_CONSTANT(CURL_VERSION_SSL);
+
+#if LIBCURL_VERSION_NUM >= 0x070a06 /* Available since 7.10.6 */
+       REGISTER_CURL_CONSTANT(CURLOPT_HTTPAUTH);
+       /* http authentication options */
+       REGISTER_CURL_CONSTANT(CURLAUTH_ANY);
+       REGISTER_CURL_CONSTANT(CURLAUTH_ANYSAFE);
+       REGISTER_CURL_CONSTANT(CURLAUTH_BASIC);
+       REGISTER_CURL_CONSTANT(CURLAUTH_DIGEST);
+       REGISTER_CURL_CONSTANT(CURLAUTH_GSSNEGOTIATE);
+       REGISTER_CURL_CONSTANT(CURLAUTH_NONE);
+       REGISTER_CURL_CONSTANT(CURLAUTH_NTLM);
+#endif
+
+#if LIBCURL_VERSION_NUM >= 0x070a07 /* Available since 7.10.7 */ 
+       REGISTER_CURL_CONSTANT(CURLOPT_FTP_CREATE_MISSING_DIRS);
+       REGISTER_CURL_CONSTANT(CURLOPT_PROXYAUTH);
+#endif
+
+#if LIBCURL_VERSION_NUM >= 0x070a08 /* Available since 7.10.8 */
+       REGISTER_CURL_CONSTANT(CURLE_FILESIZE_EXCEEDED);
+       REGISTER_CURL_CONSTANT(CURLE_LDAP_INVALID_URL);
+       REGISTER_CURL_CONSTANT(CURLINFO_RESPONSE_CODE);
+       REGISTER_CURL_CONSTANT(CURLOPT_FTP_RESPONSE_TIMEOUT);
+       REGISTER_CURL_CONSTANT(CURLOPT_IPRESOLVE);
+       REGISTER_CURL_CONSTANT(CURLOPT_MAXFILESIZE);
+       REGISTER_CURL_CONSTANT(CURL_IPRESOLVE_V4);
+       REGISTER_CURL_CONSTANT(CURL_IPRESOLVE_V6);
+       REGISTER_CURL_CONSTANT(CURL_IPRESOLVE_WHATEVER);
+#endif
+
+#if LIBCURL_VERSION_NUM >= 0x070b00 /* Available since 7.11.0 */
+       REGISTER_CURL_CONSTANT(CURLE_FTP_SSL_FAILED);
+       REGISTER_CURL_CONSTANT(CURLFTPSSL_ALL);
+       REGISTER_CURL_CONSTANT(CURLFTPSSL_CONTROL);
+       REGISTER_CURL_CONSTANT(CURLFTPSSL_NONE);
+       REGISTER_CURL_CONSTANT(CURLFTPSSL_TRY);
+       REGISTER_CURL_CONSTANT(CURLOPT_FTP_SSL);
+       REGISTER_CURL_CONSTANT(CURLOPT_NETRC_FILE);
+#endif
+
+#if LIBCURL_VERSION_NUM >= 0x070c02 /* Available since 7.12.2 */
+       REGISTER_CURL_CONSTANT(CURLFTPAUTH_DEFAULT);
+       REGISTER_CURL_CONSTANT(CURLFTPAUTH_SSL);
+       REGISTER_CURL_CONSTANT(CURLFTPAUTH_TLS);
+       REGISTER_CURL_CONSTANT(CURLOPT_FTPSSLAUTH);
+#endif
+
+#if LIBCURL_VERSION_NUM >= 0x070d00 /* Available since 7.13.0 */
+       REGISTER_CURL_CONSTANT(CURLOPT_FTP_ACCOUNT);
+#endif 
+
+#if LIBCURL_VERSION_NUM >= 0x070b02 /* Available since 7.11.2 */
+       REGISTER_CURL_CONSTANT(CURLOPT_TCP_NODELAY);
+#endif
+
+#if LIBCURL_VERSION_NUM >= 0x070e01 /* Available since 7.14.1 */
+       REGISTER_CURL_CONSTANT(CURLOPT_COOKIELIST);
+       REGISTER_CURL_CONSTANT(CURLOPT_IGNORE_CONTENT_LENGTH);
+#endif
+
+#if LIBCURL_VERSION_NUM >= 0x070f00 /* Available since 7.15.0 */
+       REGISTER_CURL_CONSTANT(CURLOPT_FTP_SKIP_PASV_IP);
+#endif
+
+#if LIBCURL_VERSION_NUM >= 0x070f01 /* Available since 7.15.1 */
+       REGISTER_CURL_CONSTANT(CURLOPT_FTP_FILEMETHOD);
+#endif
+
+#if LIBCURL_VERSION_NUM >= 0x070f02 /* Available since 7.15.2 */
+       REGISTER_CURL_CONSTANT(CURLOPT_CONNECT_ONLY);
+       REGISTER_CURL_CONSTANT(CURLOPT_LOCALPORT);
+       REGISTER_CURL_CONSTANT(CURLOPT_LOCALPORTRANGE);
+#endif
+
+#if LIBCURL_VERSION_NUM >= 0x070f03 /* Available since 7.15.3 */
+       REGISTER_CURL_CONSTANT(CURLFTPMETHOD_MULTICWD);
+       REGISTER_CURL_CONSTANT(CURLFTPMETHOD_NOCWD);
+       REGISTER_CURL_CONSTANT(CURLFTPMETHOD_SINGLECWD);
+#endif
+
+#if LIBCURL_VERSION_NUM >= 0x070f05 /* Available since 7.15.5 */
+       REGISTER_CURL_CONSTANT(CURLOPT_FTP_ALTERNATIVE_TO_USER);
+       REGISTER_CURL_CONSTANT(CURLOPT_MAX_RECV_SPEED_LARGE);
+       REGISTER_CURL_CONSTANT(CURLOPT_MAX_SEND_SPEED_LARGE);
+#endif 
+
+#if LIBCURL_VERSION_NUM >= 0x071000 /* Available since 7.16.0 */
+       REGISTER_CURL_CONSTANT(CURLOPT_SSL_SESSIONID_CACHE);
+#endif
+
+#if LIBCURL_VERSION_NUM >= 0x071001 /* Available since 7.16.1 */
+       REGISTER_CURL_CONSTANT(CURLOPT_FTP_SSL_CCC);
+       REGISTER_CURL_CONSTANT(CURLFTPSSL_CCC_ACTIVE);
+       REGISTER_CURL_CONSTANT(CURLFTPSSL_CCC_NONE);
+       REGISTER_CURL_CONSTANT(CURLFTPSSL_CCC_PASSIVE);
+#endif
 
-#if LIBCURL_VERSION_NUM >= 0x070c02
-       REGISTER_CURL_CONSTANT(CURLOPT_FTPSSLAUTH);
-       REGISTER_CURL_CONSTANT(CURLFTPAUTH_DEFAULT);
-       REGISTER_CURL_CONSTANT(CURLFTPAUTH_SSL);
-       REGISTER_CURL_CONSTANT(CURLFTPAUTH_TLS);
+#if LIBCURL_VERSION_NUM >= 0x071002 /* Available since 7.16.2 */
+       REGISTER_CURL_CONSTANT(CURLOPT_CONNECTTIMEOUT_MS);
+       REGISTER_CURL_CONSTANT(CURLOPT_HTTP_CONTENT_DECODING);
+       REGISTER_CURL_CONSTANT(CURLOPT_HTTP_TRANSFER_DECODING);
+       REGISTER_CURL_CONSTANT(CURLOPT_TIMEOUT_MS);
 #endif
 
-#if LIBCURL_VERSION_NUM >  0x070b00
-       REGISTER_CURL_CONSTANT(CURLOPT_FTP_SSL);
-       REGISTER_CURL_CONSTANT(CURLFTPSSL_NONE);
-       REGISTER_CURL_CONSTANT(CURLFTPSSL_TRY);
-       REGISTER_CURL_CONSTANT(CURLFTPSSL_CONTROL);
-       REGISTER_CURL_CONSTANT(CURLFTPSSL_ALL);
+#if LIBCURL_VERSION_NUM >= 0x071004 /* Available since 7.16.4 */
+       REGISTER_CURL_CONSTANT(CURLOPT_KRBLEVEL);
 #endif
+
 #if LIBCURL_VERSION_NUM >= 0x071100 /* Available since 7.17.0 */
+       REGISTER_CURL_CONSTANT(CURLOPT_APPEND);
+       REGISTER_CURL_CONSTANT(CURLOPT_DIRLISTONLY);
+       REGISTER_CURL_CONSTANT(CURLOPT_NEW_DIRECTORY_PERMS);
+       REGISTER_CURL_CONSTANT(CURLOPT_NEW_FILE_PERMS);
        REGISTER_CURL_CONSTANT(CURLOPT_USE_SSL);
+       /* Curl SSL Constants */
+       REGISTER_CURL_CONSTANT(CURLUSESSL_ALL);
+       REGISTER_CURL_CONSTANT(CURLUSESSL_CONTROL);
        REGISTER_CURL_CONSTANT(CURLUSESSL_NONE);
        REGISTER_CURL_CONSTANT(CURLUSESSL_TRY);
-       REGISTER_CURL_CONSTANT(CURLUSESSL_CONTROL);
-       REGISTER_CURL_CONSTANT(CURLUSESSL_ALL);
 #endif 
 
-#if LIBCURL_VERSION_NUM > 0x071301
-       REGISTER_CURL_CONSTANT(CURLOPT_CERTINFO);
-       REGISTER_CURL_CONSTANT(CURLOPT_POSTREDIR);
+#if LIBCURL_VERSION_NUM >= 0x071200 /* Available since 7.18.0 */
+       REGISTER_CURL_CONSTANT(CURLOPT_PROXY_TRANSFER_MODE);
 #endif
 
-/* SSH support works in 7.19.0+ using libssh2 */
-#if LIBCURL_VERSION_NUM >= 0x071300
-       REGISTER_CURL_CONSTANT(CURLSSH_AUTH_NONE);
-       REGISTER_CURL_CONSTANT(CURLSSH_AUTH_PUBLICKEY);
-       REGISTER_CURL_CONSTANT(CURLSSH_AUTH_PASSWORD);
-       REGISTER_CURL_CONSTANT(CURLSSH_AUTH_HOST);
-       REGISTER_CURL_CONSTANT(CURLSSH_AUTH_KEYBOARD);
-       REGISTER_CURL_CONSTANT(CURLSSH_AUTH_DEFAULT);
-       REGISTER_CURL_CONSTANT(CURLOPT_SSH_AUTH_TYPES);
+#if LIBCURL_VERSION_NUM >= 0x071202 /* Available since 7.18.2 */
+    REGISTER_CURL_CONSTANT(CURLINFO_REDIRECT_URL);
+#endif
+
+#if LIBCURL_VERSION_NUM >= 0x071300 /* Available since 7.19.0 */
+       REGISTER_CURL_CONSTANT(CURLE_SSH);
+       REGISTER_CURL_CONSTANT(CURLOPT_ADDRESS_SCOPE);
+       REGISTER_CURL_CONSTANT(CURLOPT_CRLFILE);
+       REGISTER_CURL_CONSTANT(CURLOPT_ISSUERCERT);
        REGISTER_CURL_CONSTANT(CURLOPT_KEYPASSWD);
-       REGISTER_CURL_CONSTANT(CURLOPT_SSH_PUBLIC_KEYFILE);
-       REGISTER_CURL_CONSTANT(CURLOPT_SSH_PRIVATE_KEYFILE);
        REGISTER_CURL_CONSTANT(CURLOPT_SSH_HOST_PUBLIC_KEY_MD5);
-       REGISTER_CURL_CONSTANT(CURLE_SSH);
+       REGISTER_CURL_CONSTANT(CURLOPT_SSH_PRIVATE_KEYFILE);
+       REGISTER_CURL_CONSTANT(CURLOPT_SSH_PUBLIC_KEYFILE);
+
+       REGISTER_CURL_CONSTANT(CURLOPT_SSH_AUTH_TYPES);
+       REGISTER_CURL_CONSTANT(CURLSSH_AUTH_ANY);
+       REGISTER_CURL_CONSTANT(CURLSSH_AUTH_DEFAULT);
+       REGISTER_CURL_CONSTANT(CURLSSH_AUTH_HOST);
+       REGISTER_CURL_CONSTANT(CURLSSH_AUTH_KEYBOARD);
+       REGISTER_CURL_CONSTANT(CURLSSH_AUTH_NONE);
+       REGISTER_CURL_CONSTANT(CURLSSH_AUTH_PASSWORD);
+       REGISTER_CURL_CONSTANT(CURLSSH_AUTH_PUBLICKEY);
 #endif
 
-#if LIBCURL_VERSION_NUM >= 0x071304
-       REGISTER_CURL_CONSTANT(CURLOPT_REDIR_PROTOCOLS);
+#if LIBCURL_VERSION_NUM >= 0x071301 /* Available since 7.19.1 */
+       REGISTER_CURL_CONSTANT(CURLINFO_CERTINFO);
+       REGISTER_CURL_CONSTANT(CURLOPT_CERTINFO);
+       REGISTER_CURL_CONSTANT(CURLOPT_PASSWORD);
+       REGISTER_CURL_CONSTANT(CURLOPT_POSTREDIR);
+       REGISTER_CURL_CONSTANT(CURLOPT_PROXYPASSWORD);
+       REGISTER_CURL_CONSTANT(CURLOPT_PROXYUSERNAME);
+       REGISTER_CURL_CONSTANT(CURLOPT_USERNAME);
+#endif
+
+#if LIBCURL_VERSION_NUM >= 0x071303 /* Available since 7.19.3 */ 
+       REGISTER_CURL_CONSTANT(CURLAUTH_DIGEST_IE);
+#endif
+
+#if LIBCURL_VERSION_NUM >= 0x071304 /* Available since 7.19.4 */
+       REGISTER_CURL_CONSTANT(CURLOPT_NOPROXY);
        REGISTER_CURL_CONSTANT(CURLOPT_PROTOCOLS);
-       REGISTER_CURL_CONSTANT(CURLPROTO_HTTP);
-       REGISTER_CURL_CONSTANT(CURLPROTO_HTTPS);
+       REGISTER_CURL_CONSTANT(CURLOPT_REDIR_PROTOCOLS);
+       REGISTER_CURL_CONSTANT(CURLOPT_SOCKS5_GSSAPI_NEC);
+       REGISTER_CURL_CONSTANT(CURLOPT_SOCKS5_GSSAPI_SERVICE);
+       REGISTER_CURL_CONSTANT(CURLOPT_TFTP_BLKSIZE);
+       REGISTER_CURL_CONSTANT(CURLPROTO_ALL);
+       REGISTER_CURL_CONSTANT(CURLPROTO_DICT);
+       REGISTER_CURL_CONSTANT(CURLPROTO_FILE);
        REGISTER_CURL_CONSTANT(CURLPROTO_FTP);
        REGISTER_CURL_CONSTANT(CURLPROTO_FTPS);
+       REGISTER_CURL_CONSTANT(CURLPROTO_HTTP);
+       REGISTER_CURL_CONSTANT(CURLPROTO_HTTPS);
+       REGISTER_CURL_CONSTANT(CURLPROTO_LDAP);
+       REGISTER_CURL_CONSTANT(CURLPROTO_LDAPS);
        REGISTER_CURL_CONSTANT(CURLPROTO_SCP);
        REGISTER_CURL_CONSTANT(CURLPROTO_SFTP);
        REGISTER_CURL_CONSTANT(CURLPROTO_TELNET);
-       REGISTER_CURL_CONSTANT(CURLPROTO_LDAP);
-       REGISTER_CURL_CONSTANT(CURLPROTO_LDAPS);
-       REGISTER_CURL_CONSTANT(CURLPROTO_DICT);
-       REGISTER_CURL_CONSTANT(CURLPROTO_FILE);
        REGISTER_CURL_CONSTANT(CURLPROTO_TFTP);
-       REGISTER_CURL_CONSTANT(CURLPROTO_ALL);
 #endif
 
-#if LIBCURL_VERSION_NUM >= 0x070f01
-       REGISTER_CURL_CONSTANT(CURLOPT_FTP_FILEMETHOD);
-       REGISTER_CURL_CONSTANT(CURLOPT_FTP_SKIP_PASV_IP);
+#if LIBCURL_VERSION_NUM >= 0x071306 /* Available since 7.19.6 */
+       REGISTER_CURL_CONSTANT(CURLOPT_SSH_KNOWNHOSTS);
 #endif
 
-#if LIBCURL_VERSION_NUM >= 0x071001
-       REGISTER_CURL_CONSTANT(CURLFTPMETHOD_MULTICWD);
-       REGISTER_CURL_CONSTANT(CURLFTPMETHOD_NOCWD);
-       REGISTER_CURL_CONSTANT(CURLFTPMETHOD_SINGLECWD);
+#if LIBCURL_VERSION_NUM >= 0x071400 /* Available since 7.20.0 */
+       REGISTER_CURL_CONSTANT(CURLOPT_FTP_USE_PRET);
+       REGISTER_CURL_CONSTANT(CURLOPT_MAIL_FROM);
+       REGISTER_CURL_CONSTANT(CURLOPT_MAIL_RCPT);
+       REGISTER_CURL_CONSTANT(CURLOPT_RTSP_CLIENT_CSEQ);
+       REGISTER_CURL_CONSTANT(CURLOPT_RTSP_REQUEST);
+       REGISTER_CURL_CONSTANT(CURLOPT_RTSP_SERVER_CSEQ);
+       REGISTER_CURL_CONSTANT(CURLOPT_RTSP_SESSION_ID);
+       REGISTER_CURL_CONSTANT(CURLOPT_RTSP_STREAM_URI);
+       REGISTER_CURL_CONSTANT(CURLOPT_RTSP_TRANSPORT);
+       REGISTER_CURL_CONSTANT(CURLPROTO_IMAP);
+       REGISTER_CURL_CONSTANT(CURLPROTO_IMAPS);
+       REGISTER_CURL_CONSTANT(CURLPROTO_POP3);
+       REGISTER_CURL_CONSTANT(CURLPROTO_POP3S);
+       REGISTER_CURL_CONSTANT(CURLPROTO_RTSP);
+       REGISTER_CURL_CONSTANT(CURLPROTO_SMTP);
+       REGISTER_CURL_CONSTANT(CURLPROTO_SMTPS);
+       REGISTER_CURL_CONSTANT(CURL_RTSPREQ_ANNOUNCE);
+       REGISTER_CURL_CONSTANT(CURL_RTSPREQ_DESCRIBE);
+       REGISTER_CURL_CONSTANT(CURL_RTSPREQ_GET_PARAMETER);
+       REGISTER_CURL_CONSTANT(CURL_RTSPREQ_OPTIONS);
+       REGISTER_CURL_CONSTANT(CURL_RTSPREQ_PAUSE);
+       REGISTER_CURL_CONSTANT(CURL_RTSPREQ_PLAY);
+       REGISTER_CURL_CONSTANT(CURL_RTSPREQ_RECEIVE);
+       REGISTER_CURL_CONSTANT(CURL_RTSPREQ_RECORD);
+       REGISTER_CURL_CONSTANT(CURL_RTSPREQ_SETUP);
+       REGISTER_CURL_CONSTANT(CURL_RTSPREQ_SET_PARAMETER);
+       REGISTER_CURL_CONSTANT(CURL_RTSPREQ_TEARDOWN);
+#endif
+
+#if LIBCURL_VERSION_NUM >= 0x071500 /* Available since 7.21.0 */
+       REGISTER_CURL_CONSTANT(CURLPROTO_RTMP);
+       REGISTER_CURL_CONSTANT(CURLPROTO_RTMPE);
+       REGISTER_CURL_CONSTANT(CURLPROTO_RTMPS);
+       REGISTER_CURL_CONSTANT(CURLPROTO_RTMPT);
+       REGISTER_CURL_CONSTANT(CURLPROTO_RTMPTE);
+       REGISTER_CURL_CONSTANT(CURLPROTO_RTMPTS); 
+#endif 
+
+#if LIBCURL_VERSION_NUM >= 0x071502 /* Available since 7.21.2 */
+       REGISTER_CURL_CONSTANT(CURLPROTO_GOPHER);
+#endif
+
+#if LIBCURL_VERSION_NUM >= 0x071503 /* Available since 7.21.3 */
+       REGISTER_CURL_CONSTANT(CURLAUTH_ONLY);
+       REGISTER_CURL_CONSTANT(CURLOPT_RESOLVE);
+#endif
+
+#if LIBCURL_VERSION_NUM >= 0x071504 /* Available since 7.21.4 */
+       REGISTER_CURL_CONSTANT(CURLOPT_TLSAUTH_PASSWORD);
+       REGISTER_CURL_CONSTANT(CURLOPT_TLSAUTH_TYPE);
+       REGISTER_CURL_CONSTANT(CURLOPT_TLSAUTH_USERNAME);
+       REGISTER_CURL_CONSTANT(CURL_TLSAUTH_SRP);
+#endif
+
+#if LIBCURL_VERSION_NUM >= 0x071506 /* Available since 7.21.6 */
+       REGISTER_CURL_CONSTANT(CURLOPT_ACCEPT_ENCODING);
+       REGISTER_CURL_CONSTANT(CURLOPT_TRANSFER_ENCODING);
+#endif
+
+#if LIBCURL_VERSION_NUM >= 0x071800 /* Available since 7.24.0 */
+       REGISTER_CURL_CONSTANT(CURLOPT_DNS_SERVERS);
+#endif
+
+#if CURLOPT_FTPASCII != 0
+       REGISTER_CURL_CONSTANT(CURLOPT_FTPASCII);
+#endif
+#if CURLOPT_MUTE != 0
+       REGISTER_CURL_CONSTANT(CURLOPT_MUTE);
+#endif
+#if CURLOPT_PASSWDFUNCTION != 0
+       REGISTER_CURL_CONSTANT(CURLOPT_PASSWDFUNCTION);
 #endif
 
 #ifdef PHP_CURL_NEED_OPENSSL_TSL
@@ -1618,6 +1711,36 @@ static void create_certinfo(struct curl_certinfo *ci, zval *listcode TSRMLS_DC)
 /* }}} */
 #endif
 
+/* {{{ _php_curl_set_default_options()
+   Set default options for a handle */
+static void _php_curl_set_default_options(php_curl *ch)
+{
+       char *cainfo;
+
+       curl_easy_setopt(ch->cp, CURLOPT_NOPROGRESS,        1);
+       curl_easy_setopt(ch->cp, CURLOPT_VERBOSE,           0);
+       curl_easy_setopt(ch->cp, CURLOPT_ERRORBUFFER,       ch->err.str);
+       curl_easy_setopt(ch->cp, CURLOPT_WRITEFUNCTION,     curl_write);
+       curl_easy_setopt(ch->cp, CURLOPT_FILE,              (void *) ch);
+       curl_easy_setopt(ch->cp, CURLOPT_READFUNCTION,      curl_read);
+       curl_easy_setopt(ch->cp, CURLOPT_INFILE,            (void *) ch);
+       curl_easy_setopt(ch->cp, CURLOPT_HEADERFUNCTION,    curl_write_header);
+       curl_easy_setopt(ch->cp, CURLOPT_WRITEHEADER,       (void *) ch);
+       curl_easy_setopt(ch->cp, CURLOPT_DNS_USE_GLOBAL_CACHE, 1);
+       curl_easy_setopt(ch->cp, CURLOPT_DNS_CACHE_TIMEOUT, 120);
+       curl_easy_setopt(ch->cp, CURLOPT_MAXREDIRS, 20); /* prevent infinite redirects */
+
+       cainfo = INI_STR("curl.cainfo");
+       if (cainfo && strlen(cainfo) > 0) {
+               curl_easy_setopt(ch->cp, CURLOPT_CAINFO, cainfo);
+       }
+
+#if defined(ZTS)
+       curl_easy_setopt(ch->cp, CURLOPT_NOSIGNAL, 1);
+#endif
+}
+/* }}} */
+
 /* {{{ proto resource curl_init([string url])
    Initialize a cURL session */
 PHP_FUNCTION(curl_init)
@@ -1627,7 +1750,6 @@ PHP_FUNCTION(curl_init)
        zval            *clone;
        char            *url = NULL;
        int             url_len = 0;
-       char *cainfo;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &url, &url_len) == FAILURE) {
                return;
@@ -1653,27 +1775,7 @@ PHP_FUNCTION(curl_init)
        MAKE_STD_ZVAL(clone);
        ch->clone = clone;
 
-       curl_easy_setopt(ch->cp, CURLOPT_NOPROGRESS,        1);
-       curl_easy_setopt(ch->cp, CURLOPT_VERBOSE,           0);
-       curl_easy_setopt(ch->cp, CURLOPT_ERRORBUFFER,       ch->err.str);
-       curl_easy_setopt(ch->cp, CURLOPT_WRITEFUNCTION,     curl_write);
-       curl_easy_setopt(ch->cp, CURLOPT_FILE,              (void *) ch);
-       curl_easy_setopt(ch->cp, CURLOPT_READFUNCTION,      curl_read);
-       curl_easy_setopt(ch->cp, CURLOPT_INFILE,            (void *) ch);
-       curl_easy_setopt(ch->cp, CURLOPT_HEADERFUNCTION,    curl_write_header);
-       curl_easy_setopt(ch->cp, CURLOPT_WRITEHEADER,       (void *) ch);
-       curl_easy_setopt(ch->cp, CURLOPT_DNS_USE_GLOBAL_CACHE, 1);
-       curl_easy_setopt(ch->cp, CURLOPT_DNS_CACHE_TIMEOUT, 120);
-       curl_easy_setopt(ch->cp, CURLOPT_MAXREDIRS, 20); /* prevent infinite redirects */
-
-       cainfo = INI_STR("curl.cainfo");
-       if (cainfo && strlen(cainfo) > 0) {
-               curl_easy_setopt(ch->cp, CURLOPT_CAINFO, cainfo);
-       }
-
-#if defined(ZTS)
-       curl_easy_setopt(ch->cp, CURLOPT_NOSIGNAL, 1);
-#endif
+       _php_curl_set_default_options(ch);
 
        if (url) {
                if (!php_curl_option_url(ch, url, url_len TSRMLS_CC)) {
@@ -1775,106 +1877,76 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
        CURLcode     error=CURLE_OK;
 
        switch (option) {
-               case CURLOPT_INFILESIZE:
-               case CURLOPT_VERBOSE:
-               case CURLOPT_HEADER:
-               case CURLOPT_NOPROGRESS:
-               case CURLOPT_NOBODY:
-               case CURLOPT_FAILONERROR:
-               case CURLOPT_UPLOAD:
-               case CURLOPT_POST:
-#if LIBCURL_VERSION_NUM >= 0x071100 /* Available since 7.17.0 */
-               case CURLOPT_APPEND:
-               case CURLOPT_DIRLISTONLY:
-               case CURLOPT_NEW_DIRECTORY_PERMS:
-               case CURLOPT_NEW_FILE_PERMS:
-#else                  
-               case CURLOPT_FTPLISTONLY:
-               case CURLOPT_FTPAPPEND:
-#endif
-               case CURLOPT_NETRC:
-               case CURLOPT_PUT:
-#if CURLOPT_MUTE != 0
-                case CURLOPT_MUTE:
-#endif
-               case CURLOPT_TIMEOUT:
-#if LIBCURL_VERSION_NUM > 0x071002
-               case CURLOPT_TIMEOUT_MS:
-#endif
-               case CURLOPT_FTP_USE_EPSV:
-               case CURLOPT_LOW_SPEED_LIMIT:
-               case CURLOPT_SSLVERSION:
-               case CURLOPT_LOW_SPEED_TIME:
-               case CURLOPT_RESUME_FROM:
-               case CURLOPT_TIMEVALUE:
-               case CURLOPT_TIMECONDITION:
-               case CURLOPT_TRANSFERTEXT:
-               case CURLOPT_HTTPPROXYTUNNEL:
-               case CURLOPT_FILETIME:
-               case CURLOPT_MAXREDIRS:
-               case CURLOPT_MAXCONNECTS:
+               /* Long options */
+               case CURLOPT_AUTOREFERER:
+               case CURLOPT_BUFFERSIZE:
                case CURLOPT_CLOSEPOLICY:
-               case CURLOPT_FRESH_CONNECT:
-               case CURLOPT_FORBID_REUSE:
                case CURLOPT_CONNECTTIMEOUT:
-#if LIBCURL_VERSION_NUM > 0x071002
-               case CURLOPT_CONNECTTIMEOUT_MS:
-#endif
-               case CURLOPT_SSL_VERIFYHOST:
-               case CURLOPT_SSL_VERIFYPEER:
+               case CURLOPT_COOKIESESSION:
+               case CURLOPT_CRLF:
+               case CURLOPT_DNS_CACHE_TIMEOUT:
                case CURLOPT_DNS_USE_GLOBAL_CACHE:
-               case CURLOPT_NOSIGNAL:
-               case CURLOPT_PROXYTYPE:
-               case CURLOPT_BUFFERSIZE:
+               case CURLOPT_FAILONERROR:
+               case CURLOPT_FILETIME:
+               case CURLOPT_FORBID_REUSE:
+               case CURLOPT_FRESH_CONNECT:
+               case CURLOPT_FTP_USE_EPRT:
+               case CURLOPT_FTP_USE_EPSV:
+               case CURLOPT_HEADER:
                case CURLOPT_HTTPGET:
+               case CURLOPT_HTTPPROXYTUNNEL:
                case CURLOPT_HTTP_VERSION:
-               case CURLOPT_CRLF:
-               case CURLOPT_DNS_CACHE_TIMEOUT:
+               case CURLOPT_INFILESIZE:
+               case CURLOPT_LOW_SPEED_LIMIT:
+               case CURLOPT_LOW_SPEED_TIME:
+               case CURLOPT_MAXCONNECTS:
+               case CURLOPT_MAXREDIRS:
+               case CURLOPT_NETRC:
+               case CURLOPT_NOBODY:
+               case CURLOPT_NOPROGRESS:
+               case CURLOPT_NOSIGNAL:
+               case CURLOPT_PORT:
+               case CURLOPT_POST:
                case CURLOPT_PROXYPORT:
-               case CURLOPT_FTP_USE_EPRT:
-#if LIBCURL_VERSION_NUM > 0x070a05 /* CURLOPT_HTTPAUTH is available since curl 7.10.6 */
+               case CURLOPT_PROXYTYPE:
+               case CURLOPT_PUT:
+               case CURLOPT_RESUME_FROM:
+               case CURLOPT_SSLVERSION:
+               case CURLOPT_SSL_VERIFYHOST:
+               case CURLOPT_SSL_VERIFYPEER:
+               case CURLOPT_TIMECONDITION:
+               case CURLOPT_TIMEOUT:
+               case CURLOPT_TIMEVALUE:
+               case CURLOPT_TRANSFERTEXT:
+               case CURLOPT_UNRESTRICTED_AUTH:
+               case CURLOPT_UPLOAD:
+               case CURLOPT_VERBOSE:
+#if LIBCURL_VERSION_NUM >= 0x070a06 /* Available since 7.10.6 */
                case CURLOPT_HTTPAUTH:
 #endif
-#if LIBCURL_VERSION_NUM > 0x070a06 /* CURLOPT_PROXYAUTH & CURLOPT_FTP_CREATE_MISSING_DIRS are available since curl 7.10.7 */
-               case CURLOPT_PROXYAUTH:
+#if LIBCURL_VERSION_NUM >= 0x070a07 /* Available since 7.10.7 */ 
                case CURLOPT_FTP_CREATE_MISSING_DIRS:
+               case CURLOPT_PROXYAUTH:
 #endif
-
-#if LIBCURL_VERSION_NUM >= 0x070c02
-               case CURLOPT_FTPSSLAUTH:
+#if LIBCURL_VERSION_NUM >= 0x070a08 /* Available since 7.10.8 */
+               case CURLOPT_FTP_RESPONSE_TIMEOUT:
+               case CURLOPT_IPRESOLVE:
+               case CURLOPT_MAXFILESIZE:
 #endif
-#if LIBCURL_VERSION_NUM >= 0x071100 /* Available since 7.17.0 */
-               case CURLOPT_USE_SSL:
-#elif LIBCURL_VERSION_NUM >  0x070b00
-               case CURLOPT_FTP_SSL:
-#endif                 
-               case CURLOPT_UNRESTRICTED_AUTH:
-               case CURLOPT_PORT:
-               case CURLOPT_AUTOREFERER:
-               case CURLOPT_COOKIESESSION:
-#if LIBCURL_VERSION_NUM > 0x070b01 /* CURLOPT_TCP_NODELAY is available since curl 7.11.2 */
+#if LIBCURL_VERSION_NUM >= 0x070b02 /* Available since 7.11.2 */
                case CURLOPT_TCP_NODELAY:
 #endif
-#if LIBCURL_VERSION_NUM >= 0x71304
-               case CURLOPT_REDIR_PROTOCOLS:
-               case CURLOPT_PROTOCOLS:
+#if LIBCURL_VERSION_NUM >= 0x070c02 /* Available since 7.12.2 */
+               case CURLOPT_FTPSSLAUTH:
 #endif
-#if LIBCURL_VERSION_NUM > 0x070a07 /* CURLOPT_IPRESOLVE and CURLOPT_FTP_RESPONSE_TIMEOUT are available since curl 7.10.8 */
-               case CURLOPT_IPRESOLVE:
-               case CURLOPT_FTP_RESPONSE_TIMEOUT:
+#if LIBCURL_VERSION_NUM >= 0x070e01 /* Available since 7.14.1 */
+               case CURLOPT_IGNORE_CONTENT_LENGTH:
 #endif
-#if LIBCURL_VERSION_NUM >= 0x070f01
-               case CURLOPT_FTP_FILEMETHOD:
+#if LIBCURL_VERSION_NUM >= 0x070f00 /* Available since 7.15.0 */
                case CURLOPT_FTP_SKIP_PASV_IP:
 #endif
-#if LIBCURL_VERSION_NUM >  0x071301
-               case CURLOPT_CERTINFO:
-#endif
-#if LIBCURL_VERSION_NUM >= 0x070a08 /* Available since 7.10.8 */
-               case CURLOPT_MAXFILESIZE:
-#endif
-#if LIBCURL_VERSION_NUM >= 0x070e01 /* Available since 7.14.1 */
-               case CURLOPT_IGNORE_CONTENT_LENGTH:
+#if LIBCURL_VERSION_NUM >= 0x070f01 /* Available since 7.15.1 */
+               case CURLOPT_FTP_FILEMETHOD:
 #endif
 #if LIBCURL_VERSION_NUM >= 0x070f02 /* Available since 7.15.2 */
                case CURLOPT_CONNECT_ONLY:
@@ -1888,27 +1960,54 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
                case CURLOPT_FTP_SSL_CCC:
 #endif
 #if LIBCURL_VERSION_NUM >= 0x071002 /* Available since 7.16.2 */
-               case CURLOPT_HTTP_TRANSFER_DECODING:
+               case CURLOPT_CONNECTTIMEOUT_MS:
                case CURLOPT_HTTP_CONTENT_DECODING:
+               case CURLOPT_HTTP_TRANSFER_DECODING:
+               case CURLOPT_TIMEOUT_MS:
+#endif
+#if LIBCURL_VERSION_NUM >= 0x071100 /* Available since 7.17.0 */
+               case CURLOPT_USE_SSL:
+#elif LIBCURL_VERSION_NUM >= 0x070b00 /* Available since 7.11.0 */
+               case CURLOPT_FTP_SSL:
+#endif 
+#if LIBCURL_VERSION_NUM >= 0x071100 /* Available since 7.17.0 */
+               case CURLOPT_APPEND:
+               case CURLOPT_DIRLISTONLY:
+               case CURLOPT_NEW_DIRECTORY_PERMS:
+               case CURLOPT_NEW_FILE_PERMS:
+#else                  
+               case CURLOPT_FTPAPPEND:
+               case CURLOPT_FTPLISTONLY:
 #endif
 #if LIBCURL_VERSION_NUM >= 0x071200 /* Available since 7.18.0 */
                case CURLOPT_PROXY_TRANSFER_MODE:
 #endif
 #if LIBCURL_VERSION_NUM >= 0x071300 /* Available since 7.19.0 */
                case CURLOPT_ADDRESS_SCOPE:
+               case CURLOPT_SSH_AUTH_TYPES:
+#endif
+#if LIBCURL_VERSION_NUM >  0x071301 /* Available since 7.19.1 */
+               case CURLOPT_CERTINFO:
 #endif
 #if LIBCURL_VERSION_NUM >= 0x071304 /* Available since 7.19.4 */
                case CURLOPT_NOPROXY:
+               case CURLOPT_PROTOCOLS:
+               case CURLOPT_REDIR_PROTOCOLS:
                case CURLOPT_SOCKS5_GSSAPI_NEC:
                case CURLOPT_TFTP_BLKSIZE:
 #endif
 #if LIBCURL_VERSION_NUM >= 0x071400 /* Available since 7.20.0 */
                case CURLOPT_FTP_USE_PRET:
                case CURLOPT_RTSP_CLIENT_CSEQ:
-               case CURLOPT_RTSP_SERVER_CSEQ:
                case CURLOPT_RTSP_REQUEST:
+               case CURLOPT_RTSP_SERVER_CSEQ:
+#endif
+#if LIBCURL_VERSION_NUM >= 0x071504 /* Available since 7.21.4 */
+               case CURLOPT_TLSAUTH_TYPE:
+#endif
+#if CURLOPT_MUTE != 0
+               case CURLOPT_MUTE:
 #endif
-
                        convert_to_long_ex(zvalue);
 #if LIBCURL_VERSION_NUM >= 0x71304
                        if ((option == CURLOPT_PROTOCOLS || option == CURLOPT_REDIR_PROTOCOLS) &&
@@ -1920,63 +2019,30 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
 #endif
                        error = curl_easy_setopt(ch->cp, option, Z_LVAL_PP(zvalue));
                        break;
-#if LIBCURL_VERSION_NUM > 0x070f04
-               case CURLOPT_MAX_RECV_SPEED_LARGE:
-               case CURLOPT_MAX_SEND_SPEED_LARGE:
-                       convert_to_long_ex(zvalue);
-                       error = curl_easy_setopt(ch->cp, option, (curl_off_t)Z_LVAL_PP(zvalue));
-                       break;
-#endif
-               case CURLOPT_FOLLOWLOCATION:
-                       convert_to_long_ex(zvalue);
-                       if (PG(open_basedir) && *PG(open_basedir)) {
-                               if (Z_LVAL_PP(zvalue) != 0) {
-                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "CURLOPT_FOLLOWLOCATION cannot be activated when an open_basedir is set");
-                                       RETVAL_FALSE;
-                                       return 1;
-                               }
-                       }
-                       error = curl_easy_setopt(ch->cp, option, Z_LVAL_PP(zvalue));
-                       break;
-#if LIBCURL_VERSION_NUM > 0x071301
-               case CURLOPT_POSTREDIR:
-                       convert_to_long_ex(zvalue);
-                       error = curl_easy_setopt(ch->cp, CURLOPT_POSTREDIR, Z_LVAL_PP(zvalue) & CURL_REDIR_POST_ALL);
-                       break;
-#endif
+
+               /* String options */
+               case CURLOPT_CAINFO:
+               case CURLOPT_CAPATH:
+               case CURLOPT_COOKIE:
+               case CURLOPT_CUSTOMREQUEST:
+               case CURLOPT_EGDSOCKET:
+               case CURLOPT_FTPPORT:
+               case CURLOPT_INTERFACE:
                case CURLOPT_PRIVATE:
-               case CURLOPT_URL:
                case CURLOPT_PROXY:
-               case CURLOPT_USERPWD:
                case CURLOPT_PROXYUSERPWD:
                case CURLOPT_RANGE:
-               case CURLOPT_CUSTOMREQUEST:
-               case CURLOPT_USERAGENT:
-               case CURLOPT_FTPPORT:
-               case CURLOPT_COOKIE:
                case CURLOPT_REFERER:
-               case CURLOPT_INTERFACE:
-#if LIBCURL_VERSION_NUM >= 0x071004 /* Available since 7.16.4 */
-               case CURLOPT_KRBLEVEL:
-#else                  
-               case CURLOPT_KRB4LEVEL:
-#endif                 
-               case CURLOPT_EGDSOCKET:
-               case CURLOPT_CAINFO:
-               case CURLOPT_CAPATH:
-               case CURLOPT_SSL_CIPHER_LIST:
-               case CURLOPT_SSLKEY:
-               case CURLOPT_SSLKEYTYPE:
-               case CURLOPT_SSLKEYPASSWD:
+               case CURLOPT_SSLCERTTYPE:
                case CURLOPT_SSLENGINE:
                case CURLOPT_SSLENGINE_DEFAULT:
-               case CURLOPT_SSLCERTTYPE:
-#if LIBCURL_VERSION_NUM >= 0x071506 /* Available since 7.21.6 */                       
-               case CURLOPT_ACCEPT_ENCODING:
-               case CURLOPT_TRANSFER_ENCODING:
-#else
-               case CURLOPT_ENCODING:
-#endif
+               case CURLOPT_SSLKEY:
+               case CURLOPT_SSLKEYPASSWD:
+               case CURLOPT_SSLKEYTYPE:
+               case CURLOPT_SSL_CIPHER_LIST:
+               case CURLOPT_URL:
+               case CURLOPT_USERAGENT:
+               case CURLOPT_USERPWD:
 #if LIBCURL_VERSION_NUM >= 0x070d00 /* Available since 7.13.0 */
                case CURLOPT_FTP_ACCOUNT:
 #endif
@@ -1986,24 +2052,42 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
 #if LIBCURL_VERSION_NUM >= 0x070f05 /* Available since 7.15.5 */
                case CURLOPT_FTP_ALTERNATIVE_TO_USER:
 #endif
+#if LIBCURL_VERSION_NUM >= 0x071004 /* Available since 7.16.4 */
+               case CURLOPT_KRBLEVEL:
+#else                  
+               case CURLOPT_KRB4LEVEL:
+#endif
+#if LIBCURL_VERSION_NUM >= 0x071300 /* Available since 7.19.0 */
+               case CURLOPT_SSH_HOST_PUBLIC_KEY_MD5:
+#endif
 #if LIBCURL_VERSION_NUM >= 0x071301 /* Available since 7.19.1 */
-               case CURLOPT_USERNAME:
                case CURLOPT_PASSWORD:
-               case CURLOPT_PROXYUSERNAME:
                case CURLOPT_PROXYPASSWORD:
+               case CURLOPT_PROXYUSERNAME:
+               case CURLOPT_USERNAME:
 #endif
 #if LIBCURL_VERSION_NUM >= 0x071304 /* Available since 7.19.4 */
                case CURLOPT_SOCKS5_GSSAPI_SERVICE:
-#endif              
+#endif
 #if LIBCURL_VERSION_NUM >= 0x071400 /* Available since 7.20.0 */
                case CURLOPT_MAIL_FROM:
                case CURLOPT_RTSP_SESSION_ID:
-               case CURLOPT_RTSP_TRANSPORT:
                case CURLOPT_RTSP_STREAM_URI:
+               case CURLOPT_RTSP_TRANSPORT:
+#endif
+#if LIBCURL_VERSION_NUM >= 0x071504 /* Available since 7.21.4 */
+               case CURLOPT_TLSAUTH_PASSWORD:
+               case CURLOPT_TLSAUTH_USERNAME:
+#endif
+#if LIBCURL_VERSION_NUM >= 0x071506 /* Available since 7.21.6 */                       
+               case CURLOPT_ACCEPT_ENCODING:
+               case CURLOPT_TRANSFER_ENCODING:
+#else
+               case CURLOPT_ENCODING:
 #endif
 #if LIBCURL_VERSION_NUM >= 0x071800 /* Available since 7.24.0 */
                case CURLOPT_DNS_SERVERS:
-#endif
+#endif 
                {
 #if LIBCURL_VERSION_NUM < 0x071100
                        char *copystr = NULL;
@@ -2035,10 +2119,12 @@ string_copy:
                        }
                        break;
                }
+
+               /* Curl file handle options */
                case CURLOPT_FILE:
                case CURLOPT_INFILE:
-               case CURLOPT_WRITEHEADER:
-               case CURLOPT_STDERR: {
+               case CURLOPT_STDERR: 
+               case CURLOPT_WRITEHEADER: {
                        FILE *fp = NULL;
                        int type;
                        void * what;
@@ -2117,50 +2203,98 @@ string_copy:
                                        error = curl_easy_setopt(ch->cp, option, fp);
                                        break;
                        }
-
                        break;
                }
-               case CURLOPT_RETURNTRANSFER:
-                       convert_to_long_ex(zvalue);
 
-                       if (Z_LVAL_PP(zvalue)) {
-                               ch->handlers->write->method = PHP_CURL_RETURN;
-                       } else {
-                               ch->handlers->write->method = PHP_CURL_STDOUT;
+               /* Curl linked list options */
+               case CURLOPT_HTTP200ALIASES:
+               case CURLOPT_HTTPHEADER:
+               case CURLOPT_POSTQUOTE:
+               case CURLOPT_PREQUOTE:
+               case CURLOPT_QUOTE:
+#if LIBCURL_VERSION_NUM >= 0x071400 /* Available since 7.20.0 */
+               case CURLOPT_MAIL_RCPT:
+#endif
+#if LIBCURL_VERSION_NUM >= 0x071503 /* Available since 7.21.3 */
+               case CURLOPT_RESOLVE:
+#endif
+               {
+                       zval              **current;
+                       HashTable          *ph;
+                       struct curl_slist  *slist = NULL;
+
+                       ph = HASH_OF(*zvalue);
+                       if (!ph) {
+                               char *name;
+                               switch (option) {
+                                       case CURLOPT_HTTPHEADER:
+                                               name = "CURLOPT_HTTPHEADER";
+                                               break;
+                                       case CURLOPT_QUOTE:
+                                               name = "CURLOPT_QUOTE";
+                                               break;
+                                       case CURLOPT_HTTP200ALIASES:
+                                               name = "CURLOPT_HTTP200ALIASES";
+                                               break;
+                                       case CURLOPT_POSTQUOTE:
+                                               name = "CURLOPT_POSTQUOTE";
+                                               break;
+                                       case CURLOPT_PREQUOTE:
+                                               name = "CURLOPT_PREQUOTE";
+                                               break;
+#if LIBCURL_VERSION_NUM >= 0x071400 /* Available since 7.20.0 */
+                                       case CURLOPT_MAIL_RCPT:
+                                               name = "CURLOPT_MAIL_RCPT";
+                                               break;
+#endif
+#if LIBCURL_VERSION_NUM >= 0x071503 /* Available since 7.21.3 */
+                                       case CURLOPT_RESOLVE:
+                                               name = "CURLOPT_RESOLVE";
+                                               break;
+#endif
+                               }
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "You must pass either an object or an array with the %s argument", name);
+                               RETVAL_FALSE;
+                               return 1;
+                       }
+
+                       for (zend_hash_internal_pointer_reset(ph);
+                                zend_hash_get_current_data(ph, (void **) &current) == SUCCESS;
+                                zend_hash_move_forward(ph)
+                       ) {
+                               SEPARATE_ZVAL(current);
+                               convert_to_string_ex(current);
+
+                               slist = curl_slist_append(slist, Z_STRVAL_PP(current));
+                               if (!slist) {
+                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not build curl_slist");
+                                       RETVAL_FALSE;
+                                       return 1;
+                               }
                        }
+                       zend_llist_add_element(&ch->to_free->slist, &slist);
+
+                       error = curl_easy_setopt(ch->cp, option, slist);
+
                        break;
+               }
+
                case CURLOPT_BINARYTRANSFER:
                        /* Do nothing, just backward compatibility */
                        break;
-               case CURLOPT_WRITEFUNCTION:
-                       if (ch->handlers->write->func_name) {
-                               zval_ptr_dtor(&ch->handlers->write->func_name);
-                               ch->handlers->write->fci_cache = empty_fcall_info_cache;
-                       }
-                       zval_add_ref(zvalue);
-                       ch->handlers->write->func_name = *zvalue;
-                       ch->handlers->write->method = PHP_CURL_USER;
-                       break;
-               case CURLOPT_READFUNCTION:
-                       if (ch->handlers->read->func_name) {
-                               zval_ptr_dtor(&ch->handlers->read->func_name);
-                               ch->handlers->read->fci_cache = empty_fcall_info_cache;
-                       }
-                       zval_add_ref(zvalue);
-                       ch->handlers->read->func_name = *zvalue;
-                       ch->handlers->read->method = PHP_CURL_USER;
-                       break;
-               case CURLOPT_PROGRESSFUNCTION:
-                       curl_easy_setopt(ch->cp, CURLOPT_PROGRESSFUNCTION,      curl_progress);
-                       curl_easy_setopt(ch->cp, CURLOPT_PROGRESSDATA, ch);
-                       if (ch->handlers->progress->func_name) {
-                               zval_ptr_dtor(&ch->handlers->progress->func_name);
-                               ch->handlers->progress->fci_cache = empty_fcall_info_cache;
+
+               case CURLOPT_FOLLOWLOCATION:
+                       convert_to_long_ex(zvalue);
+                       if (PG(open_basedir) && *PG(open_basedir)) {
+                               if (Z_LVAL_PP(zvalue) != 0) {
+                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "CURLOPT_FOLLOWLOCATION cannot be activated when an open_basedir is set");
+                                       RETVAL_FALSE;
+                                       return 1;
+                               }
                        }
-                       zval_add_ref(zvalue);
-                       ch->handlers->progress->func_name = *zvalue;
-                       ch->handlers->progress->method = PHP_CURL_USER;
+                       error = curl_easy_setopt(ch->cp, option, Z_LVAL_PP(zvalue));
                        break;
+
                case CURLOPT_HEADERFUNCTION:
                        if (ch->handlers->write_header->func_name) {
                                zval_ptr_dtor(&ch->handlers->write_header->func_name);
@@ -2170,17 +2304,7 @@ string_copy:
                        ch->handlers->write_header->func_name = *zvalue;
                        ch->handlers->write_header->method = PHP_CURL_USER;
                        break;
-#if CURLOPT_PASSWDFUNCTION != 0
-               case CURLOPT_PASSWDFUNCTION:
-                       if (ch->handlers->passwd) {
-                               zval_ptr_dtor(&ch->handlers->passwd);
-                       }
-                       zval_add_ref(zvalue);
-                       ch->handlers->passwd = *zvalue;
-                       error = curl_easy_setopt(ch->cp, CURLOPT_PASSWDFUNCTION, curl_passwd);
-                       error = curl_easy_setopt(ch->cp, CURLOPT_PASSWDDATA,     (void *) ch);
-                       break;
-#endif
+
                case CURLOPT_POSTFIELDS:
                        if (Z_TYPE_PP(zvalue) == IS_ARRAY || Z_TYPE_PP(zvalue) == IS_OBJECT) {
                                zval            **current;
@@ -2293,92 +2417,90 @@ string_copy:
 #endif
                        }
                        break;
-               case CURLOPT_HTTPHEADER:
-               case CURLOPT_QUOTE:
-               case CURLOPT_HTTP200ALIASES:
-               case CURLOPT_POSTQUOTE:
-               case CURLOPT_PREQUOTE:
-#if LIBCURL_VERSION_NUM >= 0x071400 /* Available since 7.20.0 */
-               case CURLOPT_MAIL_RCPT:
-#endif
-#if LIBCURL_VERSION_NUM >= 0x071503 /* Available since 7.21.3 */
-               case CURLOPT_RESOLVE:
-#endif
-               {
-                       zval              **current;
-                       HashTable          *ph;
-                       struct curl_slist  *slist = NULL;
 
-                       ph = HASH_OF(*zvalue);
-                       if (!ph) {
-                               char *name;
-                               switch (option) {
-                                       case CURLOPT_HTTPHEADER:
-                                               name = "CURLOPT_HTTPHEADER";
-                                               break;
-                                       case CURLOPT_QUOTE:
-                                               name = "CURLOPT_QUOTE";
-                                               break;
-                                       case CURLOPT_HTTP200ALIASES:
-                                               name = "CURLOPT_HTTP200ALIASES";
-                                               break;
-                                       case CURLOPT_POSTQUOTE:
-                                               name = "CURLOPT_POSTQUOTE";
-                                               break;
-                                       case CURLOPT_PREQUOTE:
-                                               name = "CURLOPT_PREQUOTE";
-                                               break;
-#if LIBCURL_VERSION_NUM >= 0x071400 /* Available since 7.20.0 */                                               
-                                       case CURLOPT_MAIL_RCPT:
-                                               name = "CURLOPT_MAIL_RCPT";
-                                               break;
-#endif                                         
-#if LIBCURL_VERSION_NUM >= 0x071503 /* Available since 7.21.3 */
-                                       case CURLOPT_RESOLVE:
-                                               name = "CURLOPT_RESOLVE";
-                                               break;
-#endif
-                               }
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "You must pass either an object or an array with the %s argument", name);
-                               RETVAL_FALSE;
-                               return 1;
+               case CURLOPT_PROGRESSFUNCTION:
+                       curl_easy_setopt(ch->cp, CURLOPT_PROGRESSFUNCTION,      curl_progress);
+                       curl_easy_setopt(ch->cp, CURLOPT_PROGRESSDATA, ch);
+                       if (ch->handlers->progress->func_name) {
+                               zval_ptr_dtor(&ch->handlers->progress->func_name);
+                               ch->handlers->progress->fci_cache = empty_fcall_info_cache;
                        }
+                       zval_add_ref(zvalue);
+                       ch->handlers->progress->func_name = *zvalue;
+                       ch->handlers->progress->method = PHP_CURL_USER;
+                       break;
 
-                       for (zend_hash_internal_pointer_reset(ph);
-                                zend_hash_get_current_data(ph, (void **) &current) == SUCCESS;
-                                zend_hash_move_forward(ph)
-                       ) {
-                               SEPARATE_ZVAL(current);
-                               convert_to_string_ex(current);
+               case CURLOPT_READFUNCTION:
+                       if (ch->handlers->read->func_name) {
+                               zval_ptr_dtor(&ch->handlers->read->func_name);
+                               ch->handlers->read->fci_cache = empty_fcall_info_cache;
+                       }
+                       zval_add_ref(zvalue);
+                       ch->handlers->read->func_name = *zvalue;
+                       ch->handlers->read->method = PHP_CURL_USER;
+                       break;
 
-                               slist = curl_slist_append(slist, Z_STRVAL_PP(current));
-                               if (!slist) {
-                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not build curl_slist");
-                                       RETVAL_FALSE;
-                                       return 1;
-                               }
+               case CURLOPT_RETURNTRANSFER:
+                       convert_to_long_ex(zvalue);
+                       if (Z_LVAL_PP(zvalue)) {
+                               ch->handlers->write->method = PHP_CURL_RETURN;
+                       } else {
+                               ch->handlers->write->method = PHP_CURL_STDOUT;
                        }
-                       zend_llist_add_element(&ch->to_free->slist, &slist);
+                       break;
 
-                       error = curl_easy_setopt(ch->cp, option, slist);
+               case CURLOPT_WRITEFUNCTION:
+                       if (ch->handlers->write->func_name) {
+                               zval_ptr_dtor(&ch->handlers->write->func_name);
+                               ch->handlers->write->fci_cache = empty_fcall_info_cache;
+                       }
+                       zval_add_ref(zvalue);
+                       ch->handlers->write->func_name = *zvalue;
+                       ch->handlers->write->method = PHP_CURL_USER;
+                       break;
 
+#if LIBCURL_VERSION_NUM >= 0x070f05 /* Available since 7.15.5 */
+               case CURLOPT_MAX_RECV_SPEED_LARGE:
+               case CURLOPT_MAX_SEND_SPEED_LARGE:
+                       convert_to_long_ex(zvalue);
+                       error = curl_easy_setopt(ch->cp, option, (curl_off_t)Z_LVAL_PP(zvalue));
                        break;
-               }
+#endif
+
+#if LIBCURL_VERSION_NUM >= 0x071301 /* Available since 7.19.1 */
+               case CURLOPT_POSTREDIR:
+                       convert_to_long_ex(zvalue);
+                       error = curl_easy_setopt(ch->cp, CURLOPT_POSTREDIR, Z_LVAL_PP(zvalue) & CURL_REDIR_POST_ALL);
+                       break;
+#endif
+
+#if CURLOPT_PASSWDFUNCTION != 0
+               case CURLOPT_PASSWDFUNCTION:
+                       if (ch->handlers->passwd) {
+                               zval_ptr_dtor(&ch->handlers->passwd);
+                       }
+                       zval_add_ref(zvalue);
+                       ch->handlers->passwd = *zvalue;
+                       error = curl_easy_setopt(ch->cp, CURLOPT_PASSWDFUNCTION, curl_passwd);
+                       error = curl_easy_setopt(ch->cp, CURLOPT_PASSWDDATA,     (void *) ch);
+                       break;
+#endif
+
                /* the following options deal with files, therefore the open_basedir check
                 * is required.
                 */
+               case CURLOPT_COOKIEFILE: 
                case CURLOPT_COOKIEJAR:
-               case CURLOPT_SSLCERT:
                case CURLOPT_RANDOM_FILE:
-               case CURLOPT_COOKIEFILE: 
-#if LIBCURL_VERSION_NUM >= 0x070b00 /* Option available since 7.11.0 */
+               case CURLOPT_SSLCERT:
+#if LIBCURL_VERSION_NUM >= 0x070b00 /* Available since 7.11.0 */
                case CURLOPT_NETRC_FILE:
 #endif
 #if LIBCURL_VERSION_NUM >= 0x071300 /* Available since 7.19.0 */
-               case CURLOPT_SSH_PUBLIC_KEYFILE:
-               case CURLOPT_SSH_PRIVATE_KEYFILE:
                case CURLOPT_CRLFILE:
                case CURLOPT_ISSUERCERT:
+               case CURLOPT_SSH_PRIVATE_KEYFILE:
+               case CURLOPT_SSH_PUBLIC_KEYFILE:
 #endif
 #if LIBCURL_VERSION_NUM >= 0x071306 /* Available since 7.19.6 */
                case CURLOPT_SSH_KNOWNHOSTS:
@@ -2405,6 +2527,7 @@ string_copy:
 #endif
                        break;
                }
+
                case CURLINFO_HEADER_OUT:
                        convert_to_long_ex(zvalue);
                        if (Z_LVAL_PP(zvalue) == 1) {
@@ -2417,6 +2540,16 @@ string_copy:
                                curl_easy_setopt(ch->cp, CURLOPT_VERBOSE, 0);
                        }
                        break;
+
+               case CURLOPT_SHARE:
+                       {
+                               php_curlsh *sh = NULL;
+                           ZEND_FETCH_RESOURCE(sh, php_curlsh *, zvalue, -1, le_curl_share_handle_name, le_curl_share_handle);
+                               if (sh) {
+                                       curl_easy_setopt(ch->cp, CURLOPT_SHARE, sh->share);
+                               }
+                       }
+
        }
 
        SAVE_CURL_ERROR(ch, error);
@@ -2911,6 +3044,121 @@ static void _php_curl_close(zend_rsrc_list_entry *rsrc TSRMLS_DC)
 }
 /* }}} */
 
+#if LIBCURL_VERSION_NUM >= 0x070c01 /* 7.12.1 */
+/* {{{ _php_curl_reset_handlers()
+   Reset all handlers of a given php_curl */
+static _php_curl_reset_handlers(php_curl *ch)
+{
+       if (ch->handlers->write->stream) {
+               Z_DELREF_P(ch->handlers->write->stream);
+               ch->handlers->write->stream = NULL;
+       }
+       ch->handlers->write->fp = NULL;
+       ch->handlers->write->method = PHP_CURL_STDOUT;
+       
+       if (ch->handlers->write_header->stream) {
+               Z_DELREF_P(ch->handlers->write_header->stream);
+               ch->handlers->write_header->stream = NULL;
+       }
+       ch->handlers->write_header->fp = NULL;
+       ch->handlers->write_header->method = PHP_CURL_IGNORE;
+
+       if (ch->handlers->read->stream) {
+               Z_DELREF_P(ch->handlers->read->stream);
+               ch->handlers->read->stream = NULL;
+       }
+       ch->handlers->read->fp = NULL;
+       ch->handlers->read->fd = NULL;
+       ch->handlers->read->method  = PHP_CURL_DIRECT;
+
+       if (ch->handlers->std_err) {
+               zval_ptr_dtor(&ch->handlers->std_err);
+               ch->handlers->std_err = NULL;
+       }
+
+       if (ch->handlers->progress->func_name) {
+               zval_ptr_dtor(&ch->handlers->progress->func_name);
+               ch->handlers->progress->fci_cache = empty_fcall_info_cache;
+               ch->handlers->progress->func_name = NULL;
+       }
+       ch->handlers->progress->method = 0;
+}
+/* }}} */
+
+/* {{{ proto void curl_reset(resource ch)
+   Reset all options of a libcurl session handle */
+PHP_FUNCTION(curl_reset)
+{
+       zval       *zid;
+       php_curl   *ch;
+
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zid) == FAILURE) {
+               return;
+       }
+
+       ZEND_FETCH_RESOURCE(ch, php_curl *, &zid, -1, le_curl_name, le_curl);
+
+       if (ch->in_callback) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Attempt to reset cURL handle from a callback");
+               return;
+       }
+
+       curl_easy_reset(ch->cp);
+       _php_curl_reset_handlers(ch);
+       _php_curl_set_default_options(ch);
+}
+/* }}} */
+#endif
+
+#if LIBCURL_VERSION_NUM > 0x070f03 /* 7.15.4 */
+/* {{{ proto void curl_escape(resource ch, string str)
+   URL encodes the given string */
+PHP_FUNCTION(curl_escape)
+{
+       char       *str = NULL, *res = NULL;
+       int        str_len = 0;
+       zval       *zid;
+       php_curl   *ch;
+
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &zid, &str, &str_len) == FAILURE) {
+               return;
+       }
+
+       ZEND_FETCH_RESOURCE(ch, php_curl *, &zid, -1, le_curl_name, le_curl);
+
+       if (res = curl_easy_escape(ch->cp, str, str_len)) {
+               RETVAL_STRING(res, 1);
+               free(res);
+       } else {
+               RETURN_FALSE;
+       }
+}
+/* }}} */
+
+/* {{{ proto void curl_unescape(resource ch, string str)
+   URL decodes the given string */
+PHP_FUNCTION(curl_unescape) 
+{
+       char       *str = NULL, *out = NULL;
+       int        str_len = 0, out_len;
+       zval       *zid;
+       php_curl   *ch;
+
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &zid, &str, &str_len) == FAILURE) {
+               return;
+       }
+
+       ZEND_FETCH_RESOURCE(ch, php_curl *, &zid, -1, le_curl_name, le_curl);
+
+       if (out = curl_easy_unescape(ch->cp, str, str_len, &out_len)) {
+               RETVAL_STRINGL(out, out_len, 1);
+               free(out);
+       } else {
+               RETURN_FALSE;
+       }
+}
+#endif
+/* }}} */
 #endif /* HAVE_CURL */
 
 /*
index 85cb634c63133febd339a8bb90a17f99fbdc5ab6..c14321738df23bb9d39da20215a244439c4df26c 100644 (file)
@@ -39,6 +39,7 @@ package.xml added to support installation using pear installer
    <file role="src" name="curl.dsp"/>
    <file role="src" name="interface.c"/>
    <file role="src" name="multi.c"/>
+   <file role="src" name="share.c"/>
    <file role="src" name="streams.c"/>
    <file role="src" name="php_curl.h"/>
   </filelist>
index 6acfc5eedde88109702b5eb6ee6702efa0f3303d..17bc05a984b224f83462c7c5cba1fb8b15f3e899 100644 (file)
@@ -53,6 +53,8 @@ extern int  le_curl;
 #define le_curl_name "cURL handle"
 extern int  le_curl_multi_handle;
 #define le_curl_multi_handle_name "cURL Multi Handle"
+extern int  le_curl_share_handle;
+#define le_curl_share_handle_name "cURL Share Handle"
 
 PHP_MINIT_FUNCTION(curl);
 PHP_MSHUTDOWN_FUNCTION(curl);
@@ -67,6 +69,15 @@ PHP_FUNCTION(curl_getinfo);
 PHP_FUNCTION(curl_error);
 PHP_FUNCTION(curl_errno);
 PHP_FUNCTION(curl_close);
+
+#if LIBCURL_VERSION_NUM >= 0x070c01 /* 7.12.1 */
+PHP_FUNCTION(curl_reset);
+#endif
+#if LIBCURL_VERSION_NUM > 0x070f03 /* 7.15.4 */
+PHP_FUNCTION(curl_escape);
+PHP_FUNCTION(curl_unescape);
+#endif
+
 PHP_FUNCTION(curl_multi_init);
 PHP_FUNCTION(curl_multi_add_handle);
 PHP_FUNCTION(curl_multi_remove_handle);
@@ -75,7 +86,21 @@ PHP_FUNCTION(curl_multi_exec);
 PHP_FUNCTION(curl_multi_getcontent);
 PHP_FUNCTION(curl_multi_info_read);
 PHP_FUNCTION(curl_multi_close);
+PHP_FUNCTION(curl_share_init);
+PHP_FUNCTION(curl_share_close);
+PHP_FUNCTION(curl_share_setopt);
+
+#if LIBCURL_VERSION_NUM >= 0x070c01 /* 7.12.1 */
+PHP_FUNCTION(curl_reset);
+#endif
+
+#if LIBCURL_VERSION_NUM >= 0x070f04 /* 7.15.4 */
+PHP_FUNCTION(curl_escape);
+PHP_FUNCTION(curl_unescape);
+#endif
+
 void _php_curl_multi_close(zend_rsrc_list_entry * TSRMLS_DC);
+void _php_curl_share_close(zend_rsrc_list_entry * TSRMLS_DC);
 
 typedef struct {
        zval            *func_name;
@@ -145,6 +170,10 @@ typedef struct {
        zend_llist easyh;
 } php_curlm;
 
+typedef struct {
+       CURLSH                   *share;
+} php_curlsh;
+
 void _php_curl_cleanup_handle(php_curl *);
 void _php_curl_multi_cleanup_list(void *data);
 int  _php_curl_verify_handlers(php_curl *ch, int reporterror TSRMLS_DC);
diff --git a/ext/curl/share.c b/ext/curl/share.c
new file mode 100644 (file)
index 0000000..0a6fd52
--- /dev/null
@@ -0,0 +1,136 @@
+/*
+   +----------------------------------------------------------------------+
+   | PHP Version 5                                                        |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1997-2011 The PHP Group                                |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 3.01 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.php.net/license/3_01.txt                                  |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+   | Author: Pierrick Charron <pierrick@php.net>                          |
+   +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
+#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "php.h"
+
+#if HAVE_CURL
+
+#include "php_curl.h"
+
+#include <curl/curl.h>
+
+/* {{{ proto void curl_share_init() 
+   Initialize a share curl handle */
+PHP_FUNCTION(curl_share_init)
+{
+       php_curlsh *sh;
+       
+       if (zend_parse_parameters_none() == FAILURE) {
+               return;
+       }
+
+       sh = ecalloc(1, sizeof(php_curlsh));
+
+       sh->share = curl_share_init();
+
+       ZEND_REGISTER_RESOURCE(return_value, sh, le_curl_share_handle);
+}
+/* }}} */
+
+/* {{{ proto void curl_share_close(resource sh)
+   Close a set of cURL handles */
+PHP_FUNCTION(curl_share_close)
+{
+       zval *z_sh;
+       php_curlsh *sh;
+
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &z_sh) == FAILURE) {
+               return;
+       }
+
+       ZEND_FETCH_RESOURCE(sh, php_curlsh *, &z_sh, -1, le_curl_share_handle_name, le_curl_share_handle);
+       zend_list_delete(Z_LVAL_P(z_sh));
+}
+/* }}} */
+
+static int _php_curl_share_setopt(php_curlsh *sh, long option, zval **zvalue, zval *return_value TSRMLS_DC) /* {{{ */
+{
+       CURLSHcode error = CURLSHE_OK;
+
+       switch (option) {
+               case CURLSHOPT_SHARE:
+               case CURLSHOPT_UNSHARE:
+                       convert_to_long_ex(zvalue);
+                       error = curl_share_setopt(sh->share, option, Z_LVAL_PP(zvalue));
+                       break;
+       }
+
+       if (error != CURLE_OK) {
+               return 1;
+       } else {
+               return 0;
+       }
+}
+/* }}} */
+
+/* {{{ proto bool curl_share_setopt(resource sh, int option, mixed value)
+      Set an option for a cURL transfer */
+PHP_FUNCTION(curl_share_setopt)
+{
+       zval       *zid, **zvalue;
+       long        options;
+       php_curlsh *sh;
+
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rlZ", &zid, &options, &zvalue) == FAILURE) {
+               return;
+       }
+
+       ZEND_FETCH_RESOURCE(sh, php_curlsh *, &zid, -1, le_curl_share_handle_name, le_curl_share_handle);
+
+       if (options <= 0) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid curl share configuration option");
+               RETURN_FALSE;
+       }
+
+       if (!_php_curl_share_setopt(sh, options, zvalue, return_value TSRMLS_CC)) {
+               RETURN_TRUE;
+       } else {
+               RETURN_FALSE;
+       }
+}
+/* }}} */
+
+void _php_curl_share_close(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {{{ */
+{
+       php_curlsh *sh = (php_curlsh *) rsrc->ptr;
+       if (sh) {
+               curl_share_cleanup(sh->share);
+               efree(sh);
+               rsrc->ptr = NULL;
+       }
+}
+/* }}} */
+
+#endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
diff --git a/ext/curl/tests/curl_escape.phpt b/ext/curl/tests/curl_escape.phpt
new file mode 100644 (file)
index 0000000..7c90fb9
Binary files /dev/null and b/ext/curl/tests/curl_escape.phpt differ
diff --git a/ext/curl/tests/curl_reset.phpt b/ext/curl/tests/curl_reset.phpt
new file mode 100644 (file)
index 0000000..a82e9c8
--- /dev/null
@@ -0,0 +1,38 @@
+--TEST--
+Test curl_reset
+--SKIPIF--
+<?php if (!extension_loaded("curl")) print "skip"; ?>
+--FILE--
+<?php
+
+$test_file = tempnam(sys_get_temp_dir(), 'php-curl-test');
+$log_file = tempnam(sys_get_temp_dir(), 'php-curl-test');
+
+$fp = fopen($log_file, 'w+');
+fwrite($fp, "test");
+fclose($fp);
+
+$testfile_fp = fopen($test_file, 'w+');
+
+$ch = curl_init();
+curl_setopt($ch, CURLOPT_FILE, $testfile_fp);
+curl_setopt($ch, CURLOPT_URL, 'file://' . $log_file);
+curl_exec($ch);
+
+curl_reset($ch);
+curl_setopt($ch, CURLOPT_URL, 'file://' . $log_file);
+curl_exec($ch);
+
+curl_close($ch);
+
+fclose($testfile_fp);
+
+echo file_get_contents($test_file);
+
+// cleanup
+unlink($test_file);
+unlink($log_file);
+
+?>
+--EXPECT--
+testtest