[PHP4BETA] CVS update: php4
| From: | zeev | Date: | Sat, 29 May 1999 16:03:50 +0000 |
| Subject: | [PHP4BETA] CVS update: php4 | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-1182@lists.php.net to get a copy of this message | ||
Date: Saturday May 29, 1999 @ 12:03
Author: zeev
Update of /repository/php4
In directory php:/tmp/cvs-serv4702
Modified Files:
mod_php4.c
Log Message:
avoid crashing with php4 directives in .conf files (they still don't work)
Index: php4/mod_php4.c
diff -u php4/mod_php4.c:1.4 php4/mod_php4.c:1.5
--- php4/mod_php4.c:1.4 Fri May 28 18:42:17 1999
+++ php4/mod_php4.c Sat May 29 12:03:49 1999
@@ -28,7 +28,7 @@
| PHP 4.0 patches by Zeev Suraski <zeev@zend.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: mod_php4.c,v 1.4 1999/05/28 22:42:17 zeev Exp $ */
+/* $Id: mod_php4.c,v 1.5 1999/05/29 16:03:49 zeev Exp $ */
#include "httpd.h"
#include "http_config.h"
@@ -67,6 +67,7 @@
module MODULE_VAR_EXPORT php4_module;
int saved_umask;
+static int php_initialized;
#if WIN32|WINNT
@@ -345,6 +346,12 @@
CONST_PREFIX char *php_apache_value_handler(cmd_parms *cmd, php_apache_info_struct *conf, char
*arg1, char *arg2)
{
+ if (!php_initialized) {
+ sapi_startup(&sapi_module);
+ php_module_startup(&sapi_module);
+ php_initialized = 1;
+ }
+ printf("Altering '%s' -> '%s'\n", arg1, arg2);
php_alter_ini_entry(arg1, strlen(arg1)+1, arg2, strlen(arg2)+1, PHP_INI_PERDIR);
return NULL;
}
@@ -354,6 +361,12 @@
{
char bool_val[2];
+ if (!php_initialized) {
+ sapi_startup(&sapi_module);
+ php_module_startup(&sapi_module);
+ php_initialized = 1;
+ }
+
if (!strcmp(arg2, "On")) {
bool_val[0] = '1';
} else {
@@ -382,12 +395,21 @@
return send_parsed_php(r);
}
+static void apache_php_module_shutdown_wrapper()
+{
+ php_initialized = 0;
+ sapi_module.shutdown(&sapi_module);
+}
+
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);
+ register_cleanup(p, NULL, apache_php_module_shutdown_wrapper, php_module_shutdown_for_exec);
+ if (!php_initialized) {
+ sapi_startup(&sapi_module);
+ php_module_startup(&sapi_module);
+ php_initialized = 1;
+ }
#if MODULE_MAGIC_NUMBER >= 19980527
ap_add_version_component("PHP/" PHP_VERSION);
#endif
@@ -437,8 +459,8 @@
handler_rec php_handlers[] =
{
- {"application/x-httpd-php3", send_parsed_php},
- {"application/x-httpd-php3-source", send_parsed_php_source},
+ {"application/x-httpd-php", send_parsed_php},
+ {"application/x-httpd-php-source", send_parsed_php_source},
{"text/html", php_xbithack_handler},
{NULL}
};
--
PHP 4 Beta