diff options
| author | Sascha Schumann <sas@php.net> | 2000-12-10 23:22:20 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 2000-12-10 23:22:20 +0000 |
| commit | 107aa9f71a562a39c31939c6283db409ec041df1 (patch) | |
| tree | c0adf9f5a679e33164915f585a184140b55a463c /sapi/apache/mod_php4.c | |
| parent | d41137fedfca157ce76f339c28359019ca030322 (diff) | |
| download | php-git-107aa9f71a562a39c31939c6283db409ec041df1.tar.gz | |
Align ZTS handling of globals with common usage
Diffstat (limited to 'sapi/apache/mod_php4.c')
| -rw-r--r-- | sapi/apache/mod_php4.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sapi/apache/mod_php4.c b/sapi/apache/mod_php4.c index 16faa88fac..23580a911b 100644 --- a/sapi/apache/mod_php4.c +++ b/sapi/apache/mod_php4.c @@ -108,8 +108,6 @@ typedef struct _php_per_dir_entry { int type; } php_per_dir_entry; -php_apache_info_struct php_apache_info; /* active config */ - /* some systems are missing these from their header files */ void php_save_umask(void) @@ -437,6 +435,7 @@ int send_php(request_rec *r, int display_source_mode, char *filename) ELS_FETCH(); CLS_FETCH(); PLS_FETCH(); + APLS_FETCH(); if (setjmp(EG(bailout))!=0) { return OK; @@ -460,7 +459,7 @@ int send_php(request_rec *r, int display_source_mode, char *filename) /* If PHP parser engine has been turned off with an "engine off" * directive, then decline to handle this request */ - if (!php_apache_info.engine) { + if (!AP(engine)) { r->content_type = php_apache_get_default_mimetype(r SLS_CC); r->allowed |= (1 << METHODS) - 1; return DECLINED; @@ -475,7 +474,7 @@ int send_php(request_rec *r, int display_source_mode, char *filename) return retval; #endif - if (php_apache_info.last_modified) { + if (AP(last_modified)) { #if MODULE_MAGIC_NUMBER < 19970912 if ((retval = set_last_modified(r, r->finfo.st_mtime))) { return retval; |