diff options
| author | Felipe Pena <felipe@php.net> | 2011-05-23 01:47:06 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2011-05-23 01:47:06 +0000 |
| commit | a95a02150927401ed3ab7cb9a775eccf6e8025c7 (patch) | |
| tree | ea4395c2ec710a46899bfe3785acc3340780ffd3 /sapi/apache2handler | |
| parent | a6acb1f09e5b0cef1abec7c20c69e7d058a470a8 (diff) | |
| download | php-git-a95a02150927401ed3ab7cb9a775eccf6e8025c7.tar.gz | |
- Fixed bug #54529 (SAPI crashes on apache_config.c:197)
patch by: hebergement at riastudio dot fr
Diffstat (limited to 'sapi/apache2handler')
| -rw-r--r-- | sapi/apache2handler/apache_config.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sapi/apache2handler/apache_config.c b/sapi/apache2handler/apache_config.c index e48e23b135..37a2195ab9 100644 --- a/sapi/apache2handler/apache_config.c +++ b/sapi/apache2handler/apache_config.c @@ -192,11 +192,12 @@ void apply_config(void *dummy) zend_hash_get_current_key_ex(&d->config, &str, &str_len, NULL, 0, NULL) == HASH_KEY_IS_STRING; zend_hash_move_forward(&d->config)) { - zend_hash_get_current_data(&d->config, (void **) &data); - phpapdebug((stderr, "APPLYING (%s)(%s)\n", str, data->value)); - if (zend_alter_ini_entry(str, str_len, data->value, data->value_len, data->status, data->htaccess?PHP_INI_STAGE_HTACCESS:PHP_INI_STAGE_ACTIVATE) == FAILURE) { - phpapdebug((stderr, "..FAILED\n")); - } + if (zend_hash_get_current_data(&d->config, (void **) &data) == SUCCESS) { + phpapdebug((stderr, "APPLYING (%s)(%s)\n", str, data->value)); + if (zend_alter_ini_entry(str, str_len, data->value, data->value_len, data->status, data->htaccess?PHP_INI_STAGE_HTACCESS:PHP_INI_STAGE_ACTIVATE) == FAILURE) { + phpapdebug((stderr, "..FAILED\n")); + } + } } } |