jorton Mon Jan 24 06:48:36 2005 EDT Modified files: (Branch: PHP_4_3) /php-src/sapi/apache2handler php_functions.c Log: MFH: Fixed regression #31645 - only flush before running the subrequest. http://cvs.php.net/diff.php/php-src/sapi/apache2handler/php_functions.c?r1=1.1.2.11&r2=1.1.2.12&ty=u Index: php-src/sapi/apache2handler/php_functions.c diff -u php-src/sapi/apache2handler/php_functions.c:1.1.2.11 php-src/sapi/apache2handler/php_functions.c:1.1.2.12 --- php-src/sapi/apache2handler/php_functions.c:1.1.2.11 Tue Jan 11 09:09:56 2005 +++ php-src/sapi/apache2handler/php_functions.c Mon Jan 24 06:48:35 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_functions.c,v 1.1.2.11 2005/01/11 14:09:56 jorton Exp $ */ +/* $Id: php_functions.c,v 1.1.2.12 2005/01/24 11:48:35 jorton Exp $ */ #include "php.h" #include "ext/standard/php_smart_str.h" @@ -64,10 +64,6 @@ 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); } @@ -100,6 +96,10 @@ php_end_ob_buffers(1 TSRMLS_CC); php_header(); + /* Ensure that the ap_r* layer for the main request is flushed, to + * work around http://issues.apache.org/bugzilla/show_bug.cgi?id=17629 */ + ap_rflush(rr->main); + if (ap_run_sub_req(rr)) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to include '%s' - request execution failed", Z_STRVAL_PP(filename)); ap_destroy_sub_req(rr);
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php