tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-06-28 23:49:26 +02:00
Code Issues Projects Releases Wiki Activity

Fix merge error

Browse Source
This commit is contained in:
Damian Mooyman 2015-01-15 18:56:09 +13:00
parent 88fdc75456
commit 33b18ce998
1 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
docs/en/04_Changelogs/3.1.9.md
View File

@ -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
@ -71,5 +57,4 @@ 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
* [installer](https://github.com/silverstripe/silverstripe-installer/releases/tag/3.1.9)