archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

- Print HTTP method as well in the log.

Browse source 
- Print response code also when the request is processed by a script.
- Those changes partly closes #55109.
This commit is contained in:
Moriyoshi Koizumi 2011-07-19 17:47:34 +00:00
parent ecfc54c5e6
commit 29745da338
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
sapi/cli/php_cli_server.c
View file

@ -1479,7 +1479,7 @@ static void php_cli_server_client_dtor(php_cli_server_client *client) /* {{{ */
static void php_cli_server_close_connection(php_cli_server *server, php_cli_server_client *client TSRMLS_DC) /* {{{ */ static void php_cli_server_close_connection(php_cli_server *server, php_cli_server_client *client TSRMLS_DC) /* {{{ */
{ {
#ifdef DEBUG #ifdef DEBUG
php_cli_server_logf("%s: Closing" TSRMLS_CC, client->addr_str); php_cli_server_logf("%s Closing" TSRMLS_CC, client->addr_str);
#endif #endif
zend_hash_index_del(&server->clients, client->sock); zend_hash_index_del(&server->clients, client->sock);
} /* }}} */ } /* }}} */
@ -1575,7 +1575,7 @@ static int php_cli_server_send_error_page(php_cli_server *server, php_cli_server
php_cli_server_buffer_prepend(&client->content_sender.buffer, chunk); php_cli_server_buffer_prepend(&client->content_sender.buffer, chunk);
} }
php_cli_server_logf("%s: %s - Sending error page (%d)" TSRMLS_CC, client->addr_str, client->request.request_uri, status); php_cli_server_logf("%s %s %s - Sending error page (%d)" TSRMLS_CC, client->addr_str, php_http_method_str(client->request.request_method), client->request.request_uri, status);
php_cli_server_poller_add(&server->poller, POLLOUT, client->sock); php_cli_server_poller_add(&server->poller, POLLOUT, client->sock);
efree(escaped_request_uri); efree(escaped_request_uri);
return SUCCESS; return SUCCESS;
@ -1612,6 +1612,8 @@ static int php_cli_server_dispatch_script(php_cli_server *server, php_cli_server
} zend_end_try(); } zend_end_try();
} }
php_cli_server_logf("%s %s %s - Response sent successfully (%d)" TSRMLS_CC, client->addr_str, php_http_method_str(client->request.request_method), client->request.request_uri, SG(sapi_headers).http_response_code);
php_request_shutdown(0); php_request_shutdown(0);
php_cli_server_close_connection(server, client TSRMLS_CC); php_cli_server_close_connection(server, client TSRMLS_CC);
destroy_request_info(&SG(request_info)); destroy_request_info(&SG(request_info));
@ -1627,10 +1629,10 @@ static int php_cli_server_begin_send_static(php_cli_server *server, php_cli_serv
if (fd < 0) { if (fd < 0) {
char *errstr = get_last_error(); char *errstr = get_last_error();
if (errstr) { if (errstr) {
php_cli_server_logf("%s: %s - %s" TSRMLS_CC, client->addr_str, client->request.request_uri, errstr); php_cli_server_logf("%s %s %s - %s" TSRMLS_CC, client->addr_str, php_http_method_str(client->request.request_method), client->request.request_uri, errstr);
pefree(errstr, 1); pefree(errstr, 1);
} else { } else {
php_cli_server_logf("%s: %s - ?" TSRMLS_CC, client->addr_str, client->request.request_uri); php_cli_server_logf("%s %s %s - ?" TSRMLS_CC, client->addr_str, php_http_method_str(client->request.request_method), client->request.request_uri);
} }
return php_cli_server_send_error_page(server, client, 404 TSRMLS_CC); return php_cli_server_send_error_page(server, client, 404 TSRMLS_CC);
} }
@ -1880,12 +1882,12 @@ static int php_cli_server_recv_event_read_request(php_cli_server *server, php_cl
char *errstr = NULL; char *errstr = NULL;
int status = php_cli_server_client_read_request(client, &errstr TSRMLS_CC); int status = php_cli_server_client_read_request(client, &errstr TSRMLS_CC);
if (status < 0) { if (status < 0) {
php_cli_server_logf("%s: Invalid request (%s)" TSRMLS_CC, client->addr_str, errstr); php_cli_server_logf("%s Invalid request (%s)" TSRMLS_CC, client->addr_str, errstr);
efree(errstr); efree(errstr);
php_cli_server_close_connection(server, client TSRMLS_CC); php_cli_server_close_connection(server, client TSRMLS_CC);
return FAILURE; return FAILURE;
} else if (status == 1) { } else if (status == 1) {
php_cli_server_logf("%s: %s" TSRMLS_CC, client->addr_str, client->request.request_uri); php_cli_server_logf("%s %s %s - Request read" TSRMLS_CC, client->addr_str, php_http_method_str(client->request.request_method), client->request.request_uri);
php_cli_server_poller_remove(&server->poller, POLLIN, client->sock); php_cli_server_poller_remove(&server->poller, POLLIN, client->sock);
php_cli_server_dispatch(server, client TSRMLS_CC); php_cli_server_dispatch(server, client TSRMLS_CC);
} else { } else {
@ -1970,7 +1972,7 @@ static int php_cli_server_do_event_for_each_fd_callback(void *_params, int fd, i
return SUCCESS; return SUCCESS;
} }
#ifdef DEBUG #ifdef DEBUG
php_cli_server_logf("%s: Accepted" TSRMLS_CC, client->addr_str); php_cli_server_logf("%s Accepted" TSRMLS_CC, client->addr_str);
#endif #endif
zend_hash_index_update(&server->clients, client_sock, &client, sizeof(client), NULL); zend_hash_index_update(&server->clients, client_sock, &client, sizeof(client), NULL);
php_cli_server_recv_event_read_request(server, client TSRMLS_CC); php_cli_server_recv_event_read_request(server, client TSRMLS_CC);