MFB: Fixed bug #38574 (missing curl constants and improper constant

detection).

diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 853b940a9e2f959ec97355f0ef3ec5e116172a2a..44651999d562b22aa02f915794c45db0b64f7337 100644 (file)
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -561,15 +561,9 @@ PHP_MINIT_FUNCTION(curl)
        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 @@ PHP_MINIT_FUNCTION(curl)
 
        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,8 +1240,11 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
                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: