From b0d5c2c8ae076393e7a3ad59ce875027f4c29304 Mon Sep 17 00:00:00 2001
From: Gilbert Gilb's <gilbsgilbs@users.noreply.github.com>
Date: Fri, 20 Nov 2020 20:38:16 +0100
Subject: headers: Support default header values in Caddyfile with '?' (#3807)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* implement default values for header directive
closes #3804
* remove `set_default` header op and rely on "require" handler instead
This has the following advantages over the previous attempt:
- It does not introduce a new operation for headers, but rather nicely
extends over an existing feature in the header handler.
- It removes the need to specify the header as "deferred" because it is
already implicitely deferred by the use of the require handler. This
should be less confusing to the user.
* add integration test for header directive in caddyfile
* bubble up errors when parsing caddyfile header directive
* don't export unnecessarily and don't canonicalize headers unnecessarily
* fix response headers not passed in blocks
* caddyfile: fix clash when using default header in block
Each header is now set in a separate handler so that it doesn't clash
with other headers set/added/deleted in the same block.
* caddyhttp: New idle_timeout default of 5m
* reverseproxy: fix random hangs on http/2 requests with server push (#3875)
see https://github.com/golang/go/issues/42534
* Refactor and cleanup with improvements
* More specific link
Co-authored-by: Matthew Holt <mholt@users.noreply.github.com>
Co-authored-by: Денис Телюх <telyukh.denis@gmail.com>
---
caddytest/integration/caddyfile_adapt/header.txt | 107 +++++++++++++++++++++++
1 file changed, 107 insertions(+)
create mode 100644 caddytest/integration/caddyfile_adapt/header.txt
(limited to 'caddytest/integration')
diff --git a/caddytest/integration/caddyfile_adapt/header.txt b/caddytest/integration/caddyfile_adapt/header.txt
new file mode 100644
index 0000000..b8e102f
--- /dev/null
+++ b/caddytest/integration/caddyfile_adapt/header.txt
@@ -0,0 +1,107 @@
+:80 {
+ header Denis "Ritchie"
+ header +Edsger "Dijkstra"
+ header ?John "von Neumann"
+ header -Wolfram
+ header {
+ Grace: "Hopper" # some users habitually suffix field names with a colon
+ +Ray "Solomonoff"
+ ?Tim "Berners-Lee"
+ defer
+ }
+}
+----------
+{
+ "apps": {
+ "http": {
+ "servers": {
+ "srv0": {
+ "listen": [
+ ":80"
+ ],
+ "routes": [
+ {
+ "handle": [
+ {
+ "handler": "headers",
+ "response": {
+ "set": {
+ "Denis": [
+ "Ritchie"
+ ]
+ }
+ }
+ },
+ {
+ "handler": "headers",
+ "response": {
+ "add": {
+ "Edsger": [
+ "Dijkstra"
+ ]
+ }
+ }
+ },
+ {
+ "handler": "headers",
+ "response": {
+ "require": {
+ "headers": {
+ "John": null
+ }
+ },
+ "set": {
+ "John": [
+ "von Neumann"
+ ]
+ }
+ }
+ },
+ {
+ "handler": "headers",
+ "response": {
+ "deferred": true,
+ "delete": [
+ "Wolfram"
+ ]
+ }
+ },
+ {
+ "handler": "headers",
+ "response": {
+ "add": {
+ "Ray": [
+ "Solomonoff"
+ ]
+ },
+ "deferred": true,
+ "set": {
+ "Grace": [
+ "Hopper"
+ ]
+ }
+ }
+ },
+ {
+ "handler": "headers",
+ "response": {
+ "require": {
+ "headers": {
+ "Tim": null
+ }
+ },
+ "set": {
+ "Tim": [
+ "Berners-Lee"
+ ]
+ }
+ }
+ }
+ ]
+ }
+ ]
+ }
+ }
+ }
+ }
+}
--
cgit v1.2.3