diff options
| author | Zeev Suraski <zeev@php.net> | 1999-05-28 22:41:48 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 1999-05-28 22:41:48 +0000 |
| commit | 0eb1498fa865601db3c61c77513046c3eba79d39 (patch) | |
| tree | 062a80d404501d2192474f260acfee18ed4440b2 /mod_php4.c | |
| parent | dfce358a5b1cc2ec1d7901bccc95e645f947b428 (diff) | |
| download | php-git-0eb1498fa865601db3c61c77513046c3eba79d39.tar.gz | |
* Get Apache module to compile again with the regex stuff.
* Get Apache to propertly work with POST, and some SAPI fixes
Diffstat (limited to 'mod_php4.c')
| -rw-r--r-- | mod_php4.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/mod_php4.c b/mod_php4.c index 6adee9f3c5..73c27ba717 100644 --- a/mod_php4.c +++ b/mod_php4.c @@ -208,7 +208,9 @@ static void init_request_info(SLS_D) SG(request_info).path_translated = r->filename; SG(request_info).request_uri = r->uri; SG(request_info).request_method = (char *)r->method; + printf("Obtaining content type...\n"); SG(request_info).content_type = (char *) table_get(r->subprocess_env, "CONTENT_TYPE"); + printf("Obtained content type: %s\n", SG(request_info).content_type); SG(request_info).content_length = (content_length ? atoi(content_length) : 0); if (r->headers_in) { @@ -238,6 +240,9 @@ int send_php(request_rec *r, int display_source_mode, char *filename) int fd, retval; SLS_FETCH(); + if (setjmp(EG(bailout))!=0) { + return OK; + } /* We don't accept OPTIONS requests, but take everything else */ if (r->method_number == M_OPTIONS) { r->allowed |= (1 << METHODS) - 1; @@ -291,12 +296,13 @@ int send_php(request_rec *r, int display_source_mode, char *filename) hard_timeout("send", r); SG(server_context) = r; - init_request_info(SLS_C); php_save_umask(); chdir_file(filename); add_common_vars(r); add_cgi_vars(r); + + init_request_info(SLS_C); apache_php_module_main(r, fd, display_source_mode SLS_CC); /* Done, restore umask, turn off timeout, close file and return */ @@ -382,6 +388,7 @@ int php_xbithack_handler(request_rec * r) void php_init_handler(server_rec *s, pool *p) { register_cleanup(p, NULL, php_module_shutdown, php_module_shutdown_for_exec); + sapi_startup(&sapi_module); php_module_startup(&sapi_module); #if MODULE_MAGIC_NUMBER >= 19980527 ap_add_version_component("PHP/" PHP_VERSION); |