# HG changeset patch # User Roman Arutyunyan # Date 1619548370 -10800 # Node ID 0981329169ea7821383e86c742e3bdc57a347258 # Parent 67f0eb150047cf0e66e234405ebcdabec8ccd921 HTTP/3: renamed ngx_http_v3_client_XXX() functions. The functions are renamed to ngx_http_v3_send_XXX() similar to ngx_http_v3_send_settings() and ngx_http_v3_send_goaway(). diff --git a/src/http/v3/ngx_http_v3.h b/src/http/v3/ngx_http_v3.h --- a/src/http/v3/ngx_http_v3.h +++ b/src/http/v3/ngx_http_v3.h @@ -195,18 +195,18 @@ ngx_int_t ngx_http_v3_set_max_push_id(ng uint64_t max_push_id); ngx_int_t ngx_http_v3_cancel_push(ngx_connection_t *c, uint64_t push_id); -ngx_int_t ngx_http_v3_client_ref_insert(ngx_connection_t *c, ngx_uint_t dynamic, +ngx_int_t ngx_http_v3_send_ref_insert(ngx_connection_t *c, ngx_uint_t dynamic, ngx_uint_t index, ngx_str_t *value); -ngx_int_t ngx_http_v3_client_insert(ngx_connection_t *c, ngx_str_t *name, +ngx_int_t ngx_http_v3_send_insert(ngx_connection_t *c, ngx_str_t *name, ngx_str_t *value); -ngx_int_t ngx_http_v3_client_set_capacity(ngx_connection_t *c, +ngx_int_t ngx_http_v3_send_set_capacity(ngx_connection_t *c, ngx_uint_t capacity); -ngx_int_t ngx_http_v3_client_duplicate(ngx_connection_t *c, ngx_uint_t index); -ngx_int_t ngx_http_v3_client_ack_header(ngx_connection_t *c, +ngx_int_t ngx_http_v3_send_duplicate(ngx_connection_t *c, ngx_uint_t index); +ngx_int_t ngx_http_v3_send_ack_header(ngx_connection_t *c, ngx_uint_t stream_id); -ngx_int_t ngx_http_v3_client_cancel_stream(ngx_connection_t *c, +ngx_int_t ngx_http_v3_send_cancel_stream(ngx_connection_t *c, ngx_uint_t stream_id); -ngx_int_t ngx_http_v3_client_inc_insert_count(ngx_connection_t *c, +ngx_int_t ngx_http_v3_send_inc_insert_count(ngx_connection_t *c, ngx_uint_t inc); diff --git a/src/http/v3/ngx_http_v3_parse.c b/src/http/v3/ngx_http_v3_parse.c --- a/src/http/v3/ngx_http_v3_parse.c +++ b/src/http/v3/ngx_http_v3_parse.c @@ -309,7 +309,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->quic->id) != NGX_OK) { + if (ngx_http_v3_send_ack_header(c, c->quic->id) != NGX_OK) { return NGX_ERROR; } } diff --git a/src/http/v3/ngx_http_v3_streams.c b/src/http/v3/ngx_http_v3_streams.c --- a/src/http/v3/ngx_http_v3_streams.c +++ b/src/http/v3/ngx_http_v3_streams.c @@ -597,7 +597,7 @@ failed: ngx_int_t -ngx_http_v3_client_ref_insert(ngx_connection_t *c, ngx_uint_t dynamic, +ngx_http_v3_send_ref_insert(ngx_connection_t *c, ngx_uint_t dynamic, ngx_uint_t index, ngx_str_t *value) { u_char *p, buf[NGX_HTTP_V3_PREFIX_INT_LEN * 2]; @@ -643,8 +643,7 @@ failed: ngx_int_t -ngx_http_v3_client_insert(ngx_connection_t *c, ngx_str_t *name, - ngx_str_t *value) +ngx_http_v3_send_insert(ngx_connection_t *c, ngx_str_t *name, ngx_str_t *value) { u_char buf[NGX_HTTP_V3_PREFIX_INT_LEN]; size_t n; @@ -693,7 +692,7 @@ failed: ngx_int_t -ngx_http_v3_client_set_capacity(ngx_connection_t *c, ngx_uint_t capacity) +ngx_http_v3_send_set_capacity(ngx_connection_t *c, ngx_uint_t capacity) { u_char buf[NGX_HTTP_V3_PREFIX_INT_LEN]; size_t n; @@ -720,7 +719,7 @@ ngx_http_v3_client_set_capacity(ngx_conn ngx_int_t -ngx_http_v3_client_duplicate(ngx_connection_t *c, ngx_uint_t index) +ngx_http_v3_send_duplicate(ngx_connection_t *c, ngx_uint_t index) { u_char buf[NGX_HTTP_V3_PREFIX_INT_LEN]; size_t n; @@ -747,7 +746,7 @@ ngx_http_v3_client_duplicate(ngx_connect ngx_int_t -ngx_http_v3_client_ack_header(ngx_connection_t *c, ngx_uint_t stream_id) +ngx_http_v3_send_ack_header(ngx_connection_t *c, ngx_uint_t stream_id) { u_char buf[NGX_HTTP_V3_PREFIX_INT_LEN]; size_t n; @@ -774,7 +773,7 @@ ngx_http_v3_client_ack_header(ngx_connec ngx_int_t -ngx_http_v3_client_cancel_stream(ngx_connection_t *c, ngx_uint_t stream_id) +ngx_http_v3_send_cancel_stream(ngx_connection_t *c, ngx_uint_t stream_id) { u_char buf[NGX_HTTP_V3_PREFIX_INT_LEN]; size_t n; @@ -801,7 +800,7 @@ ngx_http_v3_client_cancel_stream(ngx_con ngx_int_t -ngx_http_v3_client_inc_insert_count(ngx_connection_t *c, ngx_uint_t inc) +ngx_http_v3_send_inc_insert_count(ngx_connection_t *c, ngx_uint_t inc) { u_char buf[NGX_HTTP_V3_PREFIX_INT_LEN]; size_t n; diff --git a/src/http/v3/ngx_http_v3_tables.c b/src/http/v3/ngx_http_v3_tables.c --- a/src/http/v3/ngx_http_v3_tables.c +++ b/src/http/v3/ngx_http_v3_tables.c @@ -224,7 +224,7 @@ ngx_http_v3_insert(ngx_connection_t *c, /* TODO increment can be sent less often */ - if (ngx_http_v3_client_inc_insert_count(c, 1) != NGX_OK) { + if (ngx_http_v3_send_inc_insert_count(c, 1) != NGX_OK) { return NGX_ERROR; }