Merge remote-tracking branch 'origin/2.0' into 2.0.6_backlog

Author: isitnikov

.htaccess

@@ -4,12 +4,6 @@
 
 #   SetEnv MAGE_MODE developer
 
-############################################
-## overrides default umask value to allow using different
-## file permissions
-
-#   SetEnv MAGE_UMASK 022
-
 ############################################
 ## uncomment these lines for CGI mode
 ## make sure to specify the correct cgi php binary file name
@@ -285,6 +279,10 @@
         order allow,deny
         deny from all
     </Files>
+    <Files magento_umask>
+            order allow,deny
+            deny from all
+    </Files>
 
 ################################
 ## If running in cluster environment, uncomment this

.htaccess.sample

@@ -3,12 +3,6 @@
 
 #   SetEnv MAGE_MODE developer
 
-############################################
-## overrides default umask value to allow using different
-## file permissions
-
-#   SetEnv MAGE_UMASK 022
-
 ############################################
 ## uncomment these lines for CGI mode
 ## make sure to specify the correct cgi php binary file name
@@ -251,6 +245,10 @@
         order allow,deny
         deny from all
     </Files>
+    <Files magento_umask>
+            order allow,deny
+            deny from all
+    </Files>
 
 ################################
 ## If running in cluster environment, uncomment this

app/bootstrap.php

@@ -10,10 +10,6 @@
 error_reporting(E_ALL);
 #ini_set('display_errors', 1);
 
-/* Custom umask value may be provided in MAGE_UMASK environment variable */
-$mask = isset($_SERVER['MAGE_UMASK']) ? octdec($_SERVER['MAGE_UMASK']) : 002;
-umask($mask);
-
 /* PHP version validation */
 if (version_compare(phpversion(), '5.5.0', '<') === true) {
     if (PHP_SAPI == 'cli') {
@@ -34,6 +30,11 @@
 require_once __DIR__ . '/autoload.php';
 require_once BP . '/app/functions.php';
 
+/* Custom umask value may be provided in optional mage_umask file in root */
+$umaskFile = BP . '/magento_umask';
+$mask = file_exists($umaskFile) ? octdec(file_get_contents($umaskFile)) : 002;
+umask($mask);
+
 if (!empty($_SERVER['MAGE_PROFILER'])
     && isset($_SERVER['HTTP_ACCEPT'])
     && strpos($_SERVER['HTTP_ACCEPT'], 'text/html') !== false

pub/.htaccess

@@ -3,12 +3,6 @@
 
 #   SetEnv MAGE_MODE developer
 
-############################################
-## overrides default umask value to allow using different
-## file permissions
-
-#   SetEnv MAGE_UMASK 022
-
 ############################################
 ## uncomment these lines for CGI mode
 ## make sure to specify the correct cgi php binary file name