From: Felipe Pena <felipe@php.net>
Date: Fri, 17 Jul 2009 00:25:54 +0000 (+0000)
Subject: - MFH: Fixed bug #48893 (Problems compiling with Curl)
X-Git-Tag: php-5.3.1RC1~376
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f4f825a7a52905b90b8275fbe4568c85623bd162;p=php

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

diff --git a/NEWS b/NEWS
index 9ff669bd32..999d14da9a 100644
--- 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 3a472374af..0e4b4daa4b 100644
--- 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);