diff options
| author | Xinchen Hui <laruence@gmail.com> | 2014-04-22 11:59:53 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2014-04-22 11:59:53 +0800 |
| commit | 89d89b95861c4366f93e705546c0ca8c4443a425 (patch) | |
| tree | d59aaef97b53a61bc7c10de368dad7adcc34fef7 /sapi | |
| parent | e48b9ad197b4ec6ac72e75538453cc350d0a41f4 (diff) | |
| parent | fa588a5c82c0264dc10862495c993a914a421667 (diff) | |
| download | php-git-89d89b95861c4366f93e705546c0ca8c4443a425.tar.gz | |
Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/cgi/cgi_main.c | 6 | ||||
| -rw-r--r-- | sapi/cgi/fastcgi.c | 2 | ||||
| -rw-r--r-- | sapi/phpdbg/phpdbg_info.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index 6384c66bca..f3e9dd6f0f 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -234,7 +234,7 @@ static void print_modules(TSRMLS_D) { HashTable sorted_registry; - zend_hash_init(&sorted_registry, 50, NULL, NULL, 1); + zend_hash_init(&sorted_registry, 64, NULL, NULL, 1); //??? zend_hash_copy(&sorted_registry, &module_registry, NULL, &tmp, sizeof(zend_module_entry)); zend_hash_copy(&sorted_registry, &module_registry, NULL); zend_hash_sort(&sorted_registry, zend_qsort, module_name_cmp, 0 TSRMLS_CC); @@ -756,7 +756,7 @@ static void php_cgi_ini_activate_user_config(char *path, int path_len, const cha new_entry = pemalloc(sizeof(user_config_cache_entry), 1); new_entry->expires = 0; new_entry->user_config = (HashTable *) pemalloc(sizeof(HashTable), 1); - zend_hash_init(new_entry->user_config, 0, NULL, (dtor_func_t) config_zval_dtor, 1); + zend_hash_init(new_entry->user_config, 8, NULL, (dtor_func_t) config_zval_dtor, 1); entry = zend_hash_str_update_ptr(&CGIG(user_config_cache), path, path_len, new_entry); } @@ -1475,7 +1475,7 @@ static void php_cgi_globals_ctor(php_cgi_globals_struct *php_cgi_globals TSRMLS_ #ifdef PHP_WIN32 php_cgi_globals->impersonate = 0; #endif - zend_hash_init(&php_cgi_globals->user_config_cache, 0, NULL, (dtor_func_t) user_config_cache_entry_dtor, 1); + zend_hash_init(&php_cgi_globals->user_config_cache, 8, NULL, (dtor_func_t) user_config_cache_entry_dtor, 1); } /* }}} */ diff --git a/sapi/cgi/fastcgi.c b/sapi/cgi/fastcgi.c index a5845d9f8d..585b6b8e87 100644 --- a/sapi/cgi/fastcgi.c +++ b/sapi/cgi/fastcgi.c @@ -411,7 +411,7 @@ int fcgi_init(void) sa_t sa; socklen_t len = sizeof(sa); #endif - zend_hash_init(&fcgi_mgmt_vars, 0, NULL, fcgi_free_mgmt_var_cb, 1); + zend_hash_init(&fcgi_mgmt_vars, 8, NULL, fcgi_free_mgmt_var_cb, 1); fcgi_set_mgmt_var("FCGI_MPXS_CONNS", sizeof("FCGI_MPXS_CONNS")-1, "0", sizeof("0")-1); is_initialized = 1; diff --git a/sapi/phpdbg/phpdbg_info.c b/sapi/phpdbg/phpdbg_info.c index f7c7ab0846..5596255d6e 100644 --- a/sapi/phpdbg/phpdbg_info.c +++ b/sapi/phpdbg/phpdbg_info.c @@ -215,7 +215,7 @@ PHPDBG_INFO(literal) /* {{{ */ if (Z_TYPE(ops->literals[literal]) != IS_NULL) { phpdbg_write("|-------- C%u -------> [", literal); zend_print_zval( - &ops->literals[literal], 0); + &ops->literals[literal], 0 TSRMLS_CC); phpdbg_write("]"); phpdbg_writeln(EMPTY); } |