thetaphi Sun Jun 22 22:28:31 2008 UTC
Modified files:
/php-src/sapi/nsapi nsapi.c
Log:
fix flushing for PHP6 output code
http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.89&r2=1.90&diff_format=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.89 php-src/sapi/nsapi/nsapi.c:1.90
--- php-src/sapi/nsapi/nsapi.c:1.89 Sun Jun 22 22:16:41 2008
+++ php-src/sapi/nsapi/nsapi.c Sun Jun 22 22:28:31 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: nsapi.c,v 1.89 2008/06/22 22:16:41 thetaphi Exp $ */
+/* $Id: nsapi.c,v 1.90 2008/06/22 22:28:31 thetaphi Exp $ */
/*
* PHP includes
@@ -308,7 +308,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, "NSAPI Module Revision", "$Revision: 1.89
$");
+ php_info_print_table_row(2, "NSAPI Module Revision", "$Revision: 1.90
$");
php_info_print_table_row(2, "Server Software", system_version());
php_info_print_table_row(2, "Sub-requests with nsapi_virtual()",
(nsapi_servact_service)?((zend_ini_long("zlib.output_compression",
sizeof("zlib.output_compression"), 0))?"not supported with
zlib.output_compression":"enabled"):"not supported on this platform" );
@@ -343,7 +343,7 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to include
uri '%s' - Sub-requests do not work with zlib.output_compression", uri);
RETURN_FALSE;
} else {
- php_end_ob_buffers(1 TSRMLS_CC);
+ php_output_end_all(TSRMLS_C);
php_header(TSRMLS_C);
/* do the sub-request */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
