mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
Fix merge error
This commit is contained in:
parent
88fdc75456
commit
33b18ce998
@ -1,19 +1,5 @@
|
||||
# 3.1.9
|
||||
|
||||
<<<<<<< HEAD
|
||||
# Overview
|
||||
|
||||
This release replaces the 3.1.8 release, and resolves an issue where basic authentication would not work when PHP is running under CGI mode with Apache.
|
||||
|
||||
## Upgrading
|
||||
* Add the rule ``` RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization},L]``` to the .htacces file in your sites root directory after the line ```RewriteEngine On```.
|
||||
|
||||
### Bugfixes
|
||||
|
||||
|
||||
## Changelog
|
||||
|
||||
=======
|
||||
## Upgrading
|
||||
|
||||
### File permissions
|
||||
@ -72,4 +58,3 @@ This release includes an important security fix.
|
||||
* [framework](https://github.com/silverstripe/silverstripe-framework/releases/tag/3.1.9)
|
||||
* [cms](https://github.com/silverstripe/silverstripe-cms/releases/tag/3.1.9)
|
||||
* [installer](https://github.com/silverstripe/silverstripe-installer/releases/tag/3.1.9)
|
||||
>>>>>>> composer/3.1
|
||||
|
Loading…
Reference in New Issue
Block a user