 +    if (r->headers_out.content_length == NULL
 +        && r->headers_out.content_length_n >= 0)
 +    {
-+        h = ngx_array_push(out);
++        h = ngx_array_push(r->qstream->headers);
 +        if (h == NULL) {
 +            return NGX_ERROR;
 +        }

+
+    /* Generate Content-Type header. */
+    if (r->headers_out.content_type.len) {
+        h = ngx_array_push(out);
+        if (h == NULL) {
+            return NGX_ERROR;
+        }

+fi
diff --git a/auto/lib/quiche/make b/auto/lib/quiche/make
new file mode 100644
index 000000000..76bdce037
--- /dev/null
+++ b/auto/lib/quiche/make
@@ -0,0 +1,22 @@
