svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/sapi/apache2handler/apache_config.c branches/PHP_5_4/sapi/apache2handler/apache_config.c
trunk/sapi/apache2handler/apache_config.c

felipe Mon, 23 May 2011 01:47:06 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=311342 Log: - Fixed bug #54529 (SAPI crashes on apache_config.c:197) patch by: hebergement at riastudio dot fr Bug: http://bugs.php.net/54529 (Open) SAPI crashes on apache_config.c:197 Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/sapi/apache2handler/apache_config.c U php/php-src/branches/PHP_5_4/sapi/apache2handler/apache_config.c U php/php-src/trunk/sapi/apache2handler/apache_config.c Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2011-05-22 19:06:21 UTC (rev 311341) +++ php/php-src/branches/PHP_5_3/NEWS 2011-05-23 01:47:06 UTC (rev 311342) @@ -38,6 +38,10 @@ . Fixed bug #48465 (sys_get_temp_dir() possibly inconsistent when using TMPDIR on Windows). (Pierre) . Fixed bug 54866 (incorrect accounting for realpath_cache_size) (Dustin Ward) + +- Apache2 Handler SAPI: + . Fixed bug #54529 (SAPI crashes on apache_config.c:197). + (hebergement at riastudio dot fr) - cURL: . Added CURLINFO_REDIRECT_URL support. (Daniel Stenberg, Pierre) Modified: php/php-src/branches/PHP_5_3/sapi/apache2handler/apache_config.c =================================================================== --- php/php-src/branches/PHP_5_3/sapi/apache2handler/apache_config.c 2011-05-22 19:06:21 UTC (rev 311341) +++ php/php-src/branches/PHP_5_3/sapi/apache2handler/apache_config.c 2011-05-23 01:47:06 UTC (rev 311342) @@ -192,11 +192,12 @@ 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")); + } + } } } Modified: php/php-src/branches/PHP_5_4/sapi/apache2handler/apache_config.c =================================================================== --- php/php-src/branches/PHP_5_4/sapi/apache2handler/apache_config.c 2011-05-22 19:06:21 UTC (rev 311341) +++ php/php-src/branches/PHP_5_4/sapi/apache2handler/apache_config.c 2011-05-23 01:47:06 UTC (rev 311342) @@ -192,11 +192,12 @@ 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")); + } + } } } Modified: php/php-src/trunk/sapi/apache2handler/apache_config.c =================================================================== --- php/php-src/trunk/sapi/apache2handler/apache_config.c 2011-05-22 19:06:21 UTC (rev 311341) +++ php/php-src/trunk/sapi/apache2handler/apache_config.c 2011-05-23 01:47:06 UTC (rev 311342) @@ -192,11 +192,12 @@ 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")); + } + } } }