Skip to content

Commit

Permalink
Merge r1909989 from trunk:
Browse files Browse the repository at this point in the history
  *) mod_proxy_http2: fix retry handling to not leak temporary errors.
     On detecting that that an existing connection was shutdown by the other
     side, a 503 response leaked even though the request was retried on a
     fresh connection.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1909992 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
icing committed May 22, 2023
1 parent 6907dee commit bf1556e
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 33 deletions.
5 changes: 5 additions & 0 deletions changes-entries/proxy_http2_retries.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
*) mod_proxy_http2: fix retry handling to not leak temporary errors.
On detecting that that an existing connection was shutdown by the other
side, a 503 response leaked even though the request was retried on a
fresh connection.
[Stefan Eissing]
9 changes: 3 additions & 6 deletions modules/http2/h2_proxy_session.c
Original file line number Diff line number Diff line change
Expand Up @@ -1375,12 +1375,9 @@ static void ev_stream_done(h2_proxy_session *session, int stream_id,
session->id, stream_id, touched, stream->error_code);

if (status != APR_SUCCESS) {
b = ap_bucket_error_create(HTTP_SERVICE_UNAVAILABLE, NULL, stream->r->pool,
stream->r->connection->bucket_alloc);
APR_BRIGADE_INSERT_TAIL(stream->output, b);
b = apr_bucket_eos_create(stream->r->connection->bucket_alloc);
APR_BRIGADE_INSERT_TAIL(stream->output, b);
ap_pass_brigade(stream->r->output_filters, stream->output);
/* stream failed, error reporting is done by caller
* of proxy_session, e.g. mod_proxy_http2 which also
* decides about retries. */
}
else if (!stream->data_received) {
/* if the response had no body, this is the time to flush
Expand Down
11 changes: 2 additions & 9 deletions test/modules/http2/test_003_get.py
Original file line number Diff line number Diff line change
Expand Up @@ -197,11 +197,7 @@ def test_h2_003_41(self, env, n):
def test_h2_003_50(self, env, path, repeat):
# check that the resource supports ranges and we see its raw content-length
url = env.mkurl("https", "test1", path)
# TODO: sometimes we see a 503 here from h2proxy
for i in range(10):
r = env.curl_get(url, 5)
if r.response["status"] != 503:
break
r = env.curl_get(url, 5)
assert r.response["status"] == 200
assert "HTTP/2" == r.response["protocol"]
h = r.response["header"]
Expand All @@ -210,10 +206,7 @@ def test_h2_003_50(self, env, path, repeat):
assert "content-length" in h
clen = h["content-length"]
# get the first 1024 bytes of the resource, 206 status, but content-length as original
for i in range(10):
r = env.curl_get(url, 5, options=["-H", "range: bytes=0-1023"])
if r.response["status"] != 503:
break
r = env.curl_get(url, 5, options=["-H", "range: bytes=0-1023"])
assert 206 == r.response["status"]
assert "HTTP/2" == r.response["protocol"]
assert 1024 == len(r.response["body"])
Expand Down
42 changes: 24 additions & 18 deletions test/modules/http2/test_104_padding.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,57 +13,63 @@ class TestPadding:

@pytest.fixture(autouse=True, scope='class')
def _class_scope(self, env):
def add_echo_handler(conf):
conf.add([
"<Location \"/h2test/echo\">",
" SetHandler h2test-echo",
"</Location>",
])

conf = H2Conf(env)
conf.start_vhost(domains=[f"ssl.{env.http_tld}"], port=env.https_port, doc_root="htdocs/cgi")
conf.add("AddHandler cgi-script .py")
add_echo_handler(conf)
conf.end_vhost()
conf.start_vhost(domains=[f"pad0.{env.http_tld}"], port=env.https_port, doc_root="htdocs/cgi")
conf.add("H2Padding 0")
conf.add("AddHandler cgi-script .py")
add_echo_handler(conf)
conf.end_vhost()
conf.start_vhost(domains=[f"pad1.{env.http_tld}"], port=env.https_port, doc_root="htdocs/cgi")
conf.add("H2Padding 1")
conf.add("AddHandler cgi-script .py")
add_echo_handler(conf)
conf.end_vhost()
conf.start_vhost(domains=[f"pad2.{env.http_tld}"], port=env.https_port, doc_root="htdocs/cgi")
conf.add("H2Padding 2")
conf.add("AddHandler cgi-script .py")
add_echo_handler(conf)
conf.end_vhost()
conf.start_vhost(domains=[f"pad3.{env.http_tld}"], port=env.https_port, doc_root="htdocs/cgi")
conf.add("H2Padding 3")
conf.add("AddHandler cgi-script .py")
add_echo_handler(conf)
conf.end_vhost()
conf.start_vhost(domains=[f"pad8.{env.http_tld}"], port=env.https_port, doc_root="htdocs/cgi")
conf.add("H2Padding 8")
conf.add("AddHandler cgi-script .py")
add_echo_handler(conf)
conf.end_vhost()
conf.install()
assert env.apache_restart() == 0

# default paddings settings: 0 bits
def test_h2_104_01(self, env):
url = env.mkurl("https", "ssl", "/echo.py")
def test_h2_104_01(self, env, repeat):
url = env.mkurl("https", "ssl", "/h2test/echo")
# we get 2 frames back: one with data and an empty one with EOF
# check the number of padding bytes is as expected
for data in ["x", "xx", "xxx", "xxxx", "xxxxx", "xxxxxx", "xxxxxxx", "xxxxxxxx"]:
r = env.nghttp().post_data(url, data, 5)
assert r.response["status"] == 200
assert r.results["paddings"] == [
frame_padding(len(data)+1, 0),
frame_padding(0, 0)
]
for i in r.results["paddings"]:
assert i == frame_padding(len(data)+1, 0)

# 0 bits of padding
def test_h2_104_02(self, env):
url = env.mkurl("https", "pad0", "/echo.py")
url = env.mkurl("https", "pad0", "/h2test/echo")
for data in ["x", "xx", "xxx", "xxxx", "xxxxx", "xxxxxx", "xxxxxxx", "xxxxxxxx"]:
r = env.nghttp().post_data(url, data, 5)
assert r.response["status"] == 200
assert r.results["paddings"] == [0, 0]
for i in r.results["paddings"]:
assert i == 0

# 1 bit of padding
def test_h2_104_03(self, env):
url = env.mkurl("https", "pad1", "/echo.py")
url = env.mkurl("https", "pad1", "/h2test/echo")
for data in ["x", "xx", "xxx", "xxxx", "xxxxx", "xxxxxx", "xxxxxxx", "xxxxxxxx"]:
r = env.nghttp().post_data(url, data, 5)
assert r.response["status"] == 200
Expand All @@ -72,7 +78,7 @@ def test_h2_104_03(self, env):

# 2 bits of padding
def test_h2_104_04(self, env):
url = env.mkurl("https", "pad2", "/echo.py")
url = env.mkurl("https", "pad2", "/h2test/echo")
for data in ["x", "xx", "xxx", "xxxx", "xxxxx", "xxxxxx", "xxxxxxx", "xxxxxxxx"]:
r = env.nghttp().post_data(url, data, 5)
assert r.response["status"] == 200
Expand All @@ -81,7 +87,7 @@ def test_h2_104_04(self, env):

# 3 bits of padding
def test_h2_104_05(self, env):
url = env.mkurl("https", "pad3", "/echo.py")
url = env.mkurl("https", "pad3", "/h2test/echo")
for data in ["x", "xx", "xxx", "xxxx", "xxxxx", "xxxxxx", "xxxxxxx", "xxxxxxxx"]:
r = env.nghttp().post_data(url, data, 5)
assert r.response["status"] == 200
Expand All @@ -90,7 +96,7 @@ def test_h2_104_05(self, env):

# 8 bits of padding
def test_h2_104_06(self, env):
url = env.mkurl("https", "pad8", "/echo.py")
url = env.mkurl("https", "pad8", "/h2test/echo")
for data in ["x", "xx", "xxx", "xxxx", "xxxxx", "xxxxxx", "xxxxxxx", "xxxxxxxx"]:
r = env.nghttp().post_data(url, data, 5)
assert r.response["status"] == 200
Expand Down

0 comments on commit bf1556e

Please sign in to comment.