Mercurial > hg > nginx

changeset 8780:557dc6a06ba6 quic

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
HTTP/3: fixed server push after 9ec3e71f8a61. When using server push, a segfault occured because ngx_http_v3_create_push_request() accessed ngx_http_v3_session_t object the old way. Prior to 9ec3e71f8a61, HTTP/3 session was stored directly in c->data. Now it's referenced by the v3_session field of ngx_http_connection_t.
author Roman Arutyunyan <arut@nginx.com>
date Tue, 18 May 2021 18:17:25 +0300
parents f52a2b77d406
children 81d491f0dc8c
files src/http/v3/ngx_http_v3_filter_module.c
diffstat 1 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/http/v3/ngx_http_v3_filter_module.c
+++ b/src/http/v3/ngx_http_v3_filter_module.c
@@ -837,8 +837,7 @@ ngx_http_v3_create_push_request(ngx_http
     ngx_connection_t          *c, *pc;
     ngx_http_request_t        *r;
     ngx_http_log_ctx_t        *ctx;
-    ngx_http_connection_t     *hc;
-    ngx_http_v3_session_t     *h3c;
+    ngx_http_connection_t     *hc, *phc;
     ngx_http_core_srv_conf_t  *cscf;
 
     pc = pr->connection;
@@ -858,8 +857,8 @@ ngx_http_v3_create_push_request(ngx_http
         goto failed;
     }
 
-    h3c = ngx_http_v3_get_session(c);
-    ngx_memcpy(hc, h3c, sizeof(ngx_http_connection_t));
+    phc = ngx_http_quic_get_connection(pc);
+    ngx_memcpy(hc, phc, sizeof(ngx_http_connection_t));
     c->data = hc;
 
     ctx = ngx_palloc(c->pool, sizeof(ngx_http_log_ctx_t));