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

diff --git a/NEWS b/NEWS
index 9ff669bd3239aca11edb84ef89b2d7f0ae3dcf17..999d14da9a45a3421fd11ad892b6d180bad27c2f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@ PHP                                                                        NEWS
 
 - 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

diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 3a472374afcceaa5f23fe6aa51eb741a3cac51d9..0e4b4daa4b067ec1f345d683f26b94cac4c6ad30 100644 (file)
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -781,6 +781,9 @@ PHP_MINIT_FUNCTION(curl)
 
 #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);