]> granicus.if.org Git - php/commitdiff
- Fixed bug #48811 (Directives in PATH section do not get applied to subdirectories)
authorJani Taskinen <jani@php.net>
Sat, 16 Jan 2010 21:01:12 +0000 (21:01 +0000)
committerJani Taskinen <jani@php.net>
Sat, 16 Jan 2010 21:01:12 +0000 (21:01 +0000)
main/php_ini.c

index 4c3b67a595bf0cee3808d7dcf48411ad92722fdd..69c4b69d377b01f5a43918ba8ead0567f28eabb4 100644 (file)
@@ -814,7 +814,7 @@ PHPAPI void php_ini_activate_per_dir_config(char *path, uint path_len TSRMLS_DC)
                while ((ptr = strchr(ptr, '/')) != NULL) {
                        *ptr = 0;
                        /* Search for source array matching the path from configuration_hash */
-                       if (zend_hash_find(&configuration_hash, path, path_len, (void **) &tmp) == SUCCESS) {
+                       if (zend_hash_find(&configuration_hash, path, strlen(path) + 1, (void **) &tmp) == SUCCESS) {
                                php_ini_activate_config(Z_ARRVAL_P(tmp), PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE TSRMLS_CC);
                        }
                        *ptr = '/';