Merge tag 'v0.9.6' into latest

Release v0.9.6

diff --git a/.htaccess b/.htaccess
index 66ef8f69ce39e127dc266c9ab3727c4b8be4f9fa..7ba4744b262af9c1ca97f617c4bb60d9510808e9 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -1,4 +1,16 @@
+# Disable directory listing
+Options -Indexes
+
 RewriteEngine On
+
+# Prevent accessing subdirectories not managed by SCM
+RewriteRule ^(.git|doxygen|vendor) - [F]
+
+# Forward the "Authorization" HTTP header
+RewriteCond %{HTTP:Authorization} ^(.*)
+RewriteRule .* - [e=HTTP_AUTHORIZATION:%1]
+
+# REST API
 RewriteCond %{REQUEST_FILENAME} !-f
 RewriteCond %{REQUEST_FILENAME} !-d
 RewriteRule ^ index.php [QSA,L]

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf4063db4ded026f661e4bbe0c03a152ba543736..f0ba390cdde10d8b231464f2f55206310d95cd03 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-## [v0.10.0](https://github.com/shaarli/Shaarli/releases/tag/v0.10.0) - UNPUBLISHED
+## [v0.9.6](https://github.com/shaarli/Shaarli/releases/tag/v0.9.6) - 2018-03-25
+## Changed
+- htaccess: prevent accessing resources not managed by SCM
+- htaccess: always forward the 'Authorization' HTTP header
+
 
 ## [v0.9.5](https://github.com/shaarli/Shaarli/releases/tag/v0.9.5) - 2018-02-02
 ### Fixed

diff --git a/shaarli_version.php b/shaarli_version.php
index a47757c217a4b5c41d1e144dd4655fa3721cf71d..6bd0f8292b91110a983856a824479857c14f99c1 100644 (file)
--- a/shaarli_version.php
+++ b/shaarli_version.php
@@ -1 +1 @@
-<?php /* 0.9.5 */ ?>
+<?php /* 0.9.6 */ ?>