Skip to content

Remove built-in server's useless functions #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Remove built-in server's useless functions #65

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 2 additions & 30 deletions sapi/cli/php_cli_server.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,6 @@ typedef struct php_cli_server_client {
php_cli_server_request request;
unsigned int content_sender_initialized:1;
php_cli_server_content_sender content_sender;
php_cli_server_buffer capture_buffer;
unsigned int capturing:1;
int file_fd;
} php_cli_server_client;

Expand Down Expand Up @@ -425,17 +423,7 @@ static int sapi_cli_server_ub_write(const char *str, uint str_length TSRMLS_DC)
if (!client) {
return 0;
}
if (client->capturing) {
php_cli_server_chunk *chunk = php_cli_server_chunk_heap_new_self_contained(str_length);
if (!chunk) {
zend_bailout();
}
memmove(chunk->data.heap.p, str, str_length);
php_cli_server_buffer_append(&client->capture_buffer, chunk);
return str_length;
} else {
return php_cli_server_client_send_through(client, str, str_length);
}
return php_cli_server_client_send_through(client, str, str_length);
} /* }}} */

static void sapi_cli_server_flush(void *server_context) /* {{{ */
Expand Down Expand Up @@ -470,7 +458,7 @@ static int sapi_cli_server_send_headers(sapi_headers_struct *sapi_headers TSRMLS
sapi_header_struct *h;
zend_llist_position pos;

if (client == NULL || client->capturing || SG(request_info).no_headers) {
if (client == NULL || SG(request_info).no_headers) {
return SAPI_HEADER_SENT_SUCCESSFULLY;
}

Expand Down Expand Up @@ -1677,18 +1665,6 @@ static void destroy_request_info(sapi_request_info *request_info) /* {{{ */
{
} /* }}} */

static void php_cli_server_client_begin_capture(php_cli_server_client *client) /* {{{ */
{
php_cli_server_buffer_ctor(&client->capture_buffer);
client->capturing = 1;
} /* }}} */

static void php_cli_server_client_end_capture(php_cli_server_client *client) /* {{{ */
{
client->capturing = 0;
php_cli_server_buffer_dtor(&client->capture_buffer);
} /* }}} */

static int php_cli_server_client_ctor(php_cli_server_client *client, php_cli_server *server, int client_sock, struct sockaddr *addr, socklen_t addr_len TSRMLS_DC) /* {{{ */
{
client->server = server;
Expand All @@ -1713,7 +1689,6 @@ static int php_cli_server_client_ctor(php_cli_server_client *client, php_cli_ser
return FAILURE;
}
client->content_sender_initialized = 0;
client->capturing = 0;
client->file_fd = -1;
return SUCCESS;
} /* }}} */
Expand All @@ -1730,9 +1705,6 @@ static void php_cli_server_client_dtor(php_cli_server_client *client) /* {{{ */
if (client->content_sender_initialized) {
php_cli_server_content_sender_dtor(&client->content_sender);
}
if (client->capturing) {
php_cli_server_buffer_dtor(&client->capture_buffer);
}
} /* }}} */

static void php_cli_server_close_connection(php_cli_server *server, php_cli_server_client *client TSRMLS_DC) /* {{{ */
Expand Down