diff src/http/v3/ngx_http_v3_tables.c @ 8492:65c1fc5fae15 quic

HTTP/3: renamed server configuration variables from v3cf to h3scf. Now they are similar to HTTP/2 where they are called h2scf.
author Roman Arutyunyan <arut@nginx.com>
date Thu, 23 Jul 2020 13:12:01 +0300
parents 72f9ff4e0a88
children 279ad36f2f4b
line wrap: on
line diff
--- a/src/http/v3/ngx_http_v3_tables.c
+++ b/src/http/v3/ngx_http_v3_tables.c
@@ -243,7 +243,7 @@ ngx_http_v3_set_capacity(ngx_connection_
     ngx_connection_t              *pc;
     ngx_pool_cleanup_t            *cln;
     ngx_http_v3_header_t         **elts;
-    ngx_http_v3_srv_conf_t        *v3cf;
+    ngx_http_v3_srv_conf_t        *h3scf;
     ngx_http_v3_connection_t      *h3c;
     ngx_http_v3_dynamic_table_t   *dt;
 
@@ -252,9 +252,9 @@ ngx_http_v3_set_capacity(ngx_connection_
 
     pc = c->qs->parent;
     h3c = pc->data;
-    v3cf = ngx_http_get_module_srv_conf(h3c->hc.conf_ctx, ngx_http_v3_module);
+    h3scf = ngx_http_get_module_srv_conf(h3c->hc.conf_ctx, ngx_http_v3_module);
 
-    if (capacity > v3cf->max_table_capacity) {
+    if (capacity > h3scf->max_table_capacity) {
         ngx_log_error(NGX_LOG_INFO, c->log, 0,
                       "client exceeded http3_max_table_capacity limit");
         return NGX_HTTP_V3_ERR_ENCODER_STREAM_ERROR;
@@ -496,7 +496,7 @@ ngx_http_v3_decode_insert_count(ngx_conn
 {
     ngx_uint_t                    max_entries, full_range, max_value,
                                   max_wrapped, req_insert_count;
-    ngx_http_v3_srv_conf_t       *v3cf;
+    ngx_http_v3_srv_conf_t       *h3scf;
     ngx_http_v3_connection_t     *h3c;
     ngx_http_v3_dynamic_table_t  *dt;
 
@@ -509,9 +509,9 @@ ngx_http_v3_decode_insert_count(ngx_conn
     h3c = c->qs->parent->data;
     dt = &h3c->table;
 
-    v3cf = ngx_http_get_module_srv_conf(h3c->hc.conf_ctx, ngx_http_v3_module);
+    h3scf = ngx_http_get_module_srv_conf(h3c->hc.conf_ctx, ngx_http_v3_module);
 
-    max_entries = v3cf->max_table_capacity / 32;
+    max_entries = h3scf->max_table_capacity / 32;
     full_range = 2 * max_entries;
 
     if (*insert_count > full_range) {
@@ -551,7 +551,7 @@ ngx_http_v3_check_insert_count(ngx_conne
     ngx_connection_t             *pc;
     ngx_pool_cleanup_t           *cln;
     ngx_http_v3_block_t          *block;
-    ngx_http_v3_srv_conf_t       *v3cf;
+    ngx_http_v3_srv_conf_t       *h3scf;
     ngx_http_v3_connection_t     *h3c;
     ngx_http_v3_dynamic_table_t  *dt;
 
@@ -595,10 +595,10 @@ ngx_http_v3_check_insert_count(ngx_conne
     }
 
     if (block->queue.prev == NULL) {
-        v3cf = ngx_http_get_module_srv_conf(h3c->hc.conf_ctx,
-                                            ngx_http_v3_module);
+        h3scf = ngx_http_get_module_srv_conf(h3c->hc.conf_ctx,
+                                             ngx_http_v3_module);
 
-        if (h3c->nblocked == v3cf->max_blocked_streams) {
+        if (h3c->nblocked == h3scf->max_blocked_streams) {
             ngx_log_error(NGX_LOG_INFO, c->log, 0,
                           "client exceeded http3_max_blocked_streams limit");
             return NGX_HTTP_V3_ERR_DECOMPRESSION_FAILED;