cvs: /php4 ChangeLog main.c output.c /php4/php4isapi php4isapi.c

zeev Thu Sep 2 22:40:08 1999 EDT Modified files: /php4 ChangeLog main.c output.c /php4/php4isapi php4isapi.c Log: - Fixed several problems with output buffering and HEAD requests (Zeev) - Fixed HTTP Status code issue with ISAPI module (Zeev) Index: php4/ChangeLog diff -u php4/ChangeLog:1.77 php4/ChangeLog:1.78 --- php4/ChangeLog:1.77 Thu Sep 2 20:18:52 1999 +++ php4/ChangeLog Thu Sep 2 22:39:35 1999 @@ -2,6 +2,10 @@ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ?? 1999, Version 4.0 Beta 3 +- Fixed several problems with output buffering and HEAD requests (Zeev) +- Fixed HTTP Status code issue with ISAPI module (Zeev) +- Fixed a problem that prevented $GLOBALS from working properly (Zeev, Zend + library) - Fixed the a problem in the resource reference counting mechanism, that caused resources to be freed much later than they were supposed to (Zeev, Zend library) Index: php4/main.c diff -u php4/main.c:1.106 php4/main.c:1.107 --- php4/main.c:1.106 Wed Sep 1 15:28:07 1999 +++ php4/main.c Thu Sep 2 22:39:35 1999 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.106 1999/09/01 19:28:07 andi Exp $ */ +/* $Id: main.c,v 1.107 1999/09/03 02:39:35 zeev Exp $ */ #include <stdio.h> @@ -732,7 +732,7 @@ SLS_FETCH(); sapi_send_headers(); - zend_end_ob_buffering(1); + zend_end_ob_buffering(SG(request_info).headers_only?0:1); php3_call_shutdown_functions(); Index: php4/output.c diff -u php4/output.c:1.11 php4/output.c:1.12 --- php4/output.c:1.11 Tue Aug 24 19:12:50 1999 +++ php4/output.c Thu Sep 2 22:39:36 1999 @@ -70,7 +70,7 @@ if (!ob_buffer) { return; } - if (SG(headers_sent)) { + if (SG(headers_sent) && !SG(request_info).headers_only) { zend_body_write = zend_ub_body_write_no_header; } else { zend_body_write = zend_ub_body_write; Index: php4/php4isapi/php4isapi.c diff -u php4/php4isapi/php4isapi.c:1.25 php4/php4isapi/php4isapi.c:1.26 --- php4/php4isapi/php4isapi.c:1.25 Mon Aug 23 15:16:07 1999 +++ php4/php4isapi/php4isapi.c Thu Sep 2 22:39:38 1999 @@ -185,6 +185,7 @@ header_info.cchStatus = strlen(header_info.pszStatus); header_info.pszHeader = combined_headers; header_info.cchHeader = total_length; + lpECB->dwHttpStatusCode = SG(sapi_headers).http_response_code; lpECB->ServerSupportFunction(lpECB->ConnID, HSE_REQ_SEND_RESPONSE_HEADER_EX, &header_info, NULL, NULL);