Changeset 0a12ff8 in mod_gnutls

Timestamp:

Dec 22, 2016, 4:10:07 PM (6 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

asyncio, debian/master, debian/stretch-backports, main, master, proxy-ticket, upstream

Children:

10d9053

Parents:

154db29

Message:

Test suite: Ensure CRLF line ends in HTTP headers

Debian Sid updated Apache from 2.4.23 to 2.4.25 yesterday, and 2.4.24
introduces stricter checks for the request syntax described in RFC

7230. This breaks test cases where the request input file did not

contain CRLF line ends. Fix by forcing CRLF line ends when sending
requests in the runtest script.

File:

• test/runtests (modified) (1 diff)

test/runtests

@@ -208 +208 @@
 # case to proceed instead of waiting for it to return. The sleep
 # process is stopped after gnutls-cli terminates.
-if (sed "s/__HOSTNAME__/${TEST_HOST}/" <${t}/input && \
+#
+# The line end manipulation in sed guarantees that all header lines
+# end with CRLF as required by RFC 7230, Section 3.1.1 regardless of
+# the line ends in the input file.
+if (sed -r "s/__HOSTNAME__/${TEST_HOST}/;s/\r?$/\r/" <${t}/input && \
            run_with_pidfile "${sleep_pidfile}" sleep "${TEST_QUERY_DELAY}" &) | \
        gnutls-cli -p "${TEST_PORT}" $(cat ${t}/gnutls-cli.args) "${TEST_HOST}" \