# HG changeset patch # User Roman Arutyunyan # Date 1593767105 -10800 # Node ID 5611bbb852ce54e52172b43d3b90e7b5d2b6185b # Parent fdb8edc8e496db7ad744c26252691e4839652ac5 HTTP/3: simplifed handling ngx_http_v3_parse_literal() return code. 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 @@ -624,17 +624,12 @@ ngx_http_v3_parse_header_lri(ngx_connect case sw_value: rc = ngx_http_v3_parse_literal(c, &st->literal, ch); - - if (rc == NGX_DONE) { - st->value = st->literal.value; - goto done; - } - - if (rc != NGX_AGAIN) { + if (rc != NGX_DONE) { return rc; } - break; + st->value = st->literal.value; + goto done; } return NGX_AGAIN; @@ -703,17 +698,12 @@ ngx_http_v3_parse_header_l(ngx_connectio case sw_name: rc = ngx_http_v3_parse_literal(c, &st->literal, ch); - - if (rc == NGX_DONE) { - st->name = st->literal.value; - st->state = sw_value_len; - break; - } - - if (rc != NGX_AGAIN) { + if (rc != NGX_DONE) { return rc; } + st->name = st->literal.value; + st->state = sw_value_len; break; case sw_value_len: @@ -741,17 +731,12 @@ ngx_http_v3_parse_header_l(ngx_connectio case sw_value: rc = ngx_http_v3_parse_literal(c, &st->literal, ch); - - if (rc == NGX_DONE) { - st->value = st->literal.value; - goto done; - } - - if (rc != NGX_AGAIN) { + if (rc != NGX_DONE) { return rc; } - break; + st->value = st->literal.value; + goto done; } return NGX_AGAIN; @@ -876,17 +861,12 @@ ngx_http_v3_parse_header_lpbi(ngx_connec case sw_value: rc = ngx_http_v3_parse_literal(c, &st->literal, ch); - - if (rc == NGX_DONE) { - st->value = st->literal.value; - goto done; - } - - if (rc != NGX_AGAIN) { + if (rc != NGX_DONE) { return rc; } - break; + st->value = st->literal.value; + goto done; } return NGX_AGAIN; @@ -1306,17 +1286,12 @@ ngx_http_v3_parse_header_inr(ngx_connect case sw_value: rc = ngx_http_v3_parse_literal(c, &st->literal, ch); - - if (rc == NGX_DONE) { - st->value = st->literal.value; - goto done; - } - - if (rc != NGX_AGAIN) { + if (rc != NGX_DONE) { return rc; } - break; + st->value = st->literal.value; + goto done; } return NGX_AGAIN; @@ -1382,17 +1357,12 @@ ngx_http_v3_parse_header_iwnr(ngx_connec case sw_name: rc = ngx_http_v3_parse_literal(c, &st->literal, ch); - - if (rc == NGX_DONE) { - st->name = st->literal.value; - st->state = sw_value_len; - break; - } - - if (rc != NGX_AGAIN) { + if (rc != NGX_DONE) { return rc; } + st->name = st->literal.value; + st->state = sw_value_len; break; case sw_value_len: @@ -1420,17 +1390,12 @@ ngx_http_v3_parse_header_iwnr(ngx_connec case sw_value: rc = ngx_http_v3_parse_literal(c, &st->literal, ch); - - if (rc == NGX_DONE) { - st->value = st->literal.value; - goto done; - } - - if (rc != NGX_AGAIN) { + if (rc != NGX_DONE) { return rc; } - break; + st->value = st->literal.value; + goto done; } return NGX_AGAIN;