iliaa Wed Feb 11 12:00:58 2004 EDT
Added files: (Branch: PHP_4_3)
/php-src/ext/session/tests bug26862.phpt
Modified files:
/php-src/ext/standard url_scanner_ex.c url_scanner_ex.re
/php-src NEWS
Log:
MFH: Fixed bug #26862 (ob_flush() followed by output_reset_rewrite_vars()
may result in data loss).
http://cvs.php.net/diff.php/php-src/ext/standard/url_scanner_ex.c?r1=1.72.2.8&r2=1.72.2.9&ty=u
Index: php-src/ext/standard/url_scanner_ex.c
diff -u php-src/ext/standard/url_scanner_ex.c:1.72.2.8
php-src/ext/standard/url_scanner_ex.c:1.72.2.9
--- php-src/ext/standard/url_scanner_ex.c:1.72.2.8 Tue May 20 12:53:58 2003
+++ php-src/ext/standard/url_scanner_ex.c Wed Feb 11 12:00:54 2004
@@ -1,5 +1,5 @@
-/* Generated by re2c 0.5 on Thu Apr 17 02:53:49 2003 */
-#line 1 "/usr/src/web/php/php4/ext/standard/url_scanner_ex.re"
+/* Generated by re2c 0.5 on Wed Feb 11 11:33:22 2004 */
+#line 1 "/home/rei/php4/ext/standard/url_scanner_ex.re"
/*
+----------------------------------------------------------------------+
| PHP Version 4 |
@@ -918,7 +918,7 @@
size_t len;
if (BG(url_adapt_state_ex).url_app.len != 0) {
- *handled_output = url_adapt_ext(output, output_len, &len, (zend_bool)
(mode&PHP_OUTPUT_HANDLER_END ? 1 : 0) TSRMLS_CC);
+ *handled_output = url_adapt_ext(output, output_len, &len, (zend_bool) (mode &
(PHP_OUTPUT_HANDLER_END|PHP_OUTPUT_HANDLER_CONT) ? 1 : 0) TSRMLS_CC);
if (sizeof(uint) < sizeof(size_t)) {
if (len > UINT_MAX)
len = UINT_MAX;
http://cvs.php.net/diff.php/php-src/ext/standard/url_scanner_ex.re?r1=1.63.2.5&r2=1.63.2.6&ty=u
Index: php-src/ext/standard/url_scanner_ex.re
diff -u php-src/ext/standard/url_scanner_ex.re:1.63.2.5
php-src/ext/standard/url_scanner_ex.re:1.63.2.6
--- php-src/ext/standard/url_scanner_ex.re:1.63.2.5 Wed Apr 16 18:57:15 2003
+++ php-src/ext/standard/url_scanner_ex.re Wed Feb 11 12:00:54 2004
@@ -417,7 +417,7 @@
size_t len;
if (BG(url_adapt_state_ex).url_app.len != 0) {
- *handled_output = url_adapt_ext(output, output_len, &len, (zend_bool)
(mode&PHP_OUTPUT_HANDLER_END ? 1 : 0) TSRMLS_CC);
+ *handled_output = url_adapt_ext(output, output_len, &len, (zend_bool) (mode &
(PHP_OUTPUT_HANDLER_END|PHP_OUTPUT_HANDLER_CONT) ? 1 : 0) TSRMLS_CC);
if (sizeof(uint) < sizeof(size_t)) {
if (len > UINT_MAX)
len = UINT_MAX;
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.559&r2=1.1247.2.560&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.559 php-src/NEWS:1.1247.2.560
--- php-src/NEWS:1.1247.2.559 Tue Feb 10 11:09:55 2004
+++ php-src/NEWS Wed Feb 11 12:00:54 2004
@@ -11,6 +11,8 @@
- Fixed bug #27135 (Possible crash inside mb_strlen()). (Moriyoshi)
- Fixed bug #27026 (Added "cgi.nph" php.ini option to allow forcing of
the 'Status: 200' header that is not normally needed). (Ilia)
+- Fixed bug #26862 (ob_flush() followed by output_reset_rewrite_vars() may
+ result in data loss). (Ilia, scottmacvicar at ntlworld dot com)
- Fixed bug #26758 (FastCGI exits immediately with status 255). (Ilia,
tcarter at noggin dot com dot au)
- Fixed bug #26653 (open_basedir incorrectly resolved on win32). (Ilia,
http://cvs.php.net/co.php/php-src/ext/session/tests/bug26862.phpt?r=1.1&p=1
Index: php-src/ext/session/tests/bug26862.phpt
+++ php-src/ext/session/tests/bug26862.phpt
--TEST--
Bug #26862 (ob_flush() before output_reset_rewrite_vars() results in data loss)
--SKIPIF--
<?php include('skipif.inc'); ?>
--INI--
register_globals=0
html_errors=0
--FILE--
<?php
session_start();
output_add_rewrite_var('var', 'value');
echo '<a href="file.php">link</a>';
ob_flush();
output_reset_rewrite_vars();
echo '<a href="file.php">link</a>';
?>
--EXPECT--
<a href="file.php?var=value">link</a><a href="file.php">link</a>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
