summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Orton <jorton@php.net>2005-01-11 14:07:27 +0000
committerJoe Orton <jorton@php.net>2005-01-11 14:07:27 +0000
commit5f0a65bd361c86c35269189ebef450c99271ba82 (patch)
tree5fafce427ebf475c1ba6b6e376a67d6b2e614ae7
parent1fc5fc9ccd2d3b255debf189249aa16f24c792d9 (diff)
downloadphp-git-5f0a65bd361c86c35269189ebef450c99271ba82.tar.gz
MFH: Fixed bug #30446 - virtual() includes files out of sequence,
work around 2.0 subrequest/internal redirect issue.
-rw-r--r--NEWS1
-rw-r--r--sapi/apache2handler/php_functions.c5
2 files changed, 6 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index b98ffe45f3..92379c73f2 100644
--- a/NEWS
+++ b/NEWS
@@ -24,6 +24,7 @@ PHP NEWS
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).
diff --git a/sapi/apache2handler/php_functions.c b/sapi/apache2handler/php_functions.c
index eeba18a691..631e56a1dd 100644
--- a/sapi/apache2handler/php_functions.c
+++ b/sapi/apache2handler/php_functions.c
@@ -65,6 +65,11 @@ static request_rec *php_apache_lookup_uri(char *filename TSRMLS_DC)
}
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);
}