# HG changeset patch
# User Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk>
# Date 1481204401 0
# Node ID 702b5944f7821d4d21f576dc8af3fd2f72b9d9e4
# Parent  13a0b65143a64028f4cc1c6621122839d1b83cc9# Parent  a3bcb8b9667d489cdf07bacae5014fc04ba3e87e
Merge branch 'master' into vnext

diff -r 13a0b65143a6 -r 702b5944f782 php/.htaccess
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/php/.htaccess	Thu Dec 08 13:40:01 2016 +0000
@@ -0,0 +1,15 @@
+# supress php errors
+php_flag display_startup_errors off
+php_flag display_errors off
+php_flag html_errors off
+php_value docref_root 0
+php_value docref_ext 0
+# enable PHP error logging
+php_flag  log_errors on
+php_value error_log  ./error.log
+# prevent access to PHP error log
+<Files error.log>
+ Order allow,deny
+ Deny from all
+ Satisfy All
+</Files>