CVS update: php3

Date: Wednesday August 12, 1998 @ 0:56 Author: steffann Update of /repository/php3 In directory asf:/tmp/cvs-serv10016 Modified Files: main.c mod_php3.c mod_php3.h Log Message: Added config-option enable_dl to enable/disable dynamic loading. Index: php3/main.c diff -c php3/main.c:1.459 php3/main.c:1.460 *** php3/main.c:1.459 Sat Aug 8 07:18:06 1998 --- php3/main.c Wed Aug 12 00:56:27 1998 *************** *** 29,35 **** +----------------------------------------------------------------------+ */ ! /* $Id: main.c,v 1.459 1998/08/08 11:18:06 zeev Exp $ */ /* #define CRASH_DETECTION */ --- 29,35 ---- +----------------------------------------------------------------------+ */ ! /* $Id: main.c,v 1.460 1998/08/12 04:56:27 steffann Exp $ */ /* #define CRASH_DETECTION */ *************** *** 1054,1059 **** --- 1054,1062 ---- } if (cfg_get_string("fopen_basedir", &php3_ini.fopen_basedir) == FAILURE) { php3_ini.fopen_basedir = NULL; + } + if (cfg_get_long("enable_dl", &php3_ini.enable_dl) == FAILURE) { + php3_ini.enable_dl = 1; } /* THREADX Will have to look into this on windows * Make a master copy to use as a basis for every per-dir config. Index: php3/mod_php3.c diff -c php3/mod_php3.c:1.78 php3/mod_php3.c:1.79 *** php3/mod_php3.c:1.78 Thu Jul 30 16:39:15 1998 --- php3/mod_php3.c Wed Aug 12 00:56:28 1998 *************** *** 27,33 **** | (with helpful hints from Dean Gaudet <dgaudet@arctic.org> | +----------------------------------------------------------------------+ */ ! /* $Id: mod_php3.c,v 1.78 1998/07/30 20:39:15 steffann Exp $ */ #ifdef THREAD_SAFE #include "tls.h" --- 27,33 ---- | (with helpful hints from Dean Gaudet <dgaudet@arctic.org> | +----------------------------------------------------------------------+ */ ! /* $Id: mod_php3.c,v 1.79 1998/08/12 04:56:28 steffann Exp $ */ #ifdef THREAD_SAFE #include "tls.h" *************** *** 320,325 **** --- 320,326 ---- if (add->error_prepend_string != orig.error_prepend_string) new->error_prepend_string = add->error_prepend_string; if (add->error_append_string != orig.error_append_string) new->error_append_string = add->error_append_string; if (add->fopen_basedir != orig.fopen_basedir) new->fopen_basedir = add->fopen_basedir; + if (add->enable_dl != orig.enable_dl) new->enable_dl = add->enable_dl; return new; } *************** *** 373,378 **** --- 374,382 ---- case 12: conf->magic_quotes_sybase = val; break; + case 13: + conf->enable_dl = val; + break; } return NULL; } *************** *** 525,530 **** --- 529,535 ---- {"php3_log_errors", php3flaghandler, (void *)10, OR_OPTIONS, FLAG, "on|off"}, {"php3_display_errors", php3flaghandler, (void *)11, OR_OPTIONS, FLAG, "on|off"}, {"php3_magic_quotes_sybase", php3flaghandler, (void *)12, OR_OPTIONS, FLAG, "on|off"}, + {"php3_enable_dl", php3flaghandler, (void *)13, RSRC_CONF|ACCESS_CONF, FLAG, "on|off"}, {NULL} }; Index: php3/mod_php3.h diff -c php3/mod_php3.h:1.41 php3/mod_php3.h:1.42 *** php3/mod_php3.h:1.41 Thu Jul 30 16:39:15 1998 --- php3/mod_php3.h Wed Aug 12 00:56:28 1998 *************** *** 26,32 **** | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ ! /* $Id: mod_php3.h,v 1.41 1998/07/30 20:39:15 steffann Exp $ */ #ifndef _MOD_PHP3_H #define _MOD_PHP3_H --- 26,32 ---- | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ ! /* $Id: mod_php3.h,v 1.42 1998/08/12 04:56:28 steffann Exp $ */ #ifndef _MOD_PHP3_H #define _MOD_PHP3_H *************** *** 87,92 **** --- 87,93 ---- char *error_prepend_string; char *error_append_string; char *fopen_basedir; + long enable_dl; } php3_ini_structure; #if MSVC5 -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net