- Fixed several problems with output buffering and HEAD requests (Zeev)

- Fixed HTTP Status code issue with ISAPI module (Zeev)

3 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 700e2e8548..4ae9e9f08e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@ PHP 4.0 CHANGE LOG                                                    ChangeLog
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 
 ?? ?? 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)
diff --git a/main/main.c b/main/main.c
index 3cc34ddb12..ac95c88a13 100644
--- a/main/main.c
+++ b/main/main.c
@@ -732,7 +732,7 @@ void php_request_shutdown(void *dummy)
 	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();
 	
diff --git a/output.c b/output.c
index bb13f471de..71a9bfb3ec 100644
--- a/output.c
+++ b/output.c
@@ -70,7 +70,7 @@ void zend_end_ob_buffering(int send_buffer)
 	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;