Added support for better control over FTP encryption protocols.

diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 8d1bb3600bb07a07ac9a05f73aefe82ea1719f0e..ba54b1dd7807d7d0e7c22be8350c65f743eefc1f 100644 (file)
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -369,7 +369,14 @@ PHP_MINIT_FUNCTION(curl)
        REGISTER_CURL_CONSTANT(CURLM_INTERNAL_ERROR);
 
        REGISTER_CURL_CONSTANT(CURLMSG_DONE);
-       
+
+#ifdef CURLOPT_FTPSSLAUTH
+       REGISTER_CURL_CONSTANT(CURLOPT_FTPSSLAUTH);
+       REGISTER_CURL_CONSTANT(CURLFTPAUTH_DEFAULT);
+       REGISTER_CURL_CONSTANT(CURLFTPAUTH_SSL);
+       REGISTER_CURL_CONSTANT(CURLFTPAUTH_TLS);
+#endif
+
        if (curl_global_init(CURL_GLOBAL_SSL) != CURLE_OK) {
                return FAILURE;
        }
@@ -924,6 +931,10 @@ PHP_FUNCTION(curl_setopt)
 #if LIBCURL_VERSION_NUM > 0x070a06 /* CURLOPT_PROXYAUTH is available since curl 7.10.7 */
                case CURLOPT_PROXYAUTH:
 #endif
+
+#ifdef CURLOPT_FTPSSLAUTH
+               case CURLOPT_FTPSSLAUTH:
+#edif
                case CURLOPT_UNRESTRICTED_AUTH:
                case CURLOPT_PORT:
                        convert_to_long_ex(zvalue);