diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-02-18 16:27:38 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-02-18 16:27:38 +0400 |
| commit | 5de7115679522dec2f4725104c6f8c6e4a7bd8e4 (patch) | |
| tree | 4c3ec266ea19dec3ca82e348c1e73483d1899715 /main/php_ini.c | |
| parent | 1c4f3d39a805323dc60f2bc1bfc96e39d608ac37 (diff) | |
| download | php-git-5de7115679522dec2f4725104c6f8c6e4a7bd8e4.tar.gz | |
Use better data structures (incomplete; able to run bench.php)
Diffstat (limited to 'main/php_ini.c')
| -rw-r--r-- | main/php_ini.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/main/php_ini.c b/main/php_ini.c index cb68d83e65..0c2ccc958f 100644 --- a/main/php_ini.c +++ b/main/php_ini.c @@ -837,8 +837,7 @@ PHPAPI void php_ini_activate_per_host_config(const char *host, uint host_len TSR if (has_per_host_config && host && host_len) { /* Search for source array matching the host from configuration_hash */ -//??? remove -1 - if ((tmp = zend_hash_str_find(&configuration_hash, host, host_len-1)) != NULL) { + if ((tmp = zend_hash_str_find(&configuration_hash, host, host_len)) != NULL) { php_ini_activate_config(Z_ARRVAL_P(tmp), PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE TSRMLS_CC); } } @@ -849,8 +848,7 @@ PHPAPI void php_ini_activate_per_host_config(const char *host, uint host_len TSR */ PHPAPI zval *cfg_get_entry(const char *name, uint name_length) { -//??? remove -1 - return zend_hash_str_find(&configuration_hash, name, name_length-1); + return zend_hash_str_find(&configuration_hash, name, name_length); } /* }}} */ |