summaryrefslogtreecommitdiff
path: root/main/SAPI.c
diff options
context:
space:
mode:
authorZeev Suraski <zeev@php.net>2000-09-08 14:43:57 +0000
committerZeev Suraski <zeev@php.net>2000-09-08 14:43:57 +0000
commit91c808ecc421ddaea9b0ae7f842daa727cfbf575 (patch)
treeb7fa79691812e958c99a413dac3d46319ab17d5a /main/SAPI.c
parentd10336ec0e00baed0e5157db45d9eb597065bb47 (diff)
downloadphp-git-91c808ecc421ddaea9b0ae7f842daa727cfbf575.tar.gz
Restore the headers_only test to the centralized SAPI startup. If necessary, it can
be overriden in the activate() callback.
Diffstat (limited to 'main/SAPI.c')
-rw-r--r--main/SAPI.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/main/SAPI.c b/main/SAPI.c
index 14ddf856c5..8e838c526e 100644
--- a/main/SAPI.c
+++ b/main/SAPI.c
@@ -277,17 +277,14 @@ SAPI_API void sapi_activate(SLS_D)
SG(request_info).current_user = NULL;
SG(request_info).current_user_length = 0;
-#if 0
- /* This can't be done here. We need to do that in the individual SAPI
- * modules because you can actually have a GET request that is only
- * allowed to send back headers.
+ /* It's possible to override this general case in the activate() callback, if
+ * necessary.
*/
if (SG(request_info).request_method && !strcmp(SG(request_info).request_method, "HEAD")) {
SG(request_info).headers_only = 1;
} else {
SG(request_info).headers_only = 0;
}
-#endif
if (SG(server_context)) {
if (SG(request_info).request_method