SOURCES: php-curl.patch (NEW) - fix build with curl 7.16

qboosh qboosh at pld-linux.org
Tue Nov 21 23:00:06 CET 2006


Author: qboosh                       Date: Tue Nov 21 22:00:05 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fix build with curl 7.16

---- Files affected:
SOURCES:
   php-curl.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/php-curl.patch
diff -u /dev/null SOURCES/php-curl.patch:1.1
--- /dev/null	Tue Nov 21 23:00:06 2006
+++ SOURCES/php-curl.patch	Tue Nov 21 23:00:00 2006
@@ -0,0 +1,36 @@
+--- php-5.2.0/ext/curl/interface.c.orig	2006-10-11 01:12:59.000000000 +0200
++++ php-5.2.0/ext/curl/interface.c	2006-11-21 22:57:41.498291750 +0100
+@@ -369,7 +369,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);
+@@ -409,7 +411,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);
+@@ -1158,11 +1162,13 @@
+ 	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;
================================================================


More information about the pld-cvs-commit mailing list