Skip to content

Commit 1873b45

Browse files
author
Dale Sikkema
committedMar 24, 2016
MAGETWO-50788: setup:di:compile fails with exception
1 parent 9f081a1 commit 1873b45

File tree

3 files changed

+19
-2
lines changed

3 files changed

+19
-2
lines changed
 

‎.htaccess

+6
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@
44

55
# SetEnv MAGE_MODE developer
66

7+
############################################
8+
## overrides default umask value to allow using different
9+
## file permissions
10+
11+
# SetEnv MAGE_UMASK 022
12+
713
############################################
814
## uncomment these lines for CGI mode
915
## make sure to specify the correct cgi php binary file name

‎app/bootstrap.php

+4
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
error_reporting(E_ALL);
1111
#ini_set('display_errors', 1);
1212

13+
/* Custom umask value may be provided in MAGE_UMASK environment variable */
14+
$mask = isset($_SERVER['MAGE_UMASK']) ? octdec($_SERVER['MAGE_UMASK']) : 002;
15+
umask($mask);
16+
1317
/* PHP version validation */
1418
if (version_compare(phpversion(), '5.5.0', '<') === true) {
1519
if (PHP_SAPI == 'cli') {

‎pub/.htaccess

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
############################################
2-
## uncomment the line below to enable developer mode
2+
## overrides deployment configuration mode value
3+
## use command bin/magento deploy:mode:set to switch modes
34

45
# SetEnv MAGE_MODE developer
56

7+
############################################
8+
## overrides default umask value to allow using different
9+
## file permissions
10+
11+
# SetEnv MAGE_UMASK 022
12+
613
############################################
714
## uncomment these lines for CGI mode
815
## make sure to specify the correct cgi php binary file name
@@ -213,4 +220,4 @@
213220
############################################
214221
## prevent clickjacking
215222
Header set X-Frame-Options SAMEORIGIN
216-
</IfModule>
223+
</IfModule>

0 commit comments

Comments
 (0)
Please sign in to comment.