iliaa Mon Sep 18 16:11:50 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS
/php-src/ext/curl interface.c
Log:
Fixed bug #38574 (missing curl constants and improper constant detection).
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.254&r2=1.2027.2.547.2.255&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.254 php-src/NEWS:1.2027.2.547.2.255
--- php-src/NEWS:1.2027.2.547.2.254 Sat Sep 16 13:57:17 2006
+++ php-src/NEWS Mon Sep 18 16:11:50 2006
@@ -3,6 +3,8 @@
?? Sep 2006, PHP 5.2.0
- Fixed bug #38844 (curl_easy_strerror() is defined only since cURL 7.12.0).
(Tony)
+- Fixed bug #38574 (missing curl constants and improper constant detection).
+ (Ilia)
14 Sep 2006, PHP 5.2.0RC4
- Added DSA key generation support to openssl_pkey_new(), FR #38731
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.9&r2=1.62.2.14.2.10&diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.9
php-src/ext/curl/interface.c:1.62.2.14.2.10
--- php-src/ext/curl/interface.c:1.62.2.14.2.9 Sat Sep 9 20:04:50 2006
+++ php-src/ext/curl/interface.c Mon Sep 18 16:11:50 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: interface.c,v 1.62.2.14.2.9 2006/09/09 20:04:50 bjori Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.10 2006/09/18 16:11:50 iliaa Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -563,15 +563,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);
@@ -593,13 +587,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();
@@ -1240,9 +1242,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
