cvs: /php4/sapi/apache mod_php4.c sapi_apache.c
| From: | Sascha Schumann | Date: | Fri, 17 Dec 1999 14:25:10 +0000 |
| Subject: | cvs: /php4/sapi/apache mod_php4.c sapi_apache.c | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-8036@lists.php.net to get a copy of this message | ||
sas Fri Dec 17 09:25:10 1999 EDT
Modified files:
/php4/sapi/apache mod_php4.c sapi_apache.c
Log:
Make Apache SAPI module compile in ZTS mode
Index: php4/sapi/apache/mod_php4.c
diff -u php4/sapi/apache/mod_php4.c:1.6 php4/sapi/apache/mod_php4.c:1.7
--- php4/sapi/apache/mod_php4.c:1.6 Sun Dec 5 09:37:38 1999
+++ php4/sapi/apache/mod_php4.c Fri Dec 17 09:24:39 1999
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski <zeev@zend.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: mod_php4.c,v 1.6 1999/12/05 14:37:38 rasmus Exp $ */
+/* $Id: mod_php4.c,v 1.7 1999/12/17 14:24:39 sas Exp $ */
#include "zend.h"
#include "php.h"
@@ -128,6 +128,7 @@
{
int ret;
SLS_FETCH();
+ PLS_FETCH();
if (SG(server_context)) {
ret = rwrite(str, str_length, (request_rec *) SG(server_context));
@@ -285,6 +286,7 @@
int fd, retval;
HashTable *per_dir_conf;
SLS_FETCH();
+ ELS_FETCH();
if (setjmp(EG(bailout))!=0) {
return OK;
@@ -522,8 +524,11 @@
apache_php_initialized = 1;
}
#if MODULE_MAGIC_NUMBER >= 19980527
- if (PG(expose_php)) {
- ap_add_version_component("PHP/" PHP_VERSION);
+ {
+ PLS_FETCH();
+ if (PG(expose_php)) {
+ ap_add_version_component("PHP/" PHP_VERSION);
+ }
}
#endif
}
Index: php4/sapi/apache/sapi_apache.c
diff -u php4/sapi/apache/sapi_apache.c:1.5 php4/sapi/apache/sapi_apache.c:1.6
--- php4/sapi/apache/sapi_apache.c:1.5 Thu Dec 9 12:13:20 1999
+++ php4/sapi/apache/sapi_apache.c Fri Dec 17 09:24:39 1999
@@ -19,7 +19,7 @@
| Stig Bakken <ssb@fast.no> |
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache.c,v 1.5 1999/12/09 17:13:20 zeev Exp $ */
+/* $Id: sapi_apache.c,v 1.6 1999/12/17 14:24:39 sas Exp $ */
#include "php.h"
@@ -63,7 +63,6 @@
zend_executor_globals *executor_globals=⪚
php_core_globals *core_globals=&pcg;
#endif
- SLS_FETCH();
if (php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC) == FAILURE) {
return FAILURE;
@@ -84,7 +83,7 @@
return NOT_FOUND;
}
} else {
- (void) php_execute_script(&file_handle CLS_CC ELS_CC);
+ (void) php_execute_script(&file_handle CLS_CC ELS_CC PLS_CC);
}
php3_header(); /* Make sure headers have been sent */