cellog Fri, 13 Nov 2009 00:58:11 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=290647
Log:
fix PHP Bug #49938: Phar::isBuffering() returns inverted value
Bug: http://bugs.php.net/49938 (Analyzed) Phar::isBuffering() returns inverted
value
Changed paths:
U pecl/phar/trunk/package.php
U pecl/phar/trunk/phar_object.c
U pecl/phar/trunk/tests/phar_begin_setstub_commit.phpt
U pecl/phar/trunk/tests/phar_begin_setstub_commitU.phpt
U pecl/phar/trunk/tests/tar/phar_begin_setstub_commit.phpt
U pecl/phar/trunk/tests/tar/phar_begin_setstub_commitU.phpt
U pecl/phar/trunk/tests/zip/phar_begin_setstub_commit.phpt
U pecl/phar/trunk/tests/zip/phar_begin_setstub_commitU.phpt
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/phar/phar_object.c
U
php/php-src/branches/PHP_5_3/ext/phar/tests/phar_begin_setstub_commit.phpt
U
php/php-src/branches/PHP_5_3/ext/phar/tests/phar_begin_setstub_commitU.phpt
U
php/php-src/branches/PHP_5_3/ext/phar/tests/tar/phar_begin_setstub_commit.phpt
U
php/php-src/branches/PHP_5_3/ext/phar/tests/tar/phar_begin_setstub_commitU.phpt
U
php/php-src/branches/PHP_5_3/ext/phar/tests/zip/phar_begin_setstub_commit.phpt
U
php/php-src/branches/PHP_5_3/ext/phar/tests/zip/phar_begin_setstub_commitU.phpt
U php/php-src/trunk/ext/phar/phar_object.c
U php/php-src/trunk/ext/phar/tests/phar_begin_setstub_commit.phpt
U php/php-src/trunk/ext/phar/tests/phar_begin_setstub_commitU.phpt
U php/php-src/trunk/ext/phar/tests/tar/phar_begin_setstub_commit.phpt
U php/php-src/trunk/ext/phar/tests/tar/phar_begin_setstub_commitU.phpt
U php/php-src/trunk/ext/phar/tests/zip/phar_begin_setstub_commit.phpt
U php/php-src/trunk/ext/phar/tests/zip/phar_begin_setstub_commitU.phpt
Modified: pecl/phar/trunk/package.php
===================================================================
--- pecl/phar/trunk/package.php 2009-11-13 00:41:37 UTC (rev 290646)
+++ pecl/phar/trunk/package.php 2009-11-13 00:58:11 UTC (rev 290647)
@@ -2,6 +2,7 @@
$notes = '
Bugfix release
+ * Fix PHP Bug #49938: Phar::isBuffering() returns inverted value
* Fix PHP Bug #49910: no support for ././@LongLink for long filenames in
phar tar support
';
Modified: pecl/phar/trunk/phar_object.c
===================================================================
--- pecl/phar/trunk/phar_object.c 2009-11-13 00:41:37 UTC (rev 290646)
+++ pecl/phar/trunk/phar_object.c 2009-11-13 00:58:11 UTC (rev 290647)
@@ -2945,7 +2945,7 @@
{
PHAR_ARCHIVE_OBJECT();
- RETURN_BOOL(!phar_obj->arc.archive->donotflush);
+ RETURN_BOOL(phar_obj->arc.archive->donotflush);
}
/* }}} */
Modified: pecl/phar/trunk/tests/phar_begin_setstub_commit.phpt
===================================================================
--- pecl/phar/trunk/tests/phar_begin_setstub_commit.phpt 2009-11-13 00:41:37 UTC (rev 290646)
+++ pecl/phar/trunk/tests/phar_begin_setstub_commit.phpt 2009-11-13 00:58:11 UTC (rev 290647)
@@ -36,8 +36,8 @@
unlink(dirname(__FILE__) . '/brandnewphar.phar');
?>
--EXPECT--
+bool(false)
bool(true)
-bool(false)
string(5) "Hello"
string(84) "<?php var_dump("First"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
"
@@ -45,7 +45,7 @@
string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
"
===COMMIT===
-bool(true)
+bool(false)
string(5) "Hello"
string(5) "World"
string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
Modified: pecl/phar/trunk/tests/phar_begin_setstub_commitU.phpt
===================================================================
--- pecl/phar/trunk/tests/phar_begin_setstub_commitU.phpt 2009-11-13 00:41:37 UTC (rev 290646)
+++ pecl/phar/trunk/tests/phar_begin_setstub_commitU.phpt 2009-11-13 00:58:11 UTC (rev 290647)
@@ -36,8 +36,8 @@
unlink(dirname(__FILE__) . '/brandnewphar.phar');
?>
--EXPECT--
+bool(false)
bool(true)
-bool(false)
unicode(5) "Hello"
string(84) "<?php var_dump("First"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
"
@@ -45,7 +45,7 @@
string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
"
===COMMIT===
-bool(true)
+bool(false)
unicode(5) "Hello"
unicode(5) "World"
string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
Modified: pecl/phar/trunk/tests/tar/phar_begin_setstub_commit.phpt
===================================================================
--- pecl/phar/trunk/tests/tar/phar_begin_setstub_commit.phpt 2009-11-13 00:41:37 UTC (rev 290646)
+++ pecl/phar/trunk/tests/tar/phar_begin_setstub_commit.phpt 2009-11-13 00:58:11 UTC (rev 290647)
@@ -37,8 +37,8 @@
?>
--EXPECT--
bool(true)
+bool(false)
bool(true)
-bool(false)
string(5) "Hello"
string(84) "<?php var_dump("First"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
"
@@ -46,7 +46,7 @@
string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
"
===COMMIT===
-bool(true)
+bool(false)
string(5) "Hello"
string(5) "World"
string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
Modified: pecl/phar/trunk/tests/tar/phar_begin_setstub_commitU.phpt
===================================================================
--- pecl/phar/trunk/tests/tar/phar_begin_setstub_commitU.phpt 2009-11-13 00:41:37 UTC (rev 290646)
+++ pecl/phar/trunk/tests/tar/phar_begin_setstub_commitU.phpt 2009-11-13 00:58:11 UTC (rev 290647)
@@ -37,8 +37,8 @@
?>
--EXPECT--
bool(true)
+bool(false)
bool(true)
-bool(false)
unicode(5) "Hello"
string(84) "<?php var_dump("First"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
"
@@ -46,7 +46,7 @@
string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
"
===COMMIT===
-bool(true)
+bool(false)
unicode(5) "Hello"
unicode(5) "World"
string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
Modified: pecl/phar/trunk/tests/zip/phar_begin_setstub_commit.phpt
===================================================================
--- pecl/phar/trunk/tests/zip/phar_begin_setstub_commit.phpt 2009-11-13 00:41:37 UTC (rev 290646)
+++ pecl/phar/trunk/tests/zip/phar_begin_setstub_commit.phpt 2009-11-13 00:58:11 UTC (rev 290647)
@@ -50,8 +50,8 @@
?>
--EXPECT--
bool(true)
+bool(false)
bool(true)
-bool(false)
string(5) "Hello"
string(84) "<?php var_dump("First"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
"
@@ -59,7 +59,7 @@
string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
"
===COMMIT===
-bool(true)
+bool(false)
string(5) "Hello"
string(5) "World"
string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
Modified: pecl/phar/trunk/tests/zip/phar_begin_setstub_commitU.phpt
===================================================================
--- pecl/phar/trunk/tests/zip/phar_begin_setstub_commitU.phpt 2009-11-13 00:41:37 UTC (rev 290646)
+++ pecl/phar/trunk/tests/zip/phar_begin_setstub_commitU.phpt 2009-11-13 00:58:11 UTC (rev 290647)
@@ -50,8 +50,8 @@
?>
--EXPECT--
bool(true)
+bool(false)
bool(true)
-bool(false)
unicode(5) "Hello"
string(84) "<?php var_dump("First"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
"
@@ -59,7 +59,7 @@
string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
"
===COMMIT===
-bool(true)
+bool(false)
unicode(5) "Hello"
unicode(5) "World"
string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS 2009-11-13 00:41:37 UTC (rev 290646)
+++ php/php-src/branches/PHP_5_3/NEWS 2009-11-13 00:58:11 UTC (rev 290647)
@@ -33,6 +33,7 @@
(Jani)
- Fixed bug #49985 (pdo_pgsql prepare() re-use previous aborted
transaction). (ben dot pineau at gmail dot com, Ilia, Matteo)
+- Fixed bug #49938 (Phar::isBuffering() returns inverted value). (Greg)
- Fixed bug #49921 (Curl post upload functions changed). (Ilia)
- Fixed bug #49910 (no support for ././@LongLink for long filenames in phar
tar support). (Greg)
Modified: php/php-src/branches/PHP_5_3/ext/phar/phar_object.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/phar/phar_object.c 2009-11-13 00:41:37 UTC (rev 290646)
+++ php/php-src/branches/PHP_5_3/ext/phar/phar_object.c 2009-11-13 00:58:11 UTC (rev 290647)
@@ -2945,7 +2945,7 @@
{
PHAR_ARCHIVE_OBJECT();
- RETURN_BOOL(!phar_obj->arc.archive->donotflush);
+ RETURN_BOOL(phar_obj->arc.archive->donotflush);
}
/* }}} */
Modified: php/php-src/branches/PHP_5_3/ext/phar/tests/phar_begin_setstub_commit.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/phar/tests/phar_begin_setstub_commit.phpt 2009-11-13 00:41:37 UTC (rev 290646)
+++ php/php-src/branches/PHP_5_3/ext/phar/tests/phar_begin_setstub_commit.phpt 2009-11-13 00:58:11 UTC (rev 290647)
@@ -36,8 +36,8 @@
unlink(dirname(__FILE__) . '/brandnewphar.phar');
?>
--EXPECT--
+bool(false)
bool(true)
-bool(false)
string(5) "Hello"
string(84) "<?php var_dump("First"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
"
@@ -45,7 +45,7 @@
string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
"
===COMMIT===
-bool(true)
+bool(false)
string(5) "Hello"
string(5) "World"
string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
Modified: php/php-src/branches/PHP_5_3/ext/phar/tests/phar_begin_setstub_commitU.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/phar/tests/phar_begin_setstub_commitU.phpt 2009-11-13 00:41:37 UTC (rev 290646)
+++ php/php-src/branches/PHP_5_3/ext/phar/tests/phar_begin_setstub_commitU.phpt 2009-11-13 00:58:11 UTC (rev 290647)
@@ -36,8 +36,8 @@
unlink(dirname(__FILE__) . '/brandnewphar.phar');
?>
--EXPECT--
+bool(false)
bool(true)
-bool(false)
unicode(5) "Hello"
string(84) "<?php var_dump("First"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
"
@@ -45,7 +45,7 @@
string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
"
===COMMIT===
-bool(true)
+bool(false)
unicode(5) "Hello"
unicode(5) "World"
string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
Modified: php/php-src/branches/PHP_5_3/ext/phar/tests/tar/phar_begin_setstub_commit.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/phar/tests/tar/phar_begin_setstub_commit.phpt 2009-11-13 00:41:37 UTC (rev 290646)
+++ php/php-src/branches/PHP_5_3/ext/phar/tests/tar/phar_begin_setstub_commit.phpt 2009-11-13 00:58:11 UTC (rev 290647)
@@ -37,8 +37,8 @@
?>
--EXPECT--
bool(true)
+bool(false)
bool(true)
-bool(false)
string(5) "Hello"
string(84) "<?php var_dump("First"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
"
@@ -46,7 +46,7 @@
string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
"
===COMMIT===
-bool(true)
+bool(false)
string(5) "Hello"
string(5) "World"
string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
Modified: php/php-src/branches/PHP_5_3/ext/phar/tests/tar/phar_begin_setstub_commitU.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/phar/tests/tar/phar_begin_setstub_commitU.phpt 2009-11-13 00:41:37 UTC (rev 290646)
+++ php/php-src/branches/PHP_5_3/ext/phar/tests/tar/phar_begin_setstub_commitU.phpt 2009-11-13 00:58:11 UTC (rev 290647)
@@ -37,8 +37,8 @@
?>
--EXPECT--
bool(true)
+bool(false)
bool(true)
-bool(false)
unicode(5) "Hello"
string(84) "<?php var_dump("First"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
"
@@ -46,7 +46,7 @@
string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
"
===COMMIT===
-bool(true)
+bool(false)
unicode(5) "Hello"
unicode(5) "World"
string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
Modified: php/php-src/branches/PHP_5_3/ext/phar/tests/zip/phar_begin_setstub_commit.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/phar/tests/zip/phar_begin_setstub_commit.phpt 2009-11-13 00:41:37 UTC (rev 290646)
+++ php/php-src/branches/PHP_5_3/ext/phar/tests/zip/phar_begin_setstub_commit.phpt 2009-11-13 00:58:11 UTC (rev 290647)
@@ -50,8 +50,8 @@
?>
--EXPECT--
bool(true)
+bool(false)
bool(true)
-bool(false)
string(5) "Hello"
string(84) "<?php var_dump("First"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
"
@@ -59,7 +59,7 @@
string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
"
===COMMIT===
-bool(true)
+bool(false)
string(5) "Hello"
string(5) "World"
string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
Modified: php/php-src/branches/PHP_5_3/ext/phar/tests/zip/phar_begin_setstub_commitU.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/phar/tests/zip/phar_begin_setstub_commitU.phpt 2009-11-13 00:41:37 UTC (rev 290646)
+++ php/php-src/branches/PHP_5_3/ext/phar/tests/zip/phar_begin_setstub_commitU.phpt 2009-11-13 00:58:11 UTC (rev 290647)
@@ -50,8 +50,8 @@
?>
--EXPECT--
bool(true)
+bool(false)
bool(true)
-bool(false)
unicode(5) "Hello"
string(84) "<?php var_dump("First"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
"
@@ -59,7 +59,7 @@
string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
"
===COMMIT===
-bool(true)
+bool(false)
unicode(5) "Hello"
unicode(5) "World"
string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
Modified: php/php-src/trunk/ext/phar/phar_object.c
===================================================================
--- php/php-src/trunk/ext/phar/phar_object.c 2009-11-13 00:41:37 UTC (rev 290646)
+++ php/php-src/trunk/ext/phar/phar_object.c 2009-11-13 00:58:11 UTC (rev 290647)
@@ -2945,7 +2945,7 @@
{
PHAR_ARCHIVE_OBJECT();
- RETURN_BOOL(!phar_obj->arc.archive->donotflush);
+ RETURN_BOOL(phar_obj->arc.archive->donotflush);
}
/* }}} */
Modified: php/php-src/trunk/ext/phar/tests/phar_begin_setstub_commit.phpt
===================================================================
--- php/php-src/trunk/ext/phar/tests/phar_begin_setstub_commit.phpt 2009-11-13 00:41:37 UTC (rev 290646)
+++ php/php-src/trunk/ext/phar/tests/phar_begin_setstub_commit.phpt 2009-11-13 00:58:11 UTC (rev 290647)
@@ -36,8 +36,8 @@
unlink(dirname(__FILE__) . '/brandnewphar.phar');
?>
--EXPECT--
+bool(false)
bool(true)
-bool(false)
string(5) "Hello"
string(84) "<?php var_dump("First"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
"
@@ -45,7 +45,7 @@
string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
"
===COMMIT===
-bool(true)
+bool(false)
string(5) "Hello"
string(5) "World"
string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
Modified: php/php-src/trunk/ext/phar/tests/phar_begin_setstub_commitU.phpt
===================================================================
--- php/php-src/trunk/ext/phar/tests/phar_begin_setstub_commitU.phpt 2009-11-13 00:41:37 UTC (rev 290646)
+++ php/php-src/trunk/ext/phar/tests/phar_begin_setstub_commitU.phpt 2009-11-13 00:58:11 UTC (rev 290647)
@@ -36,8 +36,8 @@
unlink(dirname(__FILE__) . '/brandnewphar.phar');
?>
--EXPECT--
+bool(false)
bool(true)
-bool(false)
unicode(5) "Hello"
string(84) "<?php var_dump("First"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
"
@@ -45,7 +45,7 @@
string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
"
===COMMIT===
-bool(true)
+bool(false)
unicode(5) "Hello"
unicode(5) "World"
string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
Modified: php/php-src/trunk/ext/phar/tests/tar/phar_begin_setstub_commit.phpt
===================================================================
--- php/php-src/trunk/ext/phar/tests/tar/phar_begin_setstub_commit.phpt 2009-11-13 00:41:37 UTC (rev 290646)
+++ php/php-src/trunk/ext/phar/tests/tar/phar_begin_setstub_commit.phpt 2009-11-13 00:58:11 UTC (rev 290647)
@@ -37,8 +37,8 @@
?>
--EXPECT--
bool(true)
+bool(false)
bool(true)
-bool(false)
string(5) "Hello"
string(84) "<?php var_dump("First"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
"
@@ -46,7 +46,7 @@
string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
"
===COMMIT===
-bool(true)
+bool(false)
string(5) "Hello"
string(5) "World"
string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
Modified: php/php-src/trunk/ext/phar/tests/tar/phar_begin_setstub_commitU.phpt
===================================================================
--- php/php-src/trunk/ext/phar/tests/tar/phar_begin_setstub_commitU.phpt 2009-11-13 00:41:37 UTC (rev 290646)
+++ php/php-src/trunk/ext/phar/tests/tar/phar_begin_setstub_commitU.phpt 2009-11-13 00:58:11 UTC (rev 290647)
@@ -37,8 +37,8 @@
?>
--EXPECT--
bool(true)
+bool(false)
bool(true)
-bool(false)
unicode(5) "Hello"
string(84) "<?php var_dump("First"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
"
@@ -46,7 +46,7 @@
string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
"
===COMMIT===
-bool(true)
+bool(false)
unicode(5) "Hello"
unicode(5) "World"
string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
Modified: php/php-src/trunk/ext/phar/tests/zip/phar_begin_setstub_commit.phpt
===================================================================
--- php/php-src/trunk/ext/phar/tests/zip/phar_begin_setstub_commit.phpt 2009-11-13 00:41:37 UTC (rev 290646)
+++ php/php-src/trunk/ext/phar/tests/zip/phar_begin_setstub_commit.phpt 2009-11-13 00:58:11 UTC (rev 290647)
@@ -50,8 +50,8 @@
?>
--EXPECT--
bool(true)
+bool(false)
bool(true)
-bool(false)
string(5) "Hello"
string(84) "<?php var_dump("First"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
"
@@ -59,7 +59,7 @@
string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
"
===COMMIT===
-bool(true)
+bool(false)
string(5) "Hello"
string(5) "World"
string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
Modified: php/php-src/trunk/ext/phar/tests/zip/phar_begin_setstub_commitU.phpt
===================================================================
--- php/php-src/trunk/ext/phar/tests/zip/phar_begin_setstub_commitU.phpt 2009-11-13 00:41:37 UTC (rev 290646)
+++ php/php-src/trunk/ext/phar/tests/zip/phar_begin_setstub_commitU.phpt 2009-11-13 00:58:11 UTC (rev 290647)
@@ -50,8 +50,8 @@
?>
--EXPECT--
bool(true)
+bool(false)
bool(true)
-bool(false)
unicode(5) "Hello"
string(84) "<?php var_dump("First"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
"
@@ -59,7 +59,7 @@
string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
"
===COMMIT===
-bool(true)
+bool(false)
unicode(5) "Hello"
unicode(5) "World"
string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
