Mercurial > hg > nginx
changeset 8856:6a383020d61e quic
HTTP/3: make ngx_http_log_error() static again.
This function was only referenced from ngx_http_v3_create_push_request() to
initialize push connection log. Now the log handler is copied from the parent
request connection.
The change reduces diff to the default branch.
| author | Roman Arutyunyan <arut@nginx.com> |
|---|---|
| date | Fri, 17 Sep 2021 16:32:23 +0300 |
| parents | 9ae239d2547d |
| children | 678d1c7a3003 |
| files | src/http/ngx_http.h src/http/ngx_http_request.c src/http/v3/ngx_http_v3_filter_module.c |
| diffstat | 3 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/ngx_http.h +++ b/src/http/ngx_http.h @@ -92,7 +92,6 @@ ngx_int_t ngx_http_add_listen(ngx_conf_t void ngx_http_init_connection(ngx_connection_t *c); void ngx_http_close_connection(ngx_connection_t *c); -u_char *ngx_http_log_error(ngx_log_t *log, u_char *buf, size_t len); #if (NGX_HTTP_SSL && defined SSL_CTRL_SET_TLSEXT_HOSTNAME) int ngx_http_ssl_servername(ngx_ssl_conn_t *ssl_conn, int *ad, void *arg);
--- a/src/http/ngx_http_request.c +++ b/src/http/ngx_http_request.c @@ -50,6 +50,7 @@ static void ngx_http_lingering_close_han static ngx_int_t ngx_http_post_action(ngx_http_request_t *r); static void ngx_http_log_request(ngx_http_request_t *r); +static u_char *ngx_http_log_error(ngx_log_t *log, u_char *buf, size_t len); static u_char *ngx_http_log_error_handler(ngx_http_request_t *r, ngx_http_request_t *sr, u_char *buf, size_t len); @@ -3829,7 +3830,7 @@ ngx_http_close_connection(ngx_connection } -u_char * +static u_char * ngx_http_log_error(ngx_log_t *log, u_char *buf, size_t len) { u_char *p;
--- a/src/http/v3/ngx_http_v3_filter_module.c +++ b/src/http/v3/ngx_http_v3_filter_module.c @@ -917,7 +917,7 @@ ngx_http_v3_create_push_request(ngx_http ctx->request = NULL; ctx->current_request = NULL; - c->log->handler = ngx_http_log_error; + c->log->handler = pc->log->handler; c->log->data = ctx; c->log->action = "processing pushed request headers";