http-get-extra-headers.execline: bugfix: terminate headers with \r\n

embarrassing.

diff --git a/visible-to-httpd/binaries/http-error-response.execline b/visible-to-httpd/binaries/http-error-response.execline
index af58267c49a06ccb233eda02176444ac4b247c2e..f749eca8be6b1fab531e60660c8bd498aea94056 100755 (executable)
--- a/visible-to-httpd/binaries/http-error-response.execline
+++ b/visible-to-httpd/binaries/http-error-response.execline
@@ -45,7 +45,7 @@ if {
 Content-Type: "${Content-Type}"\r
 Content-Length: "${Content-Length}"\r
 Date: "${Date}"\r
-"${extra_headers}"\r
+"${extra_headers}"
 \r
 "
                }
@@ -72,7 +72,7 @@ Date: "${Date}"\r
 Content-Type: application/xhtml+xml; charset=utf-8\r
 Content-Length: "${Content-Length}"\r
 Date: "${Date}"\r
-"${extra_headers}"\r
+"${extra_headers}"
 \r
 "
                }

diff --git a/visible-to-httpd/binaries/http-get-extra-headers.execline b/visible-to-httpd/binaries/http-get-extra-headers.execline
index 39cd3c2e9a4187f51abe8fa4a421df4a035705db..1a00f119e75fc1624eacd2d5c9b0e02366e14230 100755 (executable)
--- a/visible-to-httpd/binaries/http-get-extra-headers.execline
+++ b/visible-to-httpd/binaries/http-get-extra-headers.execline
@@ -84,4 +84,6 @@ if -t { s6-test -v header-directory }
                        pipeline { cat ${header_name} }
                        tr -d "\r\n"
                }
-       # do make sure not to forget to supply the final newline
+               s6-echo -n -- "\r\n"
+       # do remember to add the terminating `\r\n`!
+

diff --git a/visible-to-httpd/binaries/httpd.execline b/visible-to-httpd/binaries/httpd.execline
index 187f67be029a9e0f31420491b85d72c6b1583f61..ed8c6c0c094862439748aa5c3415e9eb2c5a39cf 100755 (executable)
--- a/visible-to-httpd/binaries/httpd.execline
+++ b/visible-to-httpd/binaries/httpd.execline
@@ -238,7 +238,7 @@ Content-Type: "${Content-Type}"\r
 Content-Length: "${Content-Length}"\r
 Last-Modified: "${Last-Modified}"\r
 Date: "${Date}"\r
-"${extra_headers}"\r
+"${extra_headers}"
 \r
 "
        }