summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2003-01-28 16:34:21 +0000
committerIlia Alshanetsky <iliaa@php.net>2003-01-28 16:34:21 +0000
commit835e6481e4e37c7c8cc7dff22a593386b6a0f1ad (patch)
tree5613fb58301b4e51668db6e36ca129fb06ecf84a
parent1ca8d7d4c3ced2814ef4de9f76efc14d338cb25c (diff)
downloadphp-git-835e6481e4e37c7c8cc7dff22a593386b6a0f1ad.tar.gz
Fixed bug #17868 (more then the <!--include--> directive used to include
a PHP file would result in a crash).
-rw-r--r--sapi/apache2filter/sapi_apache2.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sapi/apache2filter/sapi_apache2.c b/sapi/apache2filter/sapi_apache2.c
index b193d852b1..031b5e2fef 100644
--- a/sapi/apache2filter/sapi_apache2.c
+++ b/sapi/apache2filter/sapi_apache2.c
@@ -532,7 +532,9 @@ static int php_output_filter(ap_filter_t *f, apr_bucket_brigade *bb)
php_apache_request_dtor(f TSRMLS_CC);
- ctx->request_processed = 1;
+ if (!f->r->main) {
+ ctx->request_processed = 1;
+ }
/* Delete the FILE bucket from the brigade. */
apr_bucket_delete(b);