rpms/php/devel php-5.1.6-curl716.patch,1.1,1.2

[fedora-cvs-commits at redhat.com]

Author: jorton

Update of /cvs/dist/rpms/php/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14193

Modified Files:
	php-5.1.6-curl716.patch 
Log Message:
- update for 5.2.0


php-5.1.6-curl716.patch:
 interface.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletion(-)

Index: php-5.1.6-curl716.patch
===================================================================
RCS file: /cvs/dist/rpms/php/devel/php-5.1.6-curl716.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-5.1.6-curl716.patch	31 Oct 2006 14:04:09 -0000	1.1
+++ php-5.1.6-curl716.patch	15 Nov 2006 11:53:35 -0000	1.2
@@ -1,6 +1,6 @@
---- php-5.1.6/ext/curl/interface.c.curl716
-+++ php-5.1.6/ext/curl/interface.c
-@@ -271,7 +271,9 @@
+--- php-5.2.0/ext/curl/interface.c.curl716
++++ php-5.2.0/ext/curl/interface.c
+@@ -369,7 +369,9 @@
  	REGISTER_CURL_CONSTANT(CURLOPT_FTPAPPEND);
  	REGISTER_CURL_CONSTANT(CURLOPT_NETRC);
  	REGISTER_CURL_CONSTANT(CURLOPT_FOLLOWLOCATION);
@@ -10,7 +10,7 @@
  	REGISTER_CURL_CONSTANT(CURLOPT_PUT);
  #if CURLOPT_MUTE != 0
  	REGISTER_CURL_CONSTANT(CURLOPT_MUTE);
-@@ -311,7 +313,9 @@
+@@ -409,7 +411,9 @@
  	REGISTER_CURL_CONSTANT(CURLOPT_FILETIME);
  	REGISTER_CURL_CONSTANT(CURLOPT_WRITEFUNCTION);
  	REGISTER_CURL_CONSTANT(CURLOPT_READFUNCTION);
@@ -20,7 +20,7 @@
  	REGISTER_CURL_CONSTANT(CURLOPT_HEADERFUNCTION);
  	REGISTER_CURL_CONSTANT(CURLOPT_MAXREDIRS);
  	REGISTER_CURL_CONSTANT(CURLOPT_MAXCONNECTS);
-@@ -823,7 +827,7 @@
+@@ -927,7 +931,7 @@
  	return 0;
  }
  
@@ -29,3 +29,17 @@
  /* {{{ curl_passwd
   */
  static size_t curl_passwd(void *ctx, char *prompt, char *buf, int buflen)
+@@ -1158,11 +1162,13 @@
+ 	dupch->handlers->read->fp = ch->handlers->read->fp;
+ 	dupch->handlers->read->fd = ch->handlers->read->fd;
+ 
++#ifdef CURLOPT_PASSWDDATA
+ 	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;