diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2019-01-02 21:46:21 +0100 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2019-01-02 21:46:21 +0100 |
| commit | 30327efecd4fa7f4131cd0d7a5ac80b460af95d1 (patch) | |
| tree | c95cc258c85304954dafab03be2eb84590361d81 /p | |
| parent | a0f1b76918e7ce038ab8ea490d9f5ed0e625831e (diff) | |
| parent | a6623b7b2fa3f026a0ea30e49b1a221f7a4a8e55 (diff) | |
Merge branch 'FreshRSS/dev' into FreshRSS/dev-1.14.0
Diffstat (limited to 'p')
| -rw-r--r-- | p/api/.htaccess | 11 | ||||
| -rw-r--r-- | p/i/.gitignore | 2 |
2 files changed, 9 insertions, 4 deletions
diff --git a/p/api/.htaccess b/p/api/.htaccess index 41b653d96..937983ec9 100644 --- a/p/api/.htaccess +++ b/p/api/.htaccess @@ -1,4 +1,9 @@ -<IfModule mod_rewrite.c> - RewriteEngine on - RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}] +<IfModule mod_setenvif.c> + SetEnvIf "^Authorization$" "(.*)" HTTP_AUTHORIZATION=$1 +</IfModule> +<IfModule !mod_setenvif.c> + <IfModule mod_rewrite.c> + RewriteEngine on + RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}] + </IfModule> </IfModule> diff --git a/p/i/.gitignore b/p/i/.gitignore index 03c88fd7a..b76d11b5a 100644 --- a/p/i/.gitignore +++ b/p/i/.gitignore @@ -1 +1 @@ -.htaccess +.ht* |