archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

php3_ini? What's that?

Browse source
This commit is contained in:
Zeev Suraski 1999-04-10 17:39:08 +00:00
parent bb6dff9c67
commit 4b98f345d1
4 changed files with 594 additions and 830 deletions
Download patch file Download diff file Expand all files Collapse all files

1295
Makefile.in
View file

File diff suppressed because it is too large Load diff

3
main/main.c
View file

@ -247,6 +247,7 @@ PHP_INI_BEGIN()
PHP_INI_ENTRY("max_execution_time", "30", PHP_INI_ALL, OnChangeMaxExecutionTime, NULL) PHP_INI_ENTRY("max_execution_time", "30", PHP_INI_ALL, OnChangeMaxExecutionTime, NULL)
PHP_INI_ENTRY("memory_limit", "8388608", PHP_INI_ALL, OnChangeMemoryLimit, NULL) PHP_INI_ENTRY("memory_limit", "8388608", PHP_INI_ALL, OnChangeMemoryLimit, NULL)
PHP_INI_ENTRY("track_vars", "0", PHP_INI_ALL, OnUpdateInt, (void *) XtOffsetOf(php_core_globals, track_vars))
PHP_INI_ENTRY("gpc_order", "GPC", PHP_INI_ALL, OnUpdateStringUnempty, (void *) XtOffsetOf(php_core_globals, gpc_order)) PHP_INI_ENTRY("gpc_order", "GPC", PHP_INI_ALL, OnUpdateStringUnempty, (void *) XtOffsetOf(php_core_globals, gpc_order))
PHP_INI_ENTRY("arg_separator", "&", PHP_INI_ALL, OnUpdateStringUnempty, (void *) XtOffsetOf(php_core_globals, arg_separator)) PHP_INI_ENTRY("arg_separator", "&", PHP_INI_ALL, OnUpdateStringUnempty, (void *) XtOffsetOf(php_core_globals, arg_separator))
PHP_INI_END() PHP_INI_END()
@ -604,12 +605,12 @@ static void php_message_handler_for_zend(long message, void *data)
php3_error(E_WARNING, "Failed opening '%s' for highlighting", php3_strip_url_passwd((char *) data)); php3_error(E_WARNING, "Failed opening '%s' for highlighting", php3_strip_url_passwd((char *) data));
break; break;
case ZMSG_MEMORY_LEAK_DETECTED: { case ZMSG_MEMORY_LEAK_DETECTED: {
mem_header *t = (mem_header *) data;
ELS_FETCH(); ELS_FETCH();
if (EG(error_reporting)&E_WARNING) { if (EG(error_reporting)&E_WARNING) {
#if ZEND_DEBUG #if ZEND_DEBUG
# if APACHE /* log into the errorlog, since at this time we can't send messages to the browser */ # if APACHE /* log into the errorlog, since at this time we can't send messages to the browser */
mem_header *t = (mem_header *) data;
char memory_leak_buf[512]; char memory_leak_buf[512];
snprintf(memory_leak_buf,512,"Possible PHP3 memory leak detected (harmless): %d bytes from %s:%d",t->size,t->filename,t->lineno); snprintf(memory_leak_buf,512,"Possible PHP3 memory leak detected (harmless): %d bytes from %s:%d",t->size,t->filename,t->lineno);

88
mod_php3.c
View file

@ -25,6 +25,7 @@
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> |
| (with helpful hints from Dean Gaudet <dgaudet@arctic.org> | | (with helpful hints from Dean Gaudet <dgaudet@arctic.org> |
| PHP4 patches by Zeev Suraski <zeev@zend.com> |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
*/ */
/* $Id$ */ /* $Id$ */
@ -103,8 +104,7 @@ int saved_umask;
# define php3i_popenf(p,n,f,m) popenf((p),(n),(f),(m)) # define php3i_popenf(p,n,f,m) popenf((p),(n),(f),(m))
#endif #endif
extern php3_ini_structure php3_ini; /* active config */ php_apache_info_struct php_apache_info; /* active config */
extern php3_ini_structure php3_ini_master; /* master copy of config */
int apache_php3_module_main(request_rec * r, int fd, int display_source_mode); int apache_php3_module_main(request_rec * r, int fd, int display_source_mode);
extern int php3_module_startup(); extern int php3_module_startup();
@ -186,7 +186,6 @@ void php3_restore_umask()
int send_php3(request_rec *r, int display_source_mode, char *filename) int send_php3(request_rec *r, int display_source_mode, char *filename)
{ {
int fd, retval; int fd, retval;
php3_ini_structure *conf;
/* We don't accept OPTIONS requests, but take everything else */ /* We don't accept OPTIONS requests, but take everything else */
if (r->method_number == M_OPTIONS) { if (r->method_number == M_OPTIONS) {
@ -199,16 +198,10 @@ int send_php3(request_rec *r, int display_source_mode, char *filename)
return NOT_FOUND; return NOT_FOUND;
} }
/* grab configuration settings */
conf = (php3_ini_structure *) get_module_config(r->per_dir_config,
&php3_module);
/* copy to active configuration */
memcpy(&php3_ini,conf,sizeof(php3_ini_structure));
/* If PHP parser engine has been turned off with a "php3_engine off" /* If PHP parser engine has been turned off with a "php3_engine off"
* directive, then decline to handle this request * directive, then decline to handle this request
*/ */
if (!conf->engine) { if (!php_apache_info.engine) {
r->content_type = "text/html"; r->content_type = "text/html";
r->allowed |= (1 << METHODS) - 1; r->allowed |= (1 << METHODS) - 1;
return DECLINED; return DECLINED;
@ -228,7 +221,7 @@ int send_php3(request_rec *r, int display_source_mode, char *filename)
return retval; return retval;
#endif #endif
if (conf->last_modified) { if (php_apache_info.last_modified) {
#if MODULE_MAGIC_NUMBER < 19970912 #if MODULE_MAGIC_NUMBER < 19970912
if ((retval = set_last_modified(r, r->finfo.st_mtime))) { if ((retval = set_last_modified(r, r->finfo.st_mtime))) {
return retval; return retval;
@ -270,38 +263,14 @@ int send_parsed_php3_source(request_rec * r)
} }
/* /*
* Create the per-directory config structure with defaults from php3_ini_master * Create the per-directory config structure with defaults
*/ */
static void *php3_create_dir(pool * p, char *dummy) static void *php3_create_dir(pool * p, char *dummy)
{ {
php3_ini_structure *new; php_apache_info_struct *new;
php3_module_startup(); /* php3_ini_master is set up here */ new = (php_apache_info_struct *) palloc(p, sizeof(php_apache_info_struct));
memcpy(new, &php_apache_info, sizeof(php_apache_info_struct));
new = (php3_ini_structure *) palloc(p, sizeof(php3_ini_structure));
memcpy(new,&php3_ini_master,sizeof(php3_ini_structure));
return new;
}
/*
* Merge in per-directory .conf directives
*/
static void *php3_merge_dir(pool *p, void *basev, void *addv)
{
php3_ini_structure *new = (php3_ini_structure *) palloc(p, sizeof(php3_ini_structure));
php3_ini_structure *base = (php3_ini_structure *) basev;
php3_ini_structure *add = (php3_ini_structure *) addv;
php3_ini_structure orig = php3_ini_master;
/* Start with the base config */
memcpy(new,base,sizeof(php3_ini_structure));
/* skip the highlight stuff */
if (add->engine != orig.engine) new->engine = add->engine;
if (add->last_modified != orig.last_modified) new->last_modified = add->last_modified;
if (add->dav_script != orig.dav_script) new->dav_script = add->dav_script;
return new; return new;
} }
@ -313,14 +282,14 @@ static void *php3_merge_dir(pool *p, void *basev, void *addv)
#define CONST_PREFIX #define CONST_PREFIX
#endif #endif
CONST_PREFIX char *php_apache_value_handler(cmd_parms *cmd, php3_ini_structure *conf, char *arg1, char *arg2) CONST_PREFIX char *php_apache_value_handler(cmd_parms *cmd, php_apache_info_struct *conf, char *arg1, char *arg2)
{ {
php_alter_ini_entry(arg1, strlen(arg1)+1, arg2, strlen(arg2)+1, PHP_INI_PERDIR); php_alter_ini_entry(arg1, strlen(arg1)+1, arg2, strlen(arg2)+1, PHP_INI_PERDIR);
return NULL; return NULL;
} }
CONST_PREFIX char *php_apache_flag_handler(cmd_parms *cmd, php3_ini_structure *conf, char *arg1, char *arg2) CONST_PREFIX char *php_apache_flag_handler(cmd_parms *cmd, php_apache_info_struct *conf, char *arg1, char *arg2)
{ {
char bool_val[2]; char bool_val[2];
@ -336,31 +305,11 @@ CONST_PREFIX char *php_apache_flag_handler(cmd_parms *cmd, php3_ini_structure *c
} }
#if MODULE_MAGIC_NUMBER > 19961007
const char *php3take1handler(cmd_parms * cmd, php3_ini_structure * conf, char *arg)
{
#else
char *php3take1handler(cmd_parms * cmd, php3_ini_structure * conf, char *arg)
{
#endif
int c = (int) cmd->info;
switch (c) {
case 0:
conf->errors = atoi(arg);
break;
case 20:
conf->dav_script = pstrdup(cmd->pool, arg);
break;
}
return NULL;
}
int php3_xbithack_handler(request_rec * r) int php3_xbithack_handler(request_rec * r)
{ {
php3_ini_structure *conf; php_apache_info_struct *conf;
conf = (php3_ini_structure *) get_module_config(r->per_dir_config, &php3_module); conf = (php_apache_info_struct *) get_module_config(r->per_dir_config, &php3_module);
if (!(r->finfo.st_mode & S_IXUSR)) { if (!(r->finfo.st_mode & S_IXUSR)) {
r->allowed |= (1 << METHODS) - 1; r->allowed |= (1 << METHODS) - 1;
return DECLINED; return DECLINED;
@ -375,6 +324,7 @@ int php3_xbithack_handler(request_rec * r)
void php3_init_handler(server_rec *s, pool *p) void php3_init_handler(server_rec *s, pool *p)
{ {
register_cleanup(p, NULL, php3_module_shutdown, php3_module_shutdown_for_exec); register_cleanup(p, NULL, php3_module_shutdown, php3_module_shutdown_for_exec);
php3_module_startup();
#if MODULE_MAGIC_NUMBER >= 19980527 #if MODULE_MAGIC_NUMBER >= 19980527
ap_add_version_component("PHP/" PHP_VERSION); ap_add_version_component("PHP/" PHP_VERSION);
#endif #endif
@ -389,18 +339,18 @@ extern int phpdav_mkcol_create_handler(request_rec *r);
/* conf is being read twice (both here and in send_php3()) */ /* conf is being read twice (both here and in send_php3()) */
int send_parsed_php3_dav_script(request_rec *r) int send_parsed_php3_dav_script(request_rec *r)
{ {
php3_ini_structure *conf; php_apache_info_struct *conf;
conf = (php3_ini_structure *) get_module_config(r->per_dir_config, conf = (php_apache_info_struct *) get_module_config(r->per_dir_config,
&php3_module); &php3_module);
return send_php3(r, 0, 0, conf->dav_script); return send_php3(r, 0, 0, conf->dav_script);
} }
static int php3_type_checker(request_rec *r) static int php3_type_checker(request_rec *r)
{ {
php3_ini_structure *conf; php_apache_info_struct *conf;
conf = (php3_ini_structure *)get_module_config(r->per_dir_config, conf = (php_apache_info_struct *)get_module_config(r->per_dir_config,
&php3_module); &php3_module);
/* If DAV support is enabled, use mod_dav's type checker. */ /* If DAV support is enabled, use mod_dav's type checker. */
@ -433,7 +383,7 @@ handler_rec php3_handlers[] =
command_rec php3_commands[] = command_rec php3_commands[] =
{ {
{"php4_directive", php_apache_value_handler, NULL, OR_OPTIONS, TAKE2, "PHP Value Modifier"}, {"php4_value", php_apache_value_handler, NULL, OR_OPTIONS, TAKE2, "PHP Value Modifier"},
{"php4_flag", php_apache_flag_handler, NULL, OR_OPTIONS, TAKE2, "PHP Flag Modifier"}, {"php4_flag", php_apache_flag_handler, NULL, OR_OPTIONS, TAKE2, "PHP Flag Modifier"},
{NULL} {NULL}
}; };
@ -445,7 +395,7 @@ module MODULE_VAR_EXPORT php3_module =
STANDARD_MODULE_STUFF, STANDARD_MODULE_STUFF,
php3_init_handler, /* initializer */ php3_init_handler, /* initializer */
php3_create_dir, /* per-directory config creator */ php3_create_dir, /* per-directory config creator */
php3_merge_dir, /* dir merger */ NULL, /* dir merger */
NULL, /* per-server config creator */ NULL, /* per-server config creator */
NULL, /* merge server config */ NULL, /* merge server config */
php3_commands, /* command table */ php3_commands, /* command table */

4
mod_php3.h
View file

@ -42,7 +42,9 @@ typedef struct {
long last_modified; long last_modified;
char *dav_script; char *dav_script;
long xbithack; long xbithack;
} php3_ini_structure; } php_apache_info_struct;
extern php_apache_info_struct php_apache_info;
#if MSVC5 #if MSVC5
#define S_IXUSR _S_IEXEC #define S_IXUSR _S_IEXEC