cvs: php4 /sapi/apache2filter sapi_apache2.c
| From: | Ilia Alshanetsky | Date: | Tue, 28 Jan 2003 16:34:22 +0000 |
| Subject: | cvs: php4 /sapi/apache2filter sapi_apache2.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-18248@lists.php.net to get a copy of this message | ||
iliaa Tue Jan 28 11:34:22 2003 EDT
Modified files:
/php4/sapi/apache2filter sapi_apache2.c
Log:
Fixed bug #17868 (more then the <!--include--> directive used to include
a PHP file would result in a crash).
Index: php4/sapi/apache2filter/sapi_apache2.c
diff -u php4/sapi/apache2filter/sapi_apache2.c:1.102 php4/sapi/apache2filter/sapi_apache2.c:1.103
--- php4/sapi/apache2filter/sapi_apache2.c:1.102 Fri Jan 3 10:59:02 2003
+++ php4/sapi/apache2filter/sapi_apache2.c Tue Jan 28 11:34:21 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.102 2003/01/03 15:59:02 hyanantha Exp $ */
+/* $Id: sapi_apache2.c,v 1.103 2003/01/28 16:34:21 iliaa Exp $ */
#include <fcntl.h>
@@ -532,7 +532,9 @@
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);