diff options
| author | Zeev Suraski <zeev@php.net> | 2000-10-29 11:38:26 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2000-10-29 11:38:26 +0000 |
| commit | 1fd09132c2539400fa198ba3172aed9ab0a9b951 (patch) | |
| tree | adbb8641e79e9db6e354ac4869daf51061fa450f /sapi | |
| parent | 825457ae64db20d0a35a272465e9a1dc1cf64e61 (diff) | |
| download | php-git-1fd09132c2539400fa198ba3172aed9ab0a9b951.tar.gz | |
Initial steps to move the INI mechanism to the Zend engine
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/aolserver/aolserver.c | 2 | ||||
| -rw-r--r-- | sapi/apache/mod_php4.c | 2 | ||||
| -rw-r--r-- | sapi/apache2/mod_php4.c | 2 | ||||
| -rw-r--r-- | sapi/apache2filter/apache_config.c | 2 | ||||
| -rw-r--r-- | sapi/cgi/cgi_main.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/sapi/aolserver/aolserver.c b/sapi/aolserver/aolserver.c index 8e18fa48f4..b7b3f9ab12 100644 --- a/sapi/aolserver/aolserver.c +++ b/sapi/aolserver/aolserver.c @@ -559,7 +559,7 @@ php_ns_config(php_ns_context *ctx, char global) } while(*val == ' '); Ns_Log(Debug, "PHP configuration option '%s=%s'", new_key, val); - php_alter_ini_entry(new_key, strlen(new_key) + 1, val, + zend_alter_ini_entry(new_key, strlen(new_key) + 1, val, strlen(val) + 1, PHP_INI_SYSTEM, PHP_INI_STAGE_RUNTIME); efree(new_key); diff --git a/sapi/apache/mod_php4.c b/sapi/apache/mod_php4.c index 09d732dbe6..eea725287b 100644 --- a/sapi/apache/mod_php4.c +++ b/sapi/apache/mod_php4.c @@ -415,7 +415,7 @@ static void init_request_info(SLS_D) 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, PHP_INI_STAGE_ACTIVATE); + zend_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, PHP_INI_STAGE_ACTIVATE); return 0; } diff --git a/sapi/apache2/mod_php4.c b/sapi/apache2/mod_php4.c index 0ab579764e..7734034aca 100644 --- a/sapi/apache2/mod_php4.c +++ b/sapi/apache2/mod_php4.c @@ -409,7 +409,7 @@ static void init_request_info(SLS_D) 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, PHP_INI_STAGE_ACTIVATE); + zend_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, PHP_INI_STAGE_ACTIVATE); return 0; } diff --git a/sapi/apache2filter/apache_config.c b/sapi/apache2filter/apache_config.c index eca4a2463e..4b82cdddd3 100644 --- a/sapi/apache2filter/apache_config.c +++ b/sapi/apache2filter/apache_config.c @@ -94,7 +94,7 @@ void apply_config(void *dummy) zend_hash_move_forward(&d->config)) { zend_hash_get_current_data(&d->config, &data); fprintf(stderr, "APPLYING (%s)(%s)\n", str, data->value); - if (php_alter_ini_entry(str, str_len, data->value, data->value_len + 1, + if (zend_alter_ini_entry(str, str_len, data->value, data->value_len + 1, data->status, PHP_INI_STAGE_RUNTIME) == FAILURE) fprintf(stderr, "..FAILED\n"); } diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index d3957e06b8..24d7b833ef 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -346,7 +346,7 @@ static void define_command_line_ini_entry(char *arg) } else { value = "1"; } - php_alter_ini_entry(name, strlen(name), value, strlen(value), PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE); + zend_alter_ini_entry(name, strlen(name), value, strlen(value), PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE); } |