[PHP-CVS] cvs: php-src /ext/curl interface.c

[Ilia Alshanetsky]

iliaa           Mon Sep 18 16:13:00 2006 UTC

  Modified files:              
    /php-src/ext/curl   interface.c 
  Log:
  MFB: Fixed bug #38574 (missing curl constants and improper constant
  detection).
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.89&r2=1.90&diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.89 php-src/ext/curl/interface.c:1.90
--- php-src/ext/curl/interface.c:1.89   Sat Sep  9 20:03:55 2006
+++ php-src/ext/curl/interface.c        Mon Sep 18 16:13:00 2006
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: interface.c,v 1.89 2006/09/09 20:03:55 bjori Exp $ */
+/* $Id: interface.c,v 1.90 2006/09/18 16:13:00 iliaa Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -561,15 +561,9 @@
        REGISTER_CURL_CONSTANT(CURLE_SSL_CIPHER);
        REGISTER_CURL_CONSTANT(CURLE_SSL_CACERT);
        REGISTER_CURL_CONSTANT(CURLE_BAD_CONTENT_ENCODING);
-#ifdef CURLE_LDAP_INVALID_URL
        REGISTER_CURL_CONSTANT(CURLE_LDAP_INVALID_URL);
-#endif 
-#ifdef CURLE_FILESIZE_EXCEEDED
        REGISTER_CURL_CONSTANT(CURLE_FILESIZE_EXCEEDED);
-#endif
-#ifdef CURLE_FTP_SSL_FAILED
        REGISTER_CURL_CONSTANT(CURLE_FTP_SSL_FAILED);
-#endif
 
        REGISTER_CURL_CONSTANT(CURLPROXY_HTTP);
        REGISTER_CURL_CONSTANT(CURLPROXY_SOCKS5);
@@ -591,13 +585,21 @@
 
        REGISTER_CURL_CONSTANT(CURLMSG_DONE);
 
-#ifdef CURLOPT_FTPSSLAUTH
+#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);
 #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);
+#endif
+
 #ifdef PHP_CURL_NEED_OPENSSL_TSL
        {
                int i, c = CRYPTO_num_locks();
@@ -1238,9 +1240,12 @@
                case CURLOPT_PROXYAUTH:
 #endif
 
-#ifdef CURLOPT_FTPSSLAUTH
+#if LIBCURL_VERSION_NUM >= 0x070c02
                case CURLOPT_FTPSSLAUTH:
 #endif
+#if LIBCURL_VERSION_NUM >  0x070b00
+               case CURLOPT_FTP_SSL:
+#endif
                case CURLOPT_UNRESTRICTED_AUTH:
                case CURLOPT_PORT:
                case CURLOPT_AUTOREFERER:

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php