summaryrefslogtreecommitdiffhomepage
path: root/src/http/v3
diff options
context:
space:
mode:
Diffstat (limited to 'src/http/v3')
-rw-r--r--src/http/v3/ngx_http_v3.h6
-rw-r--r--src/http/v3/ngx_http_v3_parse.c2
-rw-r--r--src/http/v3/ngx_http_v3_request.c6
-rw-r--r--src/http/v3/ngx_http_v3_streams.c18
-rw-r--r--src/http/v3/ngx_http_v3_tables.c16
5 files changed, 24 insertions, 24 deletions
diff --git a/src/http/v3/ngx_http_v3.h b/src/http/v3/ngx_http_v3.h
index c244ab861..949fc2206 100644
--- a/src/http/v3/ngx_http_v3.h
+++ b/src/http/v3/ngx_http_v3.h
@@ -77,11 +77,11 @@
#define ngx_http_v3_get_module_srv_conf(c, module) \
ngx_http_get_module_srv_conf( \
- ((ngx_http_v3_connection_t *) c->qs->parent->data)->hc.conf_ctx, \
- module)
+ ((ngx_http_v3_connection_t *) c->quic->parent->data)->hc.conf_ctx, \
+ module)
#define ngx_http_v3_finalize_connection(c, code, reason) \
- ngx_quic_finalize_connection(c->qs->parent, code, reason)
+ ngx_quic_finalize_connection(c->quic->parent, code, reason)
typedef struct {
diff --git a/src/http/v3/ngx_http_v3_parse.c b/src/http/v3/ngx_http_v3_parse.c
index 6ce5f10a7..d5ff3cb8f 100644
--- a/src/http/v3/ngx_http_v3_parse.c
+++ b/src/http/v3/ngx_http_v3_parse.c
@@ -279,7 +279,7 @@ done:
ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http3 parse headers done");
if (st->prefix.insert_count > 0) {
- if (ngx_http_v3_client_ack_header(c, c->qs->id) != NGX_OK) {
+ if (ngx_http_v3_client_ack_header(c, c->quic->id) != NGX_OK) {
return NGX_ERROR;
}
}
diff --git a/src/http/v3/ngx_http_v3_request.c b/src/http/v3/ngx_http_v3_request.c
index d9f4c9d55..5511e3031 100644
--- a/src/http/v3/ngx_http_v3_request.c
+++ b/src/http/v3/ngx_http_v3_request.c
@@ -469,7 +469,7 @@ ngx_http_v3_create_header(ngx_http_request_t *r)
out = NULL;
ll = &out;
- if ((c->qs->id & NGX_QUIC_STREAM_UNIDIRECTIONAL) == 0
+ if ((c->quic->id & NGX_QUIC_STREAM_UNIDIRECTIONAL) == 0
&& r->method != NGX_HTTP_HEAD)
{
if (ngx_http_v3_push_resources(r, &ll) != NGX_OK) {
@@ -1123,7 +1123,7 @@ ngx_http_v3_push_resource(ngx_http_request_t *r, ngx_str_t *path,
ngx_http_v3_connection_t *h3c;
c = r->connection;
- h3c = c->qs->parent->data;
+ h3c = c->quic->parent->data;
h3scf = ngx_http_get_module_srv_conf(r, ngx_http_v3_module);
ngx_log_debug5(NGX_LOG_DEBUG_HTTP, c->log, 0,
@@ -1196,7 +1196,7 @@ ngx_http_v3_create_push_request(ngx_http_request_t *pr, ngx_str_t *path,
goto failed;
}
- h3c = c->qs->parent->data;
+ h3c = c->quic->parent->data;
ngx_memcpy(hc, h3c, sizeof(ngx_http_connection_t));
c->data = hc;
diff --git a/src/http/v3/ngx_http_v3_streams.c b/src/http/v3/ngx_http_v3_streams.c
index 8d5147f4d..8ac048715 100644
--- a/src/http/v3/ngx_http_v3_streams.c
+++ b/src/http/v3/ngx_http_v3_streams.c
@@ -50,7 +50,7 @@ ngx_http_v3_init_connection(ngx_connection_t *c)
hc = c->data;
- if (c->qs == NULL) {
+ if (c->quic == NULL) {
h3c = ngx_pcalloc(c->pool, sizeof(ngx_http_v3_connection_t));
if (h3c == NULL) {
return NGX_ERROR;
@@ -69,7 +69,7 @@ ngx_http_v3_init_connection(ngx_connection_t *c)
return NGX_ERROR;
}
- if ((c->qs->id & NGX_QUIC_STREAM_UNIDIRECTIONAL) == 0) {
+ if ((c->quic->id & NGX_QUIC_STREAM_UNIDIRECTIONAL) == 0) {
return NGX_OK;
}
@@ -101,7 +101,7 @@ ngx_http_v3_close_uni_stream(ngx_connection_t *c)
ngx_http_v3_uni_stream_t *us;
us = c->data;
- h3c = c->qs->parent->data;
+ h3c = c->quic->parent->data;
ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http3 close stream");
@@ -131,7 +131,7 @@ ngx_http_v3_read_uni_stream_type(ngx_event_t *rev)
c = rev->data;
us = c->data;
- h3c = c->qs->parent->data;
+ h3c = c->quic->parent->data;
ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "http3 read stream type");
@@ -363,7 +363,7 @@ ngx_http_v3_create_push_stream(ngx_connection_t *c, uint64_t push_id)
goto failed;
}
- h3c = c->qs->parent->data;
+ h3c = c->quic->parent->data;
h3c->npushing++;
cln->handler = ngx_http_v3_push_cleanup;
@@ -419,7 +419,7 @@ ngx_http_v3_get_uni_stream(ngx_connection_t *c, ngx_uint_t type)
index = -1;
}
- h3c = c->qs->parent->data;
+ h3c = c->quic->parent->data;
if (index >= 0) {
if (h3c->known_streams[index]) {
@@ -476,7 +476,7 @@ ngx_http_v3_send_settings(ngx_connection_t *c)
ngx_http_v3_srv_conf_t *h3scf;
ngx_http_v3_connection_t *h3c;
- h3c = c->qs->parent->data;
+ h3c = c->quic->parent->data;
if (h3c->settings_sent) {
return NGX_OK;
@@ -763,7 +763,7 @@ ngx_http_v3_set_max_push_id(ngx_connection_t *c, uint64_t max_push_id)
{
ngx_http_v3_connection_t *h3c;
- h3c = c->qs->parent->data;
+ h3c = c->quic->parent->data;
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
"http3 MAX_PUSH_ID:%uL", max_push_id);
@@ -786,7 +786,7 @@ ngx_http_v3_cancel_push(ngx_connection_t *c, uint64_t push_id)
ngx_http_v3_push_t *push;
ngx_http_v3_connection_t *h3c;
- h3c = c->qs->parent->data;
+ h3c = c->quic->parent->data;
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
"http3 CANCEL_PUSH:%uL", push_id);
diff --git a/src/http/v3/ngx_http_v3_tables.c b/src/http/v3/ngx_http_v3_tables.c
index bf4f1449c..5389d0e2f 100644
--- a/src/http/v3/ngx_http_v3_tables.c
+++ b/src/http/v3/ngx_http_v3_tables.c
@@ -198,7 +198,7 @@ ngx_http_v3_insert(ngx_connection_t *c, ngx_str_t *name, ngx_str_t *value)
return NGX_HTTP_V3_ERR_ENCODER_STREAM_ERROR;
}
- h3c = c->qs->parent->data;
+ h3c = c->quic->parent->data;
dt = &h3c->table;
ngx_log_debug4(NGX_LOG_DEBUG_HTTP, c->log, 0,
@@ -250,7 +250,7 @@ ngx_http_v3_set_capacity(ngx_connection_t *c, ngx_uint_t capacity)
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
"http3 set capacity %ui", capacity);
- pc = c->qs->parent;
+ pc = c->quic->parent;
h3c = pc->data;
h3scf = ngx_http_get_module_srv_conf(h3c->hc.conf_ctx, ngx_http_v3_module);
@@ -324,7 +324,7 @@ ngx_http_v3_evict(ngx_connection_t *c, size_t need)
ngx_http_v3_connection_t *h3c;
ngx_http_v3_dynamic_table_t *dt;
- h3c = c->qs->parent->data;
+ h3c = c->quic->parent->data;
dt = &h3c->table;
if (need > dt->capacity) {
@@ -367,7 +367,7 @@ ngx_http_v3_duplicate(ngx_connection_t *c, ngx_uint_t index)
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, "http3 duplicate %ui", index);
- h3c = c->qs->parent->data;
+ h3c = c->quic->parent->data;
dt = &h3c->table;
if (dt->base + dt->nelts <= index) {
@@ -463,7 +463,7 @@ ngx_http_v3_lookup(ngx_connection_t *c, ngx_uint_t index, ngx_str_t *name,
ngx_http_v3_connection_t *h3c;
ngx_http_v3_dynamic_table_t *dt;
- h3c = c->qs->parent->data;
+ h3c = c->quic->parent->data;
dt = &h3c->table;
if (index < dt->base || index - dt->base >= dt->nelts) {
@@ -506,7 +506,7 @@ ngx_http_v3_decode_insert_count(ngx_connection_t *c, ngx_uint_t *insert_count)
return NGX_OK;
}
- h3c = c->qs->parent->data;
+ h3c = c->quic->parent->data;
dt = &h3c->table;
h3scf = ngx_http_get_module_srv_conf(h3c->hc.conf_ctx, ngx_http_v3_module);
@@ -555,7 +555,7 @@ ngx_http_v3_check_insert_count(ngx_connection_t *c, ngx_uint_t insert_count)
ngx_http_v3_connection_t *h3c;
ngx_http_v3_dynamic_table_t *dt;
- pc = c->qs->parent;
+ pc = c->quic->parent;
h3c = pc->data;
dt = &h3c->table;
@@ -636,7 +636,7 @@ ngx_http_v3_new_header(ngx_connection_t *c)
ngx_http_v3_block_t *block;
ngx_http_v3_connection_t *h3c;
- h3c = c->qs->parent->data;
+ h3c = c->quic->parent->data;
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
"http3 new dynamic header, blocked:%ui", h3c->nblocked);