[arch-commits] Commit in php/repos (3 files)

[Pierre Schmitz]

    Date: Tuesday, July 14, 2009 @ 05:38:39
  Author: pierre
Revision: 46216

Merged revisions 46215 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/php/trunk

........
  r46215 | pierre | 2009-07-14 11:38:03 +0200 (Di, 14 Jul 2009) | 2 lines
  
  upgpkg: php 5.2.10-3
      fix curl regression
........

Added:
  php/repos/extra-x86_64/curl-flush.patch
    (from rev 46215, php/trunk/curl-flush.patch)
Modified:
  php/repos/extra-x86_64/	(properties)
  php/repos/extra-x86_64/PKGBUILD

------------------+
 PKGBUILD         |   14 +++++++++-----
 curl-flush.patch |   17 +++++++++++++++++
 2 files changed, 26 insertions(+), 5 deletions(-)


Property changes on: php/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /php/trunk:1-44335
   + /php/trunk:1-46215

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-07-14 09:38:03 UTC (rev 46215)
+++ extra-x86_64/PKGBUILD	2009-07-14 09:38:39 UTC (rev 46216)
@@ -3,7 +3,7 @@
 
 pkgname=php
 pkgver=5.2.10
-pkgrel=2
+pkgrel=3
 _suhosinver=${pkgver}-0.9.7
 pkgdesc='A high-level scripting language'
 arch=('i686' 'x86_64')
@@ -37,14 +37,15 @@
             'mhash: mhash'
             'gmp: gmp'
             )
-source=("http://www.php.net/distributions/${pkgname}-${pkgver}.tar.bz2" \
-        "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz" \
-        'php.ini' 'apache.conf' 'db-configure.patch')
+source=("http://www.php.net/distributions/${pkgname}-${pkgver}.tar.bz2"
+        "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz"
+        'php.ini' 'apache.conf' 'db-configure.patch' 'curl-flush.patch')
 md5sums=('15c7b5a87f57332d6fc683528e28247b'
          '41b475a469eef0eb0e7aa10a820f12b2'
          '50b6a4ce330b016e19cb922d202ab170'
          '96ca078be6729b665be8a865535a97bf'
-         '74e5ce5a02488ec91b1c59f539e42936')
+         '74e5ce5a02488ec91b1c59f539e42936'
+         '648c83c991a187cd0f2be435cb022947')
 
 build() {
 	phpconfig="--prefix=/usr \
@@ -137,6 +138,9 @@
 	# apply suhosin patch
 	patch -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch
 
+	# fix curl regression; should be fixed upstream with PHP >= 5.2.11
+	patch -p3 -i ${srcdir}/curl-flush.patch
+
 	# cli
 	./configure ${phpconfig} \
 		--disable-cgi \

Copied: php/repos/extra-x86_64/curl-flush.patch (from rev 46215, php/trunk/curl-flush.patch)
===================================================================
--- extra-x86_64/curl-flush.patch	                        (rev 0)
+++ extra-x86_64/curl-flush.patch	2009-07-14 09:38:39 UTC (rev 46216)
@@ -0,0 +1,17 @@
+--- /repository/php-src/ext/curl/interface.c	2009/06/15 12:38:11	1.62.2.14.2.57
++++ /repository/php-src/ext/curl/interface.c	2009/06/28 10:00:28	1.62.2.14.2.58
+@@ -1827,6 +1827,14 @@
+ 	if (ch->handlers->write->method == PHP_CURL_RETURN && ch->handlers->write->buf.len > 0) {
+ 		smart_str_0(&ch->handlers->write->buf);
+ 		RETURN_STRINGL(ch->handlers->write->buf.c, ch->handlers->write->buf.len, 1);
++	}
++
++	/* flush the file handle, so any remaining data is synched to disk */
++	if (ch->handlers->write->method == PHP_CURL_FILE && ch->handlers->write->fp) {
++		fflush(ch->handlers->write->fp);
++	}
++	if (ch->handlers->write_header->method == PHP_CURL_FILE && ch->handlers->write_header->fp) {
++		fflush(ch->handlers->write_header->fp);
+ 	}
+ 
+ 	if (ch->handlers->write->method == PHP_CURL_RETURN) {