com php-src: backported sapi/cli: sapi/cli/php_cli.c sapi /cli/php_cli_server.c

Commit: beb11f69f335e68489edbb2b06db20f794138496 Author: Anatol Belski <ab@php.net> Sat, 15 Feb 2014 20:25:37 +0100 Parents: 1648d83e6d6398516cc57fd066298e098492e11a Branches: str_size_and_int64_56_backport Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=beb11f69f335e68489edbb2b06db20f794138496 Log: backported sapi/cli 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 f9e01a5..9c1b9cd 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -320,7 +320,7 @@ static php_size_t sapi_cli_ub_write(const char *str, php_size_t str_length TSRML } /* }}} */ -static void sapi_cli_flush(void *server_context TSRMLS_DC) /* {{{ */ +static void sapi_cli_flush(void *server_context) /* {{{ */ { /* Ignore EBADF here, it's caused by the fact that STDIN/STDOUT/STDERR streams * are/could be closed before fflush() is called. @@ -870,7 +870,7 @@ static int do_cli(int argc, char **argv TSRMLS_DC) /* {{{ */ break; case 'z': /* load extension file */ - zend_load_extension(php_optarg TSRMLS_CC); + zend_load_extension(php_optarg); break; case 'H': hide_argv = 1; @@ -1024,7 +1024,7 @@ static int do_cli(int argc, char **argv TSRMLS_DC) /* {{{ */ /* Zeev might want to do something with this one day */ case PHP_MODE_INDENT: open_file_for_scanning(&file_handle TSRMLS_CC); - zend_indent(TSRMLS_C); + zend_indent(); zend_file_handle_dtor(file_handle.handle TSRMLS_CC); goto out; break; diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c index a36f102..9b63cb6 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -614,9 +614,10 @@ static php_size_t sapi_cli_server_ub_write(const char *str, php_size_t str_lengt return php_cli_server_client_send_through(client, str, str_length); } /* }}} */ -static void sapi_cli_server_flush(void *server_context TSRMLS_DC) /* {{{ */ +static void sapi_cli_server_flush(void *server_context) /* {{{ */ { php_cli_server_client *client = server_context; + TSRMLS_FETCH(); if (!client) { return; @@ -1143,7 +1144,7 @@ static int php_cli_server_content_sender_send(php_cli_server_content_sender *sen return 0; } /* }}} */ -static int php_cli_server_content_sender_pull(php_cli_server_content_sender *sender, int fd, size_t *nbytes_read TSRMLS_DC) /* {{{ */ +static int php_cli_server_content_sender_pull(php_cli_server_content_sender *sender, int fd, size_t *nbytes_read) /* {{{ */ { ssize_t _nbytes_read; php_cli_server_chunk *chunk = php_cli_server_chunk_heap_new_self_contained(131072); @@ -1151,6 +1152,7 @@ static int php_cli_server_content_sender_pull(php_cli_server_content_sender *sen _nbytes_read = read(fd, chunk->data.heap.p, chunk->data.heap.len); if (_nbytes_read < 0) { char *errstr = get_last_error(); + TSRMLS_FETCH(); php_cli_server_logf("%s" TSRMLS_CC, errstr); pefree(errstr, 1); php_cli_server_chunk_dtor(chunk); @@ -2366,7 +2368,7 @@ static int php_cli_server_send_event(php_cli_server *server, php_cli_server_clie if (client->content_sender_initialized) { if (client->file_fd >= 0 && !client->content_sender.buffer.first) { size_t nbytes_read; - if (php_cli_server_content_sender_pull(&client->content_sender, client->file_fd, &nbytes_read TSRMLS_CC)) { + if (php_cli_server_content_sender_pull(&client->content_sender, client->file_fd, &nbytes_read)) { php_cli_server_close_connection(server, client TSRMLS_CC); return FAILURE; }