felipe          Fri, 17 Jul 2009 00:25:54 +0000

URL: http://svn.php.net/viewvc?view=revision&revision=284217

Changed paths:
        U   php/php-src/branches/PHP_5_3/NEWS
        U   php/php-src/branches/PHP_5_3/ext/curl/interface.c

Log:
- MFH: Fixed bug #48893 (Problems compiling with Curl)

Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS   2009-07-17 00:24:20 UTC (rev 284216)
+++ php/php-src/branches/PHP_5_3/NEWS   2009-07-17 00:25:54 UTC (rev 284217)
@@ -8,6 +8,7 @@

 - Fixed bug #48899 (is_callable returns true even if method does not exist in
   parent class). (Felipe)
+- Fixed bug #48893 (Problems compiling with Curl). (Felipe)
 - Fixed bug #48854 (array_merge_recursive modifies arrays after first one).
   (Felipe)
 - Fixed bug #48788 (RecursiveDirectoryIterator doesn't descend into symlinked

Modified: php/php-src/branches/PHP_5_3/ext/curl/interface.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/curl/interface.c   2009-07-17 00:24:20 UTC 
(rev 284216)
+++ php/php-src/branches/PHP_5_3/ext/curl/interface.c   2009-07-17 00:25:54 UTC 
(rev 284217)
@@ -781,6 +781,9 @@

 #if LIBCURL_VERSION_NUM >= 0x070f01
        REGISTER_CURL_CONSTANT(CURLOPT_FTP_FILEMETHOD);
+#endif
+
+#if LIBCURL_VERSION_NUM >= 0x071001
        REGISTER_CURL_CONSTANT(CURLFTPMETHOD_MULTICWD);
        REGISTER_CURL_CONSTANT(CURLFTPMETHOD_NOCWD);
        REGISTER_CURL_CONSTANT(CURLFTPMETHOD_SINGLECWD);

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

Reply via email to