[20951] trunk/dports/www/php5

[source_changes at macosforge.org]

Revision: 20951
          http://trac.macosforge.org/projects/macports/changeset/20951
Author:   ryandesign at macports.org
Date:     2006-12-13 00:06:51 -0800 (Wed, 13 Dec 2006)

Log Message:
-----------
fix #11115: compatibility with curl 7.16.0

Modified Paths:
--------------
    trunk/dports/www/php5/Portfile

Added Paths:
-----------
    trunk/dports/www/php5/files/patch-interface.c.diff

Modified: trunk/dports/www/php5/Portfile
===================================================================
--- trunk/dports/www/php5/Portfile	2006-12-13 08:00:27 UTC (rev 20950)
+++ trunk/dports/www/php5/Portfile	2006-12-13 08:06:51 UTC (rev 20951)
@@ -26,6 +26,8 @@
 	http://downloads.php.net/jani/:rc 
 
 distfiles	php-${version}.tar.bz2:release
+# Fix PHP bug 39354; should be able to remove this when we upgrade to PHP 5.2.1
+patchfiles	patch-interface.c.diff
 worksrcdir	php-${version}
 checksums	md5 e6029fafcee029edcfa2ceed7a005333 \
 		sha1 6306829b1b252156ca3a936ec809aba89a71d9e1

Added: trunk/dports/www/php5/files/patch-interface.c.diff
===================================================================
--- trunk/dports/www/php5/files/patch-interface.c.diff	                        (rev 0)
+++ trunk/dports/www/php5/files/patch-interface.c.diff	2006-12-13 08:06:51 UTC (rev 20951)
@@ -0,0 +1,46 @@
+--- ext/curl/interface.c	2006/10/10 23:12:59	1.62.2.14.2.12
++++ ext/curl/interface.c	2006/11/03 14:53:14	1.62.2.14.2.13
+@@ -16,7 +16,7 @@
+    +----------------------------------------------------------------------+
+ */
+ 
+-/* $Id: interface.c,v 1.62.2.14.2.12 2006/10/10 23:12:59 iliaa Exp $ */
++/* $Id: interface.c,v 1.62.2.14.2.13 2006/11/03 14:53:14 iliaa Exp $ */
+ 
+ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
+ 
+@@ -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);
+@@ -1157,12 +1161,13 @@
+ 	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;

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20061213/7222ede7/attachment.html