Unbreak various tests and transparent session id rewriting for now. This

has been tested extensively.  Most SAPI modules (Apache 1.x, 2.0, thttpd,
AOLserver, CGI, TUX, Caudium, Roxen, NSAPI, Phttpd, Pi3web, Servlet)
call php_request_shutdown() right after php_execute_script (or
equivalent functionality), so that output is possible under an
overwhelmingly number of web-servers.

diff --git a/main/main.c b/main/main.c
index 737152d8490986ba1ddbdde594575cc7d46edb1e..3dbd93ee8a860799e967bae35ae46f36b93ab056 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -692,8 +692,6 @@ void php_request_shutdown(void *dummy)
        SLS_FETCH();
        PLS_FETCH();
 
-       php_output_set_status(0);
-
        zend_try {
                php_end_ob_buffers((zend_bool)(SG(request_info).headers_only?0:1));
        } zend_end_try();
@@ -1342,7 +1340,6 @@ PHPAPI int php_handle_auth_data(const char *auth SLS_DC)
 PHPAPI int php_lint_script(zend_file_handle *file CLS_DC ELS_DC PLS_DC)
 {
        zend_op_array *op_array;
-       SLS_FETCH();
 
        zend_try {
                op_array = zend_compile_file(file, ZEND_INCLUDE CLS_CC);