[PATCH v8 0/3] Add support for sending additional HTTP headers (part 2)
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- May 10, 2016, 07:08 UTC
- Message-ID
- <cover.1462863934.git.johannes.schindelin@gmx.de>
- In-Reply-To
- <cover.1462774709.git.johannes.schindelin@gmx.de>
My use case is an army of build agents that need only limited and selective access to otherwise private repositories.
The first part already made it into `master`, this is the remainder.
This iteration is based on 'jk/submodule-c-credential' and therefore converted the original config-sanitizing patch into a test-only patch. This iteration also replaces the "ugly" comment with the explanation preferred by Junio.
Johannes Schindelin (3): tests: adjust the configuration for Apache 2.2 t5551: make the test for extra HTTP headers more robust submodule: ensure that -c http.extraheader is heeded
t/lib-httpd/apache.conf | 16 ++++++++++++---- t/t5551-http-fetch-smart.sh | 14 ++++++++++++-- 2 files changed, 24 insertions(+), 6 deletions(-)
Published-As: https://github.com/dscho/git/releases/tag/extra-http-headers-v8
--
Interdiff vs v7:
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
[no longer applies; skipped]
diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf
index 29b34bb..018a83a 100644
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@ -133,8 +133,12 @@ RewriteRule ^/loop-redir/x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-(.*) /$1 [R=302
RewriteRule ^/loop-redir/(.*)$ /loop-redir/x-$1 [R=302]
# Apache 2.2 does not understand <RequireAll>, so we use RewriteCond.
-# And as RewriteCond unfortunately lacks "not equal" matching, we use this
-# ugly trick to fail *unless* the two headers are present.
+# And as RewriteCond does not allow testing for non-matches, we match
+# the desired case first (one has abra, two has cadabra), and let it
+# pass by marking the RewriteRule as [L], "last rule, do not process
+# any other matching RewriteRules after this"), and then have another
+# RewriteRule that matches all other cases and lets them fail via '[F]',
+# "fail the request".
RewriteCond %{HTTP:x-magic-one} =abra
RewriteCond %{HTTP:x-magic-two} =cadabra
RewriteRule ^/smart_headers/.* - [L]
2.8.2.463.g99156ee