com php-src: Fixed various CLI problems: sapi/cli/php_cli.c sapi/cli/php_cli_server.c
| From: | Dmitry Stogov | Date: | Fri, 14 Mar 2014 14:00:42 +0000 |
| Subject: | com php-src: Fixed various CLI problems: sapi/cli/php_cli.c sapi/cli/php_cli_server.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77647@lists.php.net to get a copy of this message | ||
Commit: 232f3e915cf7499663d6f404e8f3dbf4985523fb
Author: Dmitry Stogov <dmitry@zend.com> Fri, 14 Mar 2014 18:00:42 +0400
Parents: c094fc11bea5bb733edb31aaa044b70ac5dc2d59
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=232f3e915cf7499663d6f404e8f3dbf4985523fb
Log:
Fixed various CLI problems
Changed paths:
M sapi/cli/php_cli.c
M sapi/cli/php_cli_server.c
Diff:
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index 190f09f...b85aded 100644
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -195,8 +195,7 @@ static void print_modules(TSRMLS_D) /* {{{ */
{
HashTable sorted_registry;
- zend_hash_init(&sorted_registry, 50, NULL, NULL, 1);
-//??? zend_hash_copy(&sorted_registry, &module_registry, NULL, &tmp,
sizeof(zend_module_entry));
+ zend_hash_init(&sorted_registry, 50, NULL, NULL, 0);
zend_hash_copy(&sorted_registry, &module_registry, NULL);
zend_hash_sort(&sorted_registry, zend_qsort, module_name_cmp, 0 TSRMLS_CC);
zend_hash_apply(&sorted_registry, (apply_func_t) print_module_info TSRMLS_CC);
@@ -1038,7 +1037,7 @@ static int do_cli(int argc, char **argv TSRMLS_DC) /* {{{ */
zend_hash_str_update(&EG(symbol_table).ht, "argi", sizeof("argi")-1,
&argi);
while (exit_status == SUCCESS && (input=php_stream_gets(s_in_process, NULL, 0)) !=
NULL) {
len = strlen(input);
- while (len-- && (input[len]=='\n' || input[len]=='\r')) {
+ while (len > 0 && len-- && (input[len]=='\n' ||
input[len]=='\r')) {
input[len] = '\0';
}
ZVAL_STRINGL(&argn, input, len);
@@ -1067,15 +1066,14 @@ static int do_cli(int argc, char **argv TSRMLS_DC) /* {{{ */
break;
}
-//???
-#if 0
+
case PHP_MODE_REFLECTION_FUNCTION:
case PHP_MODE_REFLECTION_CLASS:
case PHP_MODE_REFLECTION_EXTENSION:
case PHP_MODE_REFLECTION_ZEND_EXTENSION:
{
zend_class_entry *pce = NULL;
- zval *arg, *ref;
+ zval arg, ref;
zend_execute_data execute_data;
switch (behavior) {
@@ -1099,24 +1097,24 @@ static int do_cli(int argc, char **argv TSRMLS_DC) /* {{{ */
break;
}
- MAKE_STD_ZVAL(arg);
- ZVAL_STRING(arg, reflection_what, 1);
- ALLOC_ZVAL(ref);
- object_init_ex(ref, pce);
- INIT_PZVAL(ref);
+ ZVAL_STRING(&arg, reflection_what);
+ object_init_ex(&ref, pce);
memset(&execute_data, 0, sizeof(zend_execute_data));
EG(current_execute_data) = &execute_data;
EX(function_state).function = pce->constructor;
- zend_call_method_with_1_params(&ref, pce, &pce->constructor,
"__construct", NULL, arg);
+ zend_call_method_with_1_params(&ref, pce, &pce->constructor,
"__construct", NULL, &arg);
if (EG(exception)) {
- zval *msg = zend_read_property(zend_exception_get_default(TSRMLS_C), EG(exception),
"message", sizeof("message")-1, 0 TSRMLS_CC);
+ zval tmp, *msg;
+
+ ZVAL_OBJ(&tmp, EG(exception));
+ msg = zend_read_property(zend_exception_get_default(TSRMLS_C), &tmp, "message",
sizeof("message")-1, 0 TSRMLS_CC);
zend_printf("Exception: %s\n", Z_STRVAL_P(msg));
- zval_ptr_dtor(&EG(exception));
+ zval_ptr_dtor(&tmp);
EG(exception) = NULL;
} else {
- zend_call_method_with_1_params(NULL, reflection_ptr, NULL, "export", NULL, ref);
+ zend_call_method_with_1_params(NULL, reflection_ptr, NULL, "export", NULL,
&ref);
}
zval_ptr_dtor(&ref);
zval_ptr_dtor(&arg);
@@ -1129,7 +1127,7 @@ static int do_cli(int argc, char **argv TSRMLS_DC) /* {{{ */
char *lcname = zend_str_tolower_dup(reflection_what, len);
zend_module_entry *module;
- if (zend_hash_find(&module_registry, lcname, len+1, (void**)&module) == FAILURE) {
+ if ((module = zend_hash_str_find_ptr(&module_registry, lcname, len)) == NULL) {
if (!strcmp(reflection_what, "main")) {
display_ini_entries(NULL);
} else {
@@ -1143,7 +1141,7 @@ static int do_cli(int argc, char **argv TSRMLS_DC) /* {{{ */
efree(lcname);
break;
}
-#endif
+
case PHP_MODE_SHOW_INI_CONFIG:
{
zend_printf("Configuration File (php.ini) Path: %s\n", PHP_CONFIG_FILE_PATH);
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server..c
index f0160b4..17c9270 100644
--- a/sapi/cli/php_cli_server.c
+++ b/sapi/cli/php_cli_server.c
@@ -450,7 +450,7 @@ static void append_essential_headers(smart_str* buffer, php_cli_server_client *c
{
{
char *val;
- if (SUCCESS == (val = zend_hash_str_find_ptr(&client->request.headers, "host",
sizeof("host")-1))) {
+ if (NULL != (val = zend_hash_str_find_ptr(&client->request.headers, "host",
sizeof("host")-1))) {
smart_str_appendl_ex(buffer, "Host", sizeof("Host") - 1, persistent);
smart_str_appendl_ex(buffer, ": ", sizeof(": ") - 1, persistent);
smart_str_appends_ex(buffer, val, persistent);
@@ -519,7 +519,7 @@ static void add_response_header(sapi_header_struct *h, zval *return_value TSRMLS
do {
p++;
} while (*p == ' ' || *p == '\t');
- add_assoc_stringl_ex(return_value, s, len+1, p, h->header_len - (p - h->header), 1);
+ add_assoc_stringl_ex(return_value, s, len, p, h->header_len - (p - h->header), 1);
free_alloca(s, use_heap);
}
}