ignatenkobrain / rpms / nginx

Forked from rpms/nginx 2 years ago
Clone
67ea12
diff --git a/src/http/v2/ngx_http_v2.c b/src/http/v2/ngx_http_v2.c
67ea12
index 3b7f892..0aaea47 100644
67ea12
--- a/src/http/v2/ngx_http_v2.c
67ea12
+++ b/src/http/v2/ngx_http_v2.c
67ea12
@@ -275,6 +275,7 @@ ngx_http_v2_init(ngx_event_t *rev)
67ea12
     h2scf = ngx_http_get_module_srv_conf(hc->conf_ctx, ngx_http_v2_module);
67ea12
 
67ea12
     h2c->concurrent_pushes = h2scf->concurrent_pushes;
67ea12
+    h2c->priority_limit = h2scf->concurrent_streams;
67ea12
 
67ea12
     h2c->pool = ngx_create_pool(h2scf->pool_size, h2c->connection->log);
67ea12
     if (h2c->pool == NULL) {
67ea12
@@ -1798,6 +1799,13 @@ ngx_http_v2_state_priority(ngx_http_v2_connection_t *h2c, u_char *pos,
67ea12
         return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_SIZE_ERROR);
67ea12
     }
67ea12
 
67ea12
+    if (--h2c->priority_limit == 0) {
67ea12
+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
67ea12
+                      "client sent too many PRIORITY frames");
67ea12
+
67ea12
+        return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_ENHANCE_YOUR_CALM);
67ea12
+    }
67ea12
+
67ea12
     if (end - pos < NGX_HTTP_V2_PRIORITY_SIZE) {
67ea12
         return ngx_http_v2_state_save(h2c, pos, end,
67ea12
                                       ngx_http_v2_state_priority);
67ea12
@@ -3112,6 +3120,8 @@ ngx_http_v2_create_stream(ngx_http_v2_connection_t *h2c, ngx_uint_t push)
67ea12
         h2c->processing++;
67ea12
     }
67ea12
 
67ea12
+    h2c->priority_limit += h2scf->concurrent_streams;
67ea12
+
67ea12
     return stream;
67ea12
 }
67ea12
 
67ea12
diff --git a/src/http/v2/ngx_http_v2.h b/src/http/v2/ngx_http_v2.h
67ea12
index 715b7d3..69d55d1 100644
67ea12
--- a/src/http/v2/ngx_http_v2.h
67ea12
+++ b/src/http/v2/ngx_http_v2.h
67ea12
@@ -122,6 +122,7 @@ struct ngx_http_v2_connection_s {
67ea12
     ngx_uint_t                       processing;
67ea12
     ngx_uint_t                       frames;
67ea12
     ngx_uint_t                       idle;
67ea12
+    ngx_uint_t                       priority_limit;
67ea12
 
67ea12
     ngx_uint_t                       pushing;
67ea12
     ngx_uint_t                       concurrent_pushes;