OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 08-Nov-2006 09:38:05
Branch: HEAD Handle: 2006110808380500
Modified files:
openpkg-src/apache apache.patch.php apache.spec
Log:
fix building against our latest cURL 7.16
Summary:
Revision Changes Path
1.8 +43 -0 openpkg-src/apache/apache.patch.php
1.355 +1 -1 openpkg-src/apache/apache.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.patch.php
============================================================================
$ cvs diff -u -r1.7 -r1.8 apache.patch.php
--- openpkg-src/apache/apache.patch.php 3 Nov 2006 07:55:26 -0000
1.7
+++ openpkg-src/apache/apache.patch.php 8 Nov 2006 08:38:05 -0000
1.8
@@ -12,4 +12,47 @@
+ (stage == ZEND_INI_STAGE_RUNTIME && (ini_entry->modifiable &
ZEND_INI_USER)==0)) {
return FAILURE;
}
+
+-----------------------------------------------------------------------------
+
+Allow building against cURL 7.16.0 and higher
+(http://cvs.php.net/viewcvs.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.12&r2=1.62.2.14.2.13&view=patch)
+Index: ext/curl/interface.c
+--- ext/curl/interface.c.orig 2006-10-11 01:12:59 +0200
++++ ext/curl/interface.c 2006-11-08 09:26:28 +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);
+@@ -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;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.354 -r1.355 apache.spec
--- openpkg-src/apache/apache.spec 3 Nov 2006 20:35:18 -0000 1.354
+++ openpkg-src/apache/apache.spec 8 Nov 2006 08:38:05 -0000 1.355
@@ -65,7 +65,7 @@
Group: Web
License: ASF
Version: %{V_apache}
-Release: 20061103
+Release: 20061108
# package options (suexec related)
%option with_suexec yes
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
