Patch php-patch-urlscanner-bug26862.diff for Output Control Bug #54727

Patch version 2011-05-13 12:00 UTC

Obsoleted by patches:

• php-patch-urlscanner-bug26862-correct.diff, revision 2011-05-13 12:02 UTC

• 2011-05-13 12:00 UTC [diff to current]

Developer: mats.lindh@gmail.com

Index: ext/standard/tests/serialize/serialization_objects_001.phpt
===================================================================
--- ext/standard/tests/serialize/serialization_objects_001.phpt	(revision 310987)
+++ ext/standard/tests/serialize/serialization_objects_001.phpt	(working copy)
@@ -1,5 +1,7 @@
 --TEST--
 Test serialize() & unserialize() functions: objects
+--INI--
+serialize_precision=100
 --FILE--
 <?php 
 /* Prototype  : proto string serialize(mixed variable)
Index: ext/standard/tests/serialize/serialization_objects_003.phpt
===================================================================
--- ext/standard/tests/serialize/serialization_objects_003.phpt	(revision 310987)
+++ ext/standard/tests/serialize/serialization_objects_003.phpt	(working copy)
@@ -1,5 +1,7 @@
 --TEST--
 Test serialize() & unserialize() functions: objects (abstract classes)
+--INI--
+serialize_precision=100
 --FILE--
 <?php 
 /* Prototype  : proto string serialize(mixed variable)
@@ -64,4 +66,4 @@
 string(18) "s:10:"extendName";"
 string(10) "extendName"
 
-Done
\ No newline at end of file
+Done
Index: ext/standard/tests/serialize/001.phpt
===================================================================
--- ext/standard/tests/serialize/001.phpt	(revision 310987)
+++ ext/standard/tests/serialize/001.phpt	(working copy)
@@ -1,5 +1,7 @@
 --TEST--
 serialize()/unserialize()/var_dump()
+--INI--
+serialize_precision=100
 --FILE--
 <?php 
 class t
Index: ext/standard/tests/serialize/serialization_objects_002.phpt
===================================================================
--- ext/standard/tests/serialize/serialization_objects_002.phpt	(revision 310987)
+++ ext/standard/tests/serialize/serialization_objects_002.phpt	(working copy)
@@ -1,5 +1,7 @@
 --TEST--
 Test serialize() & unserialize() functions: objects (variations)
+--INI--
+serialize_precision=100
 --FILE--
 <?php 
 /* Prototype  : proto string serialize(mixed variable)
@@ -319,4 +321,4 @@
   NULL
 }
 
-Done
\ No newline at end of file
+Done
Index: ext/standard/tests/serialize/serialization_arrays_001.phpt
===================================================================
--- ext/standard/tests/serialize/serialization_arrays_001.phpt	(revision 310987)
+++ ext/standard/tests/serialize/serialization_arrays_001.phpt	(working copy)
@@ -1,5 +1,7 @@
 --TEST--
 Test serialize() & unserialize() functions: arrays (circular references)
+--INI--
+serialize_precision=100
 --FILE--
 <?php 
 /* Prototype  : proto string serialize(mixed variable)
Index: ext/standard/url_scanner_ex.c
===================================================================
--- ext/standard/url_scanner_ex.c	(revision 310987)
+++ ext/standard/url_scanner_ex.c	(working copy)
@@ -1012,7 +1012,8 @@
 			ctx->result.len = 0;
 			smart_str_free(&ctx->buf);
 		} else {
-			*handled_output = NULL;
+			*handled_output = estrdup(output);
+			*handled_output_len = output_len;
 		}
 	} else {
 		*handled_output = NULL;
Index: ext/session/tests/bug26862.phpt
===================================================================
--- ext/session/tests/bug26862.phpt	(revision 310987)
+++ ext/session/tests/bug26862.phpt	(working copy)
@@ -11,12 +11,12 @@
 session_start();
 output_add_rewrite_var('var', 'value');
 
-echo '<a href="file.php">link</a>';
+echo '<a href="file-first.php">link</a>';
 
 ob_flush();
 
 output_reset_rewrite_vars();
-echo '<a href="file.php">link</a>';
+echo '<a href="file-second.php">link</a>';
 ?>
 --EXPECT--
-<a href="file.php?var=value">link</a><a href="file.php">link</a>
+<a href="file-first.php?var=value">link</a><a href="file-second.php">link</a>