Author: glen Date: Fri Feb 19 23:57:22 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- restore
---- Files affected:
packages/php:
php-libtool.patch (1.7 -> 1.8) , php-curl-limit-speed.patch (1.2 -> 1.3) ,
php-fcgi-error_log-no-newlines.patch (1.2 -> 1.3)
---- Diffs:
================================================================
Index: packages/php/php-libtool.patch
diff -u /dev/null packages/php/php-libtool.patch:1.8
--- /dev/null Sat Feb 20 00:57:22 2010
+++ packages/php/php-libtool.patch Sat Feb 20 00:57:16 2010
@@ -0,0 +1,20 @@
+--- php/scripts/phpize.in.org 2008-06-16 10:03:28.882568639 +0200
++++ php/scripts/phpize.in 2008-06-16 10:04:37.424018256 +0200
+@@ -8,7 +8,7 @@
+ builddir="`pwd`"
+ SED="@SED@"
+
+-FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4"
++FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4 lt~obsolete.m4
ltoptions.m4 ltsugar.m4 ltversion.m4"
+ FILES="acinclude.m4 Makefile.global config.sub config.guess ltmain.sh
run-tests*.php"
+ CLEAN_FILES="$FILES *.o *.lo *.la .deps .libs/ build/ include/ modules/
install-sh \
+ mkinstalldirs missing config.nice config.sub config.guess configure
configure.in \
+@@ -127,7 +127,7 @@
+
+ (cd "$phpdir" && cp $FILES_BUILD "$builddir"/build)
+ (cd "$phpdir" && cp $FILES "$builddir")
+- (cd "$builddir" && cat acinclude.m4 ./build/libtool.m4 > aclocal.m4)
++ (cd "$builddir" && cat acinclude.m4
./build/{libtool,lt~obsolete,ltoptions,ltsugar,ltversion}.m4 > aclocal.m4)
+ }
+
+ phpize_replace_prefix()
================================================================
Index: packages/php/php-curl-limit-speed.patch
diff -u /dev/null packages/php/php-curl-limit-speed.patch:1.3
--- /dev/null Sat Feb 20 00:57:22 2010
+++ packages/php/php-curl-limit-speed.patch Sat Feb 20 00:57:16 2010
@@ -0,0 +1,30 @@
+--- php-5.2.5.orig/ext/curl/interface.c 2008-03-26 17:05:19.000000000
+0100
++++ php-5.2.5/ext/curl/interface.c 2008-03-26 17:09:05.000000000 +0100
+@@ -462,6 +462,14 @@
+ REGISTER_CURL_CONSTANT(CURLOPT_TCP_NODELAY);
+ #endif
+ REGISTER_CURL_CONSTANT(CURLOPT_HTTP200ALIASES);
++
++/* Added constants to support limiting the transfer speed in PHP */
++/* Fixed by Tijnema ([email protected]) */
++#if LIBCURL_VERSION_NUM > 0x070fff /* CURLOPT_MAX_SEND_SPEED_LARGE and
CURLOPT_MAX_SEND_SPEED_LARGE are available since curl 7.16.0 */
++ REGISTER_CURL_CONSTANT(CURLOPT_MAX_SEND_SPEED_LARGE);
++ REGISTER_CURL_CONSTANT(CURLOPT_MAX_RECV_SPEED_LARGE);
++#endif
++
+ REGISTER_CURL_CONSTANT(CURL_TIMECOND_IFMODSINCE);
+ REGISTER_CURL_CONSTANT(CURL_TIMECOND_IFUNMODSINCE);
+ REGISTER_CURL_CONSTANT(CURL_TIMECOND_LASTMOD);
+@@ -1288,6 +1296,12 @@
+ #if LIBCURL_VERSION_NUM > 0x070b01 /* CURLOPT_TCP_NODELAY is available since
curl 7.11.2 */
+ case CURLOPT_TCP_NODELAY:
+ #endif
++/* Added case options to support limiting the transfer speed in PHP */
++/* Fixed by Tijnema ([email protected]) */
++#if LIBCURL_VERSION_NUM > 0x070fff /* CURLOPT_MAX_SEND_SPEED_LARGE and
CURLOPT_MAX_SEND_SPEED_LARGE are available since curl 7.16.0 */
++ case CURLOPT_MAX_SEND_SPEED_LARGE:
++ case CURLOPT_MAX_RECV_SPEED_LARGE:
++#endif
+ convert_to_long_ex(zvalue);
+ error = curl_easy_setopt(ch->cp, option,
Z_LVAL_PP(zvalue));
+ break;
================================================================
Index: packages/php/php-fcgi-error_log-no-newlines.patch
diff -u /dev/null packages/php/php-fcgi-error_log-no-newlines.patch:1.3
--- /dev/null Sat Feb 20 00:57:22 2010
+++ packages/php/php-fcgi-error_log-no-newlines.patch Sat Feb 20 00:57:16 2010
@@ -0,0 +1,16 @@
+--- ./sapi/cgi/cgi_main.c~ 2007-08-09 02:51:57.000000000 +0300
++++ ./sapi/cgi/cgi_main.c 2007-09-05 20:54:19.390089070 +0300
+@@ -558,12 +558,7 @@
+ request = (fcgi_request*) SG(server_context);
+ if (request) {
+ int len = strlen(message);
+- char *buf = malloc(len+2);
+-
+- memcpy(buf, message, len);
+- memcpy(buf + len, "\n", sizeof("\n"));
+- fcgi_write(request, FCGI_STDERR, buf, len+1);
+- free(buf);
++ fcgi_write(request, FCGI_STDERR, message, len);
+ } else {
+ fprintf(stderr, "%s\n", message);
+ }
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php-libtool.patch?r1=1.7&r2=1.8&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php-curl-limit-speed.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php-fcgi-error_log-no-newlines.patch?r1=1.2&r2=1.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
