Fixed bug #39354 (Allow building of curl extension against libcurl 7.16.0)

diff --git a/NEWS b/NEWS
index 72e4e9bf0c27608aa544091ca4ce92562653adfc..a01c6c0c96b8b2d6efdf779d9b1c942042bc39af 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,8 @@ PHP                                                                        NEWS
   . Fixed a bug when callback function returns a non-modified value.
   . Added filter support for $_SERVER in cgi/apache2 sapis.
   . Make sure PHP_SELF is filtered in Apache 1 sapi.
+- Fixed bug #39354 (Allow building of curl extension against libcurl 7.16.0)
+  (Ilia) 
 - Fixed bug #39265 (Fixed path handling inside mod_files.sh). 
   (michal dot taborsky at gmail dot com, Ilia)
 - Fixed bug #39215 (Inappropriate close of stdin/stdout/stderr). (Wez,Ilia)

diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 4e387bbc65d96efe40eda12ff8bdedf9795ebd33..7dba9b0d095a29af836dee47763c0a6a26d799ed 100644 (file)
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -369,7 +369,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);
@@ -409,7 +411,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);
@@ -1157,12 +1161,13 @@ PHP_FUNCTION(curl_copy_handle)
        dupch->handlers->write_header->fp = ch->handlers->write_header->fp;
        dupch->handlers->read->fp = ch->handlers->read->fp;
        dupch->handlers->read->fd = ch->handlers->read->fd;
-
+#if CURLOPT_PASSWDDATA != 0
        if (ch->handlers->passwd) {
                zval_add_ref(&ch->handlers->passwd);
                dupch->handlers->passwd = ch->handlers->passwd;
                curl_easy_setopt(ch->cp, CURLOPT_PASSWDDATA, (void *) dupch);
        }
+#endif
        if (ch->handlers->write->func_name) {
                zval_add_ref(&ch->handlers->write->func_name);
                dupch->handlers->write->func_name = ch->handlers->write->func_name;