cvs: php4 /sapi/apache mod_php4.c mod_php4.h php_apache.c

sas Sun Dec 10 15:22:20 2000 EDT Modified files: /php4/sapi/apache mod_php4.c mod_php4.h php_apache.c Log: Align ZTS handling of globals with common usage Index: php4/sapi/apache/mod_php4.c diff -u php4/sapi/apache/mod_php4.c:1.78 php4/sapi/apache/mod_php4.c:1.79 --- php4/sapi/apache/mod_php4.c:1.78 Thu Dec 7 05:07:18 2000 +++ php4/sapi/apache/mod_php4.c Sun Dec 10 15:22:20 2000 @@ -17,7 +17,7 @@ | PHP 4.0 patches by Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: mod_php4.c,v 1.78 2000/12/07 13:07:18 sas Exp $ */ +/* $Id: mod_php4.c,v 1.79 2000/12/10 23:22:20 sas Exp $ */ #define NO_REGEX_EXTRA_H #ifdef WIN32 @@ -108,8 +108,6 @@ 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 @@ ELS_FETCH(); CLS_FETCH(); PLS_FETCH(); + APLS_FETCH(); if (setjmp(EG(bailout))!=0) { return OK; @@ -460,7 +459,7 @@ /* 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 @@ 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; Index: php4/sapi/apache/mod_php4.h diff -u php4/sapi/apache/mod_php4.h:1.8 php4/sapi/apache/mod_php4.h:1.9 --- php4/sapi/apache/mod_php4.h:1.8 Thu Dec 7 05:07:18 2000 +++ php4/sapi/apache/mod_php4.h Sun Dec 10 15:22:20 2000 @@ -15,7 +15,7 @@ | Authors: Rasmus Lerdorf <rasmus@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: mod_php4.h,v 1.8 2000/12/07 13:07:18 sas Exp $ */ +/* $Id: mod_php4.h,v 1.9 2000/12/10 23:22:20 sas Exp $ */ #ifndef MOD_PHP4_H #define MOD_PHP4_H @@ -33,7 +33,19 @@ } php_apache_info_struct; extern zend_module_entry apache_module_entry; + +#ifdef ZTS +extern int php_apache_info_id; +#define APLS_D php_apache_info_struct *apache_globals +#define AP(v) (apache_globals->v) +#define APLS_FETCH() APLS_D = ts_resource(php_apache_info_id) +#else extern php_apache_info_struct php_apache_info; +#define APLS_D +#define AP(v) (php_apache_info.v) +#define APLS_FETCH() +#endif + #ifdef WIN32 #define S_IXUSR _S_IEXEC Index: php4/sapi/apache/php_apache.c diff -u php4/sapi/apache/php_apache.c:1.23 php4/sapi/apache/php_apache.c:1.24 --- php4/sapi/apache/php_apache.c:1.23 Sun Dec 10 14:40:07 2000 +++ php4/sapi/apache/php_apache.c Sun Dec 10 15:22:20 2000 @@ -17,7 +17,7 @@ | David Sklar <sklar@student.net> | +----------------------------------------------------------------------+ */ -/* $Id: php_apache.c,v 1.23 2000/12/10 22:40:07 dbeu Exp $ */ +/* $Id: php_apache.c,v 1.24 2000/12/10 23:22:20 sas Exp $ */ #define NO_REGEX_EXTRA_H @@ -45,7 +45,11 @@ #include "php_apache_http.h" #include "http_request.h" -static int php_apache_info_id; +#ifdef ZTS +int php_apache_info_id; +#else +php_apache_info_struct php_apache_info; +#endif #ifdef PHP_WIN32 #include "zend.h" @@ -73,35 +77,35 @@ PHP_FE(apache_lookup_uri, NULL) {NULL, NULL, NULL} }; + -#ifndef PHP_WIN32 PHP_INI_BEGIN() STD_PHP_INI_ENTRY("xbithack", "0", PHP_INI_ALL, OnUpdateInt, xbithack, php_apache_info_struct, php_apache_info) STD_PHP_INI_ENTRY("engine", "1", PHP_INI_ALL, OnUpdateInt, engine, php_apache_info_struct, php_apache_info) STD_PHP_INI_ENTRY("last_modified", "0", PHP_INI_ALL, OnUpdateInt, last_modified, php_apache_info_struct, php_apache_info) PHP_INI_END() + static PHP_MINIT_FUNCTION(apache) { +#ifdef ZTS + php_apache_info_id = ts_allocate_id(sizeof(php_apache_info_struct), NULL, NULL); +#endif REGISTER_INI_ENTRIES(); return SUCCESS; } + static PHP_MSHUTDOWN_FUNCTION(apache) { UNREGISTER_INI_ENTRIES(); return SUCCESS; } + zend_module_entry apache_module_entry = { "apache", apache_functions, PHP_MINIT(apache), PHP_MSHUTDOWN(apache), NULL, NULL, PHP_MINFO(apache), STANDARD_MODULE_PROPERTIES }; -#else -zend_module_entry apache_module_entry = { - "apache", apache_functions, NULL, NULL, NULL, NULL, PHP_MINFO(apache), STANDARD_MODULE_PROPERTIES -}; -#endif - /* {{{ proto string apache_note(string note_name [, string note_value]) Get and set Apache request notes */