Merge lp:~clint-fewbar/ubuntu/lucid/php5/lucid-sru-lp564920 into lp:ubuntu/lucid-updates/php5

[Clint Byrum]

SRU for LP #564920

[Thierry Carrez (ttx)]

Looks good, however before this can be committed there should be an SRU report on bug 564920. This allows the SRU team to assess impact vs. regression risk, and give a testcase for the lucid-proposed testers. See https://wiki.ubuntu.com/StableReleaseUpdates#Procedure for details...

[Thierry Carrez (ttx)]

SRU report is ready, uploading in a few.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-05-10 04:00:03 +0000
+++ debian/changelog	2010-08-16 19:33:47 +0000
@@ -1,3 +1,10 @@
+php5 (5.3.2-1ubuntu4.3) lucid-proposed; urgency=low
+
+  * debian/patches/lp564920-fix-big-files.patch: Fix downloading of large
+    files (LP: #564920)
+
+ -- Clint Byrum <[e-mail]>  Mon, 16 Aug 2010 11:50:19 -0700
+
 php5 (5.3.2-1ubuntu4.2) lucid-proposed; urgency=low
 
   * debian/patches/session_save_path.patch: Save PHP sessions to

=== added file 'debian/patches/lp564920-fix-big-files.patch'
--- debian/patches/lp564920-fix-big-files.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/lp564920-fix-big-files.patch	2010-08-16 19:33:47 +0000
@@ -0,0 +1,23 @@
+Description: don't mmap large files
+Author: Marc Deslauriers <[e-mail]>
+Bug: http://bugs.php.net/bug.php?id=52102
+Ubuntu-Bug: https://bugs.edge.launchpad.net/ubuntu/+source/php5/+bug/564920
+
+diff -Nur php5-5.3.2/main/streams/plain_wrapper.c php5-5.3.2.new/main/streams/plain_wrapper.c
+--- php5-5.3.2/main/streams/plain_wrapper.c	2010-02-23 10:04:29.000000000 -0500
++++ php5-5.3.2.new/main/streams/plain_wrapper.c	2010-07-14 18:24:13.000000000 -0400
+@@ -627,7 +627,13 @@
+ 				
+ 				switch (value) {
+ 					case PHP_STREAM_MMAP_SUPPORTED:
+-						return fd == -1 ? PHP_STREAM_OPTION_RETURN_ERR : PHP_STREAM_OPTION_RETURN_OK;
++						if (fd == -1)
++							return PHP_STREAM_OPTION_RETURN_ERR;
++						/* Don't mmap large files */
++						do_fstat(data, 1);
++						if (data->sb.st_size > 4 * 1024 * 1024)
++							return PHP_STREAM_OPTION_RETURN_ERR;
++						return PHP_STREAM_OPTION_RETURN_OK;
+ 
+ 					case PHP_STREAM_MMAP_MAP_RANGE:
+ 						do_fstat(data, 1);

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-05-10 04:00:03 +0000
+++ debian/patches/series	2010-08-16 19:33:47 +0000
@@ -54,3 +54,4 @@
 enchant_unaligned_memory_access.patch
 fix-mysql-badmem.patch
 session_save_path.patch
+lp564920-fix-big-files.patch