From: Ilia Alshanetsky <iliaa@php.net>
Date: Mon, 18 Sep 2006 16:13:00 +0000 (+0000)
Subject: MFB: Fixed bug #38574 (missing curl constants and improper constant
X-Git-Tag: RELEASE_1_0_0RC1~1639
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b8b3ade1280fde82a2edb065d6e92f4a4dbb7a19;p=php

MFB: Fixed bug #38574 (missing curl constants and improper constant
detection).
---

diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 853b940a9e..44651999d5 100644
--- 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: