diff options
| author | Rasmus Lerdorf <rasmus@php.net> | 2000-08-02 22:48:45 +0000 |
|---|---|---|
| committer | Rasmus Lerdorf <rasmus@php.net> | 2000-08-02 22:48:45 +0000 |
| commit | 76a2d2538c42934341a6257f0ba54723048116df (patch) | |
| tree | 14d2b166c0d75444a9ec6d3be15d45c5154c6c15 /sapi/nsapi/nsapi.c | |
| parent | f896b9a354af45508431900a70f7af9ce943aba4 (diff) | |
| download | php-git-76a2d2538c42934341a6257f0ba54723048116df.tar.gz | |
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)
Diffstat (limited to 'sapi/nsapi/nsapi.c')
| -rw-r--r-- | sapi/nsapi/nsapi.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sapi/nsapi/nsapi.c b/sapi/nsapi/nsapi.c index 4e664b6559..94ac4072f7 100644 --- a/sapi/nsapi/nsapi.c +++ b/sapi/nsapi/nsapi.c @@ -478,6 +478,13 @@ nsapi_request_ctor(NSLS_D SLS_DC) SG(request_info).path_translated = nsapi_strdup(path_translated); SG(request_info).content_type = nsapi_strdup(content_type); SG(request_info).content_length = (content_length == NULL) ? 0 : strtoul(content_length, 0, 0); + SG(sapi_headers).http_response_code = 200; + if (!strcmp(request_method, "HEAD")) { + SG(request_info).headers_only = 1; + } else { + SG(request_info).headers_only = 0; + } + } static void |