iliaa Fri Nov 3 14:55:59 2006 UTC
Modified files: (Branch: PHP_4_4)
/php-src/ext/curl curl.c
/php-src NEWS
Log:
MFH: Fixed bug #39354 (Allow building of curl extension against libcurl
7.16.0)
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/curl.c?r1=1.124.2.30.2.13&r2=1.124.2.30.2.14&diff_format=u
Index: php-src/ext/curl/curl.c
diff -u php-src/ext/curl/curl.c:1.124.2.30.2.13
php-src/ext/curl/curl.c:1.124.2.30.2.14
--- php-src/ext/curl/curl.c:1.124.2.30.2.13 Tue Oct 10 23:17:05 2006
+++ php-src/ext/curl/curl.c Fri Nov 3 14:55:59 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: curl.c,v 1.124.2.30.2.13 2006/10/10 23:17:05 iliaa Exp $ */
+/* $Id: curl.c,v 1.124.2.30.2.14 2006/11/03 14:55:59 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -258,7 +258,9 @@
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 @@
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);
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.1247.2.920.2.170&r2=1.1247.2.920.2.171&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.170 php-src/NEWS:1.1247.2.920.2.171
--- php-src/NEWS:1.1247.2.920.2.170 Thu Oct 19 11:27:36 2006
+++ php-src/NEWS Fri Nov 3 14:55:59 2006
@@ -3,6 +3,8 @@
?? ??? 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)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
