summaryrefslogtreecommitdiffhomepage
path: root/src/http/v3/ngx_http_v3.h
diff options
context:
space:
mode:
authorRoman Arutyunyan <arut@nginx.com>2023-09-14 14:13:43 +0400
committerRoman Arutyunyan <arut@nginx.com>2023-09-14 14:13:43 +0400
commit26e606a6bcdfa4001bfb6bd24612e8aafa6513b2 (patch)
tree0d9e251b38169d4c8b0aade70e5874cfedee9c29 /src/http/v3/ngx_http_v3.h
parent6ecf576e34c3780b6cdb3f509c89042aa411e3d2 (diff)
downloadnginx-26e606a6bcdfa4001bfb6bd24612e8aafa6513b2.tar.gz
nginx-26e606a6bcdfa4001bfb6bd24612e8aafa6513b2.tar.bz2
HTTP/3: postponed session creation to init() callback.
Now the session object is assigned to c->data while ngx_http_connection_t object is referenced by its http_connection field, similar to ngx_http_v2_connection_t and ngx_http_request_t. The change allows to eliminate v3_session field from ngx_http_connection_t. The field was under NGX_HTTP_V3 macro, which was a source of binary compatibility problems when nginx/module is build with/without HTTP/3 support. Postponing is essential since c->data should retain the reference to ngx_http_connection_t object throughout QUIC handshake, because SSL callbacks ngx_http_ssl_servername() and ngx_http_ssl_alpn_select() rely on this.
Diffstat (limited to 'src/http/v3/ngx_http_v3.h')
-rw-r--r--src/http/v3/ngx_http_v3.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/http/v3/ngx_http_v3.h b/src/http/v3/ngx_http_v3.h
index 94b0d3e78..9dcb5e6a7 100644
--- a/src/http/v3/ngx_http_v3.h
+++ b/src/http/v3/ngx_http_v3.h
@@ -78,11 +78,12 @@
#define NGX_HTTP_V3_ERR_DECODER_STREAM_ERROR 0x202
-#define ngx_http_quic_get_connection(c) \
- ((ngx_http_connection_t *) ((c)->quic ? (c)->quic->parent->data \
+#define ngx_http_v3_get_session(c) \
+ ((ngx_http_v3_session_t *) ((c)->quic ? (c)->quic->parent->data \
: (c)->data))
-#define ngx_http_v3_get_session(c) ngx_http_quic_get_connection(c)->v3_session
+#define ngx_http_quic_get_connection(c) \
+ (ngx_http_v3_get_session(c)->http_connection)
#define ngx_http_v3_get_module_loc_conf(c, module) \
ngx_http_get_module_loc_conf(ngx_http_quic_get_connection(c)->conf_ctx, \
@@ -120,6 +121,8 @@ struct ngx_http_v3_parse_s {
struct ngx_http_v3_session_s {
+ ngx_http_connection_t *http_connection;
+
ngx_http_v3_dynamic_table_t table;
ngx_event_t keepalive;