Heads up! I have moved the headers_only and response_code checks out of

SAPI and down into the individual SAPI modules.  I have made the
appropriate changes in all the SAPI modules, but please verify these.
The reason for this change is that Apache sometimes will feed PHP
a request_method of GET but have r->header_only set to true.  This happens
in an ErrorDocument redirect.  In this same scenario we want to preserve
the status code as well instead of just overwriting it with a 200 and
losing this information.  For now the other sapi modules act exactly as
before since they probably do not make this distinction, and they may
not even have a valid response code this early in the request.
@ Fix HEAD request bug on an Apache ErrorDocument redirect and preserve
@ the status code across the redirect as well.  (Rasmus)

1 files changed, 6 insertions, 0 deletions

diff --git a/sapi/phttpd/phttpd.c b/sapi/phttpd/phttpd.c
index 9f2eda9c16..72d81f401a 100644
--- a/sapi/phttpd/phttpd.c
+++ b/sapi/phttpd/phttpd.c
@@ -202,6 +202,12 @@ php_phttpd_request_ctor(PHLS_D SLS_DC)
     SG(request_info).query_string = PHG(cip)->hip->request;
     SG(request_info).request_method = PHG(cip)->hip->method;
 	SG(request_info).path_translated = malloc(MAXPATHLEN+1);
+    SG(sapi_headers).http_response_code = 200;
+	if (!strcmp(PHG(cip)->hip->method, "HEAD")) {
+		SG(request_info).headers_only = 1;
+	} else {
+		SG(request_info).headers_only = 0;
+	}
 	if (url_expand(PHG(cip)->hip->url, SG(request_info).path_translated, MAXPATHLEN, &PHG(sb), NULL, NULL) == NULL) {
 		/* handle error */
 	}