Mailing List Archive

Author: rjung
Date: Thu Apr 4 22:20:31 2024
New Revision: 1916807

URL: http://svn.apache.org/viewvc?rev=1916807&view=rev
Log:
Fix failing pytest modules/http2/test_712_buffering.py:48.

Do not count lines like "00:12:26.578220 <= Recv data, 0 bytes (0x0)"
(which happen before the final close) as receiving a real chunk.

Backport of r1918606 from trunk.

Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/test/pyhttpd/curl.py

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1916806

Modified: httpd/httpd/branches/2.4.x/test/pyhttpd/curl.py
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/test/pyhttpd/curl.py?rev=1916807&r1=1916806&r2=1916807&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/test/pyhttpd/curl.py (original)
+++ httpd/httpd/branches/2.4.x/test/pyhttpd/curl.py Thu Apr 4 22:20:31 2024
@@ -112,7 +112,7 @@ class CurlPiper:
recv_times = []
for line in "".join(recv_err).split('\n'):
m = re.match(r'^\s*(\d+:\d+:\d+(\.\d+)?) <= Recv data, (\d+) bytes.*', line)
- if m:
+ if m and int(m.group(3)) > 0:
recv_times.append(datetime.time.fromisoformat(m.group(1)))
# received as many chunks as we sent
assert len(chunks) == len(recv_times), "received response not in {0} chunks, but {1}".format(