cvs: php-src(PHP_4_3) / NEWS /sapi/apache2handler php_functions.c
| From: | Joe Orton | Date: | Tue, 11 Jan 2005 14:09:57 +0000 |
| Subject: | cvs: php-src(PHP_4_3) / NEWS /sapi/apache2handler php_functions.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-29870@lists.php.net to get a copy of this message | ||
jorton Tue Jan 11 09:09:57 2005 EDT
Modified files: (Branch: PHP_4_3)
/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.1247.2.797&r2=1.1247.2.798&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.797 php-src/NEWS:1.1247.2.798
--- php-src/NEWS:1.1247.2.797 Mon Jan 10 10:39:20 2005
+++ php-src/NEWS Tue Jan 11 09:09:56 2005
@@ -23,6 +23,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)
- 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.1.2.10&r2=1.1.2.11&ty=u
Index: php-src/sapi/apache2handler/php_functions.c
diff -u php-src/sapi/apache2handler/php_functions.c:1.1.2.10
php-src/sapi/apache2handler/php_functions.c:1.1.2.11
--- php-src/sapi/apache2handler/php_functions.c:1.1.2.10 Tue Nov 11 15:04:19 2003
+++ php-src/sapi/apache2handler/php_functions.c Tue Jan 11 09:09:56 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_functions.c,v 1.1.2.10 2003/11/11 20:04:19 iliaa Exp $ */
+/* $Id: php_functions.c,v 1.1.2.11 2005/01/11 14:09:56 jorton Exp $ */
#include "php.h"
#include "ext/standard/php_smart_str.h"
@@ -63,6 +63,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);
}