1berry/nginx
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HTTP/3: make ngx_http_log_error() static again.

Browse Source 
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.
This commit is contained in:
Roman Arutyunyan 2021-09-17 16:32:23 +03:00
parent 00bb4e4b8d
commit 0f3eb180d2
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/http/ngx_http.h
View File

@ -92,7 +92,6 @@ ngx_int_t ngx_http_add_listen(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
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);

3
src/http/ngx_http_request.c
View File

@ -50,6 +50,7 @@ static void ngx_http_lingering_close_handler(ngx_event_t *ev);
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_t *c)
}
u_char *
static u_char *
ngx_http_log_error(ngx_log_t *log, u_char *buf, size_t len)
{
u_char *p;

2
src/http/v3/ngx_http_v3_filter_module.c
View File

@ -917,7 +917,7 @@ ngx_http_v3_create_push_request(ngx_http_request_t *pr, ngx_str_t *path,
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";