MFH: Fixed bug #39354 (Allow building of curl extension against libcurl

7.16.0)

diff --git a/NEWS b/NEWS
index ba6c8e57f68f822c5de5d647325e04ba3b259d24..386862e2c78bb2453585e2be99a5dca9adcadcc5 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@ PHP 4                                                                      NEWS
 ?? ??? 2006, Version 4.4.5
 - Updated PCRE to version 6.7. (Ilia)
 - Fixed missing open_basedir check inside chdir() function. (Ilia)
+- Fixed bug #39354 (Allow building of curl extension against libcurl
+  7.16.0). (Ilia)
 - Fixed bug #39129 (avoid creation of a dummy constructor. (Ilia)
 - Fixed bug #39034 (curl_exec() with return transfer returns TRUE on empty
   files). (Ilia)

diff --git a/ext/curl/curl.c b/ext/curl/curl.c
index 0e361b3d4b60244dac92e3207a50db35ab8af8ed..83771555bfe162942b80af601dae2ace0cc71dff 100644 (file)
--- a/ext/curl/curl.c
+++ b/ext/curl/curl.c
@@ -258,7 +258,9 @@ PHP_MINIT_FUNCTION(curl)
        REGISTER_CURL_CONSTANT(CURLOPT_FTPAPPEND);
        REGISTER_CURL_CONSTANT(CURLOPT_NETRC);
        REGISTER_CURL_CONSTANT(CURLOPT_FOLLOWLOCATION);
+#if CURLOPT_FTPASCII != 0
        REGISTER_CURL_CONSTANT(CURLOPT_FTPASCII);
+#endif
        REGISTER_CURL_CONSTANT(CURLOPT_PUT);
 #if CURLOPT_MUTE != 0
        REGISTER_CURL_CONSTANT(CURLOPT_MUTE);
@@ -296,7 +298,9 @@ PHP_MINIT_FUNCTION(curl)
        REGISTER_CURL_CONSTANT(CURLOPT_FILETIME);
        REGISTER_CURL_CONSTANT(CURLOPT_WRITEFUNCTION);
        REGISTER_CURL_CONSTANT(CURLOPT_READFUNCTION);
+#if CURLOPT_PASSWDFUNCTION != 0 
        REGISTER_CURL_CONSTANT(CURLOPT_PASSWDFUNCTION);
+#endif
        REGISTER_CURL_CONSTANT(CURLOPT_HEADERFUNCTION);
        REGISTER_CURL_CONSTANT(CURLOPT_MAXREDIRS);
        REGISTER_CURL_CONSTANT(CURLOPT_MAXCONNECTS);