cvs: php4 /main main.c

sas Mon Jul 23 10:05:26 2001 EDT Modified files: /php4/main main.c Log: 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. Index: php4/main/main.c diff -u php4/main/main.c:1.382 php4/main/main.c:1.383 --- php4/main/main.c:1.382 Sat Jul 21 10:27:54 2001 +++ php4/main/main.c Mon Jul 23 10:05:26 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.382 2001/07/21 14:27:54 zeev Exp $ */ +/* $Id: main.c,v 1.383 2001/07/23 14:05:26 sas Exp $ */ /* {{{ includes */ @@ -692,8 +692,6 @@ 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_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);