jorton          Tue Jan 11 09:01:32 2005 EDT

  Modified files:              
    /php-src/sapi/apache2handler        php_functions.c 
  Log:
  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/sapi/apache2handler/php_functions.c?r1=1.15&r2=1.16&ty=u
Index: php-src/sapi/apache2handler/php_functions.c
diff -u php-src/sapi/apache2handler/php_functions.c:1.15 
php-src/sapi/apache2handler/php_functions.c:1.16
--- php-src/sapi/apache2handler/php_functions.c:1.15    Sat Oct 23 09:48:05 2004
+++ php-src/sapi/apache2handler/php_functions.c Tue Jan 11 09:01:32 2005
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_functions.c,v 1.15 2004/10/23 13:48:05 jorton Exp $ */
+/* $Id: php_functions.c,v 1.16 2005/01/11 14:01:32 jorton Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -65,6 +65,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);
 }
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to