php-5.3.7-bug-54529.patch

   1 --- PHP_5_3/sapi/apache2handler/apache_config.c 2011/05/22 19:06:21     311341
   2 +++ PHP_5_3/sapi/apache2handler/apache_config.c 2011/05/23 01:47:06     311342
   3 @@ -192,11 +192,12 @@
   4                         zend_hash_get_current_key_ex(&d->config, &str, &str_len, NULL, 0,
   5                                 NULL) == HASH_KEY_IS_STRING;
   6                         zend_hash_move_forward(&d->config)) {
   7 -               zend_hash_get_current_data(&d->config, (void **) &data);
   8 -               phpapdebug((stderr, "APPLYING (%s)(%s)\n", str, data->value));
   9 -               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) {
  10 -                       phpapdebug((stderr, "..FAILED\n"));
  11 -               }
  12 +               if (zend_hash_get_current_data(&d->config, (void **) &data) == SUCCESS) {
  13 +                       phpapdebug((stderr, "APPLYING (%s)(%s)\n", str, data->value));
  14 +                       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) {
  15 +                               phpapdebug((stderr, "..FAILED\n"));
  16 +                       }
  17 +               }
  18         }
  19  }
  20