mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-08 02:02:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

HTTP/2: deduplicated some code in ngx_http_v2_state_headers().

Browse Source 
No functional changes.
This commit is contained in:
Valentin Bartenev 2016-04-14 15:14:15 +03:00
parent 4c1b9fef65
commit 60f0960ab6
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/http/v2/ngx_http_v2.c
View File

@ -948,6 +948,7 @@ ngx_http_v2_state_headers(ngx_http_v2_connection_t *h2c, u_char *pos,
{ {
size_t size; size_t size;
ngx_uint_t padded, priority, depend, dependency, excl, weight; ngx_uint_t padded, priority, depend, dependency, excl, weight;
ngx_uint_t status;
ngx_http_v2_node_t *node; ngx_http_v2_node_t *node;
ngx_http_v2_stream_t *stream; ngx_http_v2_stream_t *stream;
ngx_http_v2_srv_conf_t *h2scf; ngx_http_v2_srv_conf_t *h2scf;
@ -1040,15 +1041,8 @@ ngx_http_v2_state_headers(ngx_http_v2_connection_t *h2c, u_char *pos,
"client sent HEADERS frame for stream %ui " "client sent HEADERS frame for stream %ui "
"with incorrect dependency", h2c->state.sid); "with incorrect dependency", h2c->state.sid);
if (ngx_http_v2_send_rst_stream(h2c, h2c->state.sid, status = NGX_HTTP_V2_PROTOCOL_ERROR;
NGX_HTTP_V2_PROTOCOL_ERROR) goto rst_stream;
!= NGX_OK)
{
return ngx_http_v2_connection_error(h2c,
NGX_HTTP_V2_INTERNAL_ERROR);
}
return ngx_http_v2_state_header_block(h2c, pos, end);
} }
h2scf = ngx_http_get_module_srv_conf(h2c->http_connection->conf_ctx, h2scf = ngx_http_get_module_srv_conf(h2c->http_connection->conf_ctx,
@ -1060,15 +1054,8 @@ ngx_http_v2_state_headers(ngx_http_v2_connection_t *h2c, u_char *pos,
ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0, ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
"concurrent streams exceeded %ui", h2c->processing); "concurrent streams exceeded %ui", h2c->processing);
if (ngx_http_v2_send_rst_stream(h2c, h2c->state.sid, status = NGX_HTTP_V2_REFUSED_STREAM;
NGX_HTTP_V2_REFUSED_STREAM) goto rst_stream;
!= NGX_OK)
{
return ngx_http_v2_connection_error(h2c,
NGX_HTTP_V2_INTERNAL_ERROR);
}
return ngx_http_v2_state_header_block(h2c, pos, end);
} }
node = ngx_http_v2_get_node_by_id(h2c, h2c->state.sid, 1); node = ngx_http_v2_get_node_by_id(h2c, h2c->state.sid, 1);
@ -1104,6 +1091,14 @@ ngx_http_v2_state_headers(ngx_http_v2_connection_t *h2c, u_char *pos,
ngx_http_v2_set_dependency(h2c, node, depend, excl); ngx_http_v2_set_dependency(h2c, node, depend, excl);
} }
return ngx_http_v2_state_header_block(h2c, pos, end);
rst_stream:
if (ngx_http_v2_send_rst_stream(h2c, h2c->state.sid, status) != NGX_OK) {
return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_INTERNAL_ERROR);
}
return ngx_http_v2_state_header_block(h2c, pos, end); return ngx_http_v2_state_header_block(h2c, pos, end);
} }