Skip to content

Commit c2480b7

Browse files
Merge branch '3.4' into 4.3
* 3.4: Simpler example for Apache basic auth workaround [Console] Fix trying to access array offset on value of type int [Process] add tests for php executable finder if file does not exist [Cache] Make sure we get the correct number of values from redis::mget()
2 parents 0ac9ebf + f7efd0b commit c2480b7

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

ServerBag.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@ public function getHeaders()
4646
/*
4747
* php-cgi under Apache does not pass HTTP Basic user/pass to PHP by default
4848
* For this workaround to work, add these lines to your .htaccess file:
49-
* RewriteCond %{HTTP:Authorization} ^(.+)$
50-
* RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
49+
* RewriteCond %{HTTP:Authorization} .+
50+
* RewriteRule ^ - [E=HTTP_AUTHORIZATION:%0]
5151
*
5252
* A sample .htaccess file:
5353
* RewriteEngine On
54-
* RewriteCond %{HTTP:Authorization} ^(.+)$
55-
* RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
54+
* RewriteCond %{HTTP:Authorization} .+
55+
* RewriteRule ^ - [E=HTTP_AUTHORIZATION:%0]
5656
* RewriteCond %{REQUEST_FILENAME} !-f
5757
* RewriteRule ^(.*)$ app.php [QSA,L]
5858
*/

0 commit comments

Comments
 (0)