diff options
| author | Kalle Sommer Nielsen <kalle@php.net> | 2013-12-18 08:17:49 +0100 |
|---|---|---|
| committer | Kalle Sommer Nielsen <kalle@php.net> | 2013-12-18 08:17:49 +0100 |
| commit | e6b471933cb2badd2edadd6dd92fd6631319bd39 (patch) | |
| tree | d266becb0fd08e79706da452dff68843eb9fce93 /sapi/cli/php_cli_server.c | |
| parent | bd58146ad664431464e42f654b58fc92270f3484 (diff) | |
| download | php-git-e6b471933cb2badd2edadd6dd92fd6631319bd39.tar.gz | |
Kill yet another TSRMLS_FETCH() inside the CLI HTTP server
Diffstat (limited to 'sapi/cli/php_cli_server.c')
| -rw-r--r-- | sapi/cli/php_cli_server.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c index 939eb5a501..77e4d09ba0 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -1144,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) /* {{{ */ +static int php_cli_server_content_sender_pull(php_cli_server_content_sender *sender, int fd, size_t *nbytes_read TSRMLS_DC) /* {{{ */ { ssize_t _nbytes_read; php_cli_server_chunk *chunk = php_cli_server_chunk_heap_new_self_contained(131072); @@ -1152,7 +1152,6 @@ 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); @@ -2368,7 +2367,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)) { + if (php_cli_server_content_sender_pull(&client->content_sender, client->file_fd, &nbytes_read TSRMLS_CC)) { php_cli_server_close_connection(server, client TSRMLS_CC); return FAILURE; } |