summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSascha Schumann <sas@php.net>2001-07-23 14:05:26 +0000
committerSascha Schumann <sas@php.net>2001-07-23 14:05:26 +0000
commit076f4f5136b8f01bab9e2b3c91acbd0d408ed49d (patch)
tree40c794210f1509054d342fb02c199c166387c3c7
parente8e47107d865a16d2db429e5acba9b9a06adeccb (diff)
downloadphp-git-076f4f5136b8f01bab9e2b3c91acbd0d408ed49d.tar.gz
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.
-rw-r--r--main/main.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/main/main.c b/main/main.c
index 737152d849..3dbd93ee8a 100644
--- 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);