[PHP4BETA] CVS update: php4

From: Date: Sat, 29 May 1999 19:06:22 +0000
Subject: [PHP4BETA] CVS update: php4
Groups: php.version4 
Request: Send a blank email to php-version4+get-1193@lists.php.net to get a copy of this message
Date: Saturday May 29, 1999 @ 15:06 Author: zeev Update of /repository/php4 In directory php:/tmp/cvs-serv12650 Modified Files: Makefile.in libphp4.module.in mod_php4.c Log Message: * Changed the way INI entries work in Apache to allow .conf entries to work right too. * vpath fixes for standard Apache build Index: php4/Makefile.in diff -u php4/Makefile.in:1.35 php4/Makefile.in:1.36 --- php4/Makefile.in:1.35 Sat May 29 12:15:21 1999 +++ php4/Makefile.in Sat May 29 15:06:22 1999 @@ -24,7 +24,7 @@ # +----------------------------------------------------------------------+ # -# $Id: Makefile.in,v 1.35 1999/05/29 16:15:21 sas Exp $ +# $Id: Makefile.in,v 1.36 1999/05/29 19:06:22 zeev Exp $ # prefix = @prefix@ @@ -92,7 +92,7 @@ # Apache modules libphp4.a libmodphp4.a: all-recursive $(OBJS) @REGEX_LIB@ $(AR) $@.tmp $(OBJS) - $(srcdir)/scripts/armerge $@ $@.tmp ext/libphpext.a $(srcdir)/libzend/libzend.a @TSRM_LIB@ + $(srcdir)/scripts/armerge $@ $@.tmp ext/libphpext.a libzend/libzend.a @TSRM_LIB@ @rm -f $@.tmp $(RANLIB) $(BINNAME) Index: php4/libphp4.module.in diff -u php4/libphp4.module.in:1.1 php4/libphp4.module.in:1.2 --- php4/libphp4.module.in:1.1 Sat May 22 05:24:19 1999 +++ php4/libphp4.module.in Sat May 29 15:06:22 1999 @@ -3,5 +3,5 @@ RULE_WANTHSREGEX=@HSREGEX@ LIBS="@PHP_LIBS@ @EXTRA_LIBS@ @LIBS@ @RDYNAMIC_LFLAGS@ $LIBS" RULE_HIDE=yes - CFLAGS="$CFLAGS -I@abs_srcdir@ -I@abs_srcdir@/libzend -I@abs_builddir@" + CFLAGS="$CFLAGS -I@abs_srcdir@ -I@abs_srcdir@/libzend -I@abs_builddir@/libzend -I@abs_builddir@" ConfigEnd Index: php4/mod_php4.c diff -u php4/mod_php4.c:1.5 php4/mod_php4.c:1.6 --- php4/mod_php4.c:1.5 Sat May 29 12:03:49 1999 +++ php4/mod_php4.c Sat May 29 15:06:22 1999 @@ -28,7 +28,7 @@ | PHP 4.0 patches by Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: mod_php4.c,v 1.5 1999/05/29 16:03:49 zeev Exp $ */ +/* $Id: mod_php4.c,v 1.6 1999/05/29 19:06:22 zeev Exp $ */ #include "httpd.h" #include "http_config.h" @@ -67,8 +67,15 @@ module MODULE_VAR_EXPORT php4_module; int saved_umask; -static int php_initialized; +static unsigned char apache_php_initialized=0; +typedef struct _php_per_dir_entry { + char *key; + char *value; + uint key_length; + uint value_length; + int type; +} php_per_dir_entry; #if WIN32|WINNT /* popenf isn't working on Windows, use open instead*/ @@ -234,14 +241,24 @@ } +static int php_apache_alter_ini_entries(php_per_dir_entry *per_dir_entry) +{ + php_alter_ini_entry(per_dir_entry->key, per_dir_entry->key_length+1, per_dir_entry->value, per_dir_entry->value_length+1, per_dir_entry->type); +} + + int send_php(request_rec *r, int display_source_mode, char *filename) { int fd, retval; + HashTable *per_dir_conf; SLS_FETCH(); if (setjmp(EG(bailout))!=0) { return OK; } + per_dir_conf = (HashTable *) get_module_config(r->per_dir_config, &php4_module); + zend_hash_apply((HashTable *) per_dir_conf, (int (*)(void *)) php_apache_alter_ini_entries); + /* We don't accept OPTIONS requests, but take everything else */ if (r->method_number == M_OPTIONS) { r->allowed |= (1 << METHODS) - 1; @@ -324,17 +341,46 @@ } +static void destroy_per_dir_entry(php_per_dir_entry *per_dir_entry) +{ + free(per_dir_entry->key); + free(per_dir_entry->value); +} + +static void copy_per_dir_entry(php_per_dir_entry *per_dir_entry) +{ + php_per_dir_entry tmp = *per_dir_entry; + + per_dir_entry->key = (char *) malloc(tmp.key_length+1); + memcpy(per_dir_entry->key, tmp.key, tmp.key_length); + per_dir_entry->key[per_dir_entry->key_length] = 0; + + per_dir_entry->value = (char *) malloc(tmp.value_length+1); + memcpy(per_dir_entry->value, tmp.value, tmp.value_length); + per_dir_entry->value[per_dir_entry->value_length] = 0; +} + /* * Create the per-directory config structure with defaults */ -static void *php_create_dir(pool * p, char *dummy) +static void *php_create_dir(pool *p, char *dummy) { - php_apache_info_struct *new; + HashTable *per_dir_info; + + per_dir_info = (HashTable *) malloc(sizeof(HashTable)); + zend_hash_init(per_dir_info, 5, NULL, (void (*)(void *)) destroy_per_dir_entry, 1); + register_cleanup(p, (void *) per_dir_info, (void (*)(void *)) zend_hash_destroy, (void (*)(void *)) zend_hash_destroy); - new = (php_apache_info_struct *) palloc(p, sizeof(php_apache_info_struct)); - memcpy(new, &php_apache_info, sizeof(php_apache_info_struct)); + return per_dir_info; +} + + +static void *php_merge_dir(pool *p, void *basev, void *addv) +{ + php_per_dir_entry tmp; - return new; + zend_hash_merge((HashTable *) basev, (HashTable *) addv, (void (*)(void *)) copy_per_dir_entry, &tmp, sizeof(php_per_dir_entry), 1); + return basev; } @@ -344,29 +390,37 @@ #define CONST_PREFIX #endif -CONST_PREFIX char *php_apache_value_handler(cmd_parms *cmd, php_apache_info_struct *conf, char *arg1, char *arg2) +CONST_PREFIX char *php_apache_value_handler(cmd_parms *cmd, HashTable *conf, char *arg1, char *arg2) { - if (!php_initialized) { + php_per_dir_entry per_dir_entry; + + if (!apache_php_initialized) { sapi_startup(&sapi_module); php_module_startup(&sapi_module); - php_initialized = 1; + apache_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); + per_dir_entry.type = PHP_INI_PERDIR; + + per_dir_entry.key_length = strlen(arg1); + per_dir_entry.value_length = strlen(arg2); + + per_dir_entry.key = (char *) malloc(per_dir_entry.key_length+1); + memcpy(per_dir_entry.key, arg1, per_dir_entry.key_length); + per_dir_entry.key[per_dir_entry.key_length] = 0; + + per_dir_entry.value = (char *) malloc(per_dir_entry.value_length+1); + memcpy(per_dir_entry.value, arg2, per_dir_entry.value_length); + per_dir_entry.value[per_dir_entry.value_length] = 0; + + zend_hash_update((HashTable *) conf, per_dir_entry.key, per_dir_entry.key_length, &per_dir_entry, sizeof(php_per_dir_entry), NULL); return NULL; } -CONST_PREFIX char *php_apache_flag_handler(cmd_parms *cmd, php_apache_info_struct *conf, char *arg1, char *arg2) +CONST_PREFIX char *php_apache_flag_handler(cmd_parms *cmd, HashTable *conf, char *arg1, char *arg2) { 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 { @@ -374,8 +428,7 @@ } bool_val[1] = 0; - php_alter_ini_entry(arg1, strlen(arg1)+1, bool_val, 2, PHP_INI_PERDIR); - return NULL; + return php_apache_value_handler(cmd, conf, arg1, bool_val); } @@ -397,7 +450,7 @@ static void apache_php_module_shutdown_wrapper() { - php_initialized = 0; + apache_php_initialized = 0; sapi_module.shutdown(&sapi_module); } @@ -405,10 +458,10 @@ void php_init_handler(server_rec *s, pool *p) { register_cleanup(p, NULL, apache_php_module_shutdown_wrapper, php_module_shutdown_for_exec); - if (!php_initialized) { + if (!apache_php_initialized) { sapi_startup(&sapi_module); php_module_startup(&sapi_module); - php_initialized = 1; + apache_php_initialized = 1; } #if MODULE_MAGIC_NUMBER >= 19980527 ap_add_version_component("PHP/" PHP_VERSION); @@ -480,7 +533,7 @@ STANDARD_MODULE_STUFF, php_init_handler, /* initializer */ php_create_dir, /* per-directory config creator */ - NULL, /* dir merger */ + php_merge_dir, /* dir merger */ NULL, /* per-server config creator */ NULL, /* merge server config */ php_commands, /* command table */ -- PHP 4 Beta

« previous php.version4 (#1193) next »