jorton Tue Jan 11 09:07:28 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src NEWS
/php-src/sapi/apache2handler php_functions.c
Log:
MFH: Fixed bug #30446 - virtual() includes files out of sequence,
work around 2.0 subrequest/internal redirect issue.
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.182&r2=1.1760.2.183&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.182 php-src/NEWS:1.1760.2.183
--- php-src/NEWS:1.1760.2.182 Mon Jan 10 10:38:50 2005
+++ php-src/NEWS Tue Jan 11 09:07:27 2005
@@ -24,6 +24,7 @@
y2k_compliance is On). (Ilia)
- Fixed bug #31055 (apache2filter: per request leak proportional to the full
path of the request URI). (kameshj at fastmail dot fm)
+- Fixed bug #30446 (apache2handler: virtual() includes files out of sequence)
- Fixed bug #28930 (PHP sources pick wrong header files generated by bison).
(eggert at gnu dot org, Jani)
- Fixed bug #28074 (FastCGI: stderr should be written in a FCGI stderr stream).
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/php_functions.c?r1=1.13&r2=1.13.2.1&ty=u
Index: php-src/sapi/apache2handler/php_functions.c
diff -u php-src/sapi/apache2handler/php_functions.c:1.13
php-src/sapi/apache2handler/php_functions.c:1.13.2.1
--- php-src/sapi/apache2handler/php_functions.c:1.13 Thu Jan 8 03:18:05 2004
+++ php-src/sapi/apache2handler/php_functions.c Tue Jan 11 09:07:27 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_functions.c,v 1.13 2004/01/08 08:18:05 andi Exp $ */
+/* $Id: php_functions.c,v 1.13.2.1 2005/01/11 14:07:27 jorton Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -65,6 +65,11 @@
}
ctx = SG(server_context);
+
+ /* Ensure that the ap_r* layer is flushed, to work around 2.0 bug:
+ * http://issues.apache.org/bugzilla/show_bug.cgi?id=17629 */
+ ap_rflush(ctx->r);
+
return ap_sub_req_lookup_uri(filename, ctx->r, ctx->r->output_filters);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
