Skip to content

Commit 684dd67

Browse files
author
chicgeek
committed
Merge branch 'develop' of https://github.com/magento/magento2 into develop
2 parents 93990b9 + d3be453 commit 684dd67

File tree

13,660 files changed

+501117
-346061
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

13,660 files changed

+501117
-346061
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,4 @@ atlassian*
4747
/var/*
4848
!/var/.htaccess
4949
/vendor
50+
!/vendor/.htaccess

‎.htaccess

Lines changed: 110 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
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

@@ -57,6 +58,32 @@
5758

5859
</IfModule>
5960

61+
<IfModule mod_php7.c>
62+
63+
############################################
64+
## adjust memory limit
65+
66+
php_value memory_limit 768M
67+
php_value max_execution_time 18000
68+
69+
############################################
70+
## disable automatic session start
71+
## before autoload was initialized
72+
73+
php_flag session.auto_start off
74+
75+
############################################
76+
## enable resulting html compression
77+
78+
#php_flag zlib.output_compression on
79+
80+
###########################################
81+
## disable user agent verification to not break multiple image upload
82+
83+
php_flag suhosin.session.cryptua off
84+
85+
</IfModule>
86+
6087
<IfModule mod_security.c>
6188
###########################################
6289
## disable POST processing to not break multiple image upload
@@ -102,6 +129,13 @@
102129

103130
</IfModule>
104131

132+
############################################
133+
## workaround for Apache 2.4.6 CentOS build when working via ProxyPassMatch with HHVM (or any other)
134+
## Please, set it on virtual host configuration level
135+
136+
## SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1
137+
############################################
138+
105139
<IfModule mod_rewrite.c>
106140

107141
############################################
@@ -170,13 +204,83 @@
170204
</IfModule>
171205

172206
###########################################
173-
## Deny access to release notes to prevent disclosure of the installed Magento version
207+
## Deny access to root files to hide sensitive application information
208+
RedirectMatch 404 /\.git
174209

175-
<Files RELEASE_NOTES.txt>
176-
Order allow,deny
177-
Deny from all
210+
<Files composer.json>
211+
order allow,deny
212+
deny from all
178213
</Files>
179-
############################################
214+
<Files composer.lock>
215+
order allow,deny
216+
deny from all
217+
</Files>
218+
<Files .gitignore>
219+
order allow,deny
220+
deny from all
221+
</Files>
222+
<Files .htaccess>
223+
order allow,deny
224+
deny from all
225+
</Files>
226+
<Files .htaccess.sample>
227+
order allow,deny
228+
deny from all
229+
</Files>
230+
<Files .php_cs>
231+
order allow,deny
232+
deny from all
233+
</Files>
234+
<Files .travis.yml>
235+
order allow,deny
236+
deny from all
237+
</Files>
238+
<Files CHANGELOG.md>
239+
order allow,deny
240+
deny from all
241+
</Files>
242+
<Files CONTRIBUTING.md>
243+
order allow,deny
244+
deny from all
245+
</Files>
246+
<Files CONTRIBUTOR_LICENSE_AGREEMENT.html>
247+
order allow,deny
248+
deny from all
249+
</Files>
250+
<Files COPYING.txt>
251+
order allow,deny
252+
deny from all
253+
</Files>
254+
<Files Gruntfile.js>
255+
order allow,deny
256+
deny from all
257+
</Files>
258+
<Files LICENSE.txt>
259+
order allow,deny
260+
deny from all
261+
</Files>
262+
<Files LICENSE_AFL.txt>
263+
order allow,deny
264+
deny from all
265+
</Files>
266+
<Files nginx.conf.sample>
267+
order allow,deny
268+
deny from all
269+
</Files>
270+
<Files package.json>
271+
order allow,deny
272+
deny from all
273+
</Files>
274+
<Files php.ini.sample>
275+
order allow,deny
276+
deny from all
277+
</Files>
278+
<Files README.md>
279+
order allow,deny
280+
deny from all
281+
</Files>
282+
283+
################################
180284
## If running in cluster environment, uncomment this
181285
## http://developer.yahoo.com/performance/rules.html#etags
182286

‎.htaccess.sample

Lines changed: 79 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
############################################
3737
## adjust memory limit
3838

39-
php_value memory_limit 256M
39+
php_value memory_limit 768M
4040
php_value max_execution_time 18000
4141

4242
############################################
@@ -65,13 +65,6 @@
6565
SecFilterScanPOST Off
6666
</IfModule>
6767

68-
<IfModule mod_headers.c>
69-
############################################
70-
## prevent clickjacking
71-
72-
Header set X-Frame-Options SAMEORIGIN
73-
</IfModule>
74-
7568
<IfModule mod_deflate.c>
7669

7770
############################################
@@ -136,9 +129,11 @@
136129
RewriteRule .* - [L,R=405]
137130

138131
############################################
139-
## always send 404 on missing files in these folders
132+
## redirect for mobile user agents
140133

141-
RewriteCond %{REQUEST_URI} !^/pub/(media|js)/
134+
#RewriteCond %{REQUEST_URI} !^/mobiledirectoryhere/.*$
135+
#RewriteCond %{HTTP_USER_AGENT} "android|blackberry|ipad|iphone|ipod|iemobile|opera mobile|palmos|webos|googlebot-mobile" [NC]
136+
#RewriteRule ^(.*)$ /mobiledirectoryhere/ [L,R=302]
142137

143138
############################################
144139
## never rewrite for existing files, directories and links
@@ -175,16 +170,84 @@
175170
</IfModule>
176171

177172
###########################################
178-
## Deny access to release notes to prevent disclosure of the installed Magento version
173+
## Deny access to root files to hide sensitive application information
174+
RedirectMatch 404 /\.git
179175

180-
<Files RELEASE_NOTES.txt>
181-
Order allow,deny
182-
Deny from all
176+
<Files composer.json>
177+
order allow,deny
178+
deny from all
179+
</Files>
180+
<Files composer.lock>
181+
order allow,deny
182+
deny from all
183+
</Files>
184+
<Files .gitignore>
185+
order allow,deny
186+
deny from all
187+
</Files>
188+
<Files .htaccess>
189+
order allow,deny
190+
deny from all
191+
</Files>
192+
<Files .htaccess.sample>
193+
order allow,deny
194+
deny from all
195+
</Files>
196+
<Files .php_cs>
197+
order allow,deny
198+
deny from all
199+
</Files>
200+
<Files .travis.yml>
201+
order allow,deny
202+
deny from all
203+
</Files>
204+
<Files CHANGELOG.md>
205+
order allow,deny
206+
deny from all
207+
</Files>
208+
<Files CONTRIBUTING.md>
209+
order allow,deny
210+
deny from all
211+
</Files>
212+
<Files CONTRIBUTOR_LICENSE_AGREEMENT.html>
213+
order allow,deny
214+
deny from all
215+
</Files>
216+
<Files COPYING.txt>
217+
order allow,deny
218+
deny from all
219+
</Files>
220+
<Files Gruntfile.js>
221+
order allow,deny
222+
deny from all
223+
</Files>
224+
<Files LICENSE.txt>
225+
order allow,deny
226+
deny from all
227+
</Files>
228+
<Files LICENSE_AFL.txt>
229+
order allow,deny
230+
deny from all
231+
</Files>
232+
<Files nginx.conf.sample>
233+
order allow,deny
234+
deny from all
235+
</Files>
236+
<Files package.json>
237+
order allow,deny
238+
deny from all
239+
</Files>
240+
<Files php.ini.sample>
241+
order allow,deny
242+
deny from all
243+
</Files>
244+
<Files README.md>
245+
order allow,deny
246+
deny from all
183247
</Files>
184248

185-
############################################
249+
################################
186250
## If running in cluster environment, uncomment this
187251
## http://developer.yahoo.com/performance/rules.html#etags
188252

189253
#FileETag none
190-

‎.travis.yml

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1+
sudo: required
2+
dist: trusty
3+
14
language: php
25
php:
36
- 5.5
47
- 5.6
8+
- 7.0
59
env:
610
- TEST_SUITE=unit
711
- TEST_SUITE=integration_part_1
@@ -37,24 +41,16 @@ before_script:
3741
# Mock mail
3842
- sudo service postfix stop
3943
- smtp-sink -d "%d.%H.%M.%S" localhost:2500 1000 &
40-
- echo -e '#!/usr/bin/env bash\nexit 0' | sudo tee /usr/sbin/sendmail
41-
- >
42-
echo 'sendmail_path = "/usr/sbin/sendmail -t -i "'
43-
| sudo tee "/home/travis/.phpenv/versions/`php -i
44-
| grep "PHP Version"
45-
| head -n 1
46-
| grep -o -P '\d+\.\d+\.\d+.*'`/etc/conf.d/sendmail.ini"
44+
- echo 'sendmail_path = "/usr/sbin/sendmail -t -i "' > $(php --ini|grep -m 1 "ini files in:"|cut -d ":" -f 2)/sendmail.ini
4745
# Disable xDebug
4846
- echo '' > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
4947
# Install MySQL 5.6, create DB for integration tests
5048
- >
5149
sh -c "if [ '$TEST_SUITE' = 'integration_part_1' ] || [ '$TEST_SUITE' = 'integration_part_2' ] || [ '$TEST_SUITE' = 'integration_integrity' ]; then
52-
sudo apt-get remove --purge mysql-common mysql-server-5.5 mysql-server-core-5.5 mysql-client-5.5 mysql-client-core-5.5;
53-
sudo apt-get autoremove;
54-
sudo apt-get autoclean;
55-
sudo apt-add-repository ppa:ondrej/mysql-5.6 -y;
56-
sudo apt-get update;
57-
sudo apt-get install mysql-server-5.6 mysql-client-5.6;
50+
sudo apt-get remove -y -qq --purge mysql-common mysql-server-5.5 mysql-server-core-5.5 mysql-client-5.5 mysql-client-core-5.5;
51+
sudo apt-get -y -qq autoremove;
52+
sudo apt-get -y -qq autoclean;
53+
sudo apt-get install -y -qq mysql-server-5.6 mysql-client-5.6;
5854
mysql -uroot -e 'SET @@global.sql_mode = NO_ENGINE_SUBSTITUTION; CREATE DATABASE magento_integration_tests;';
5955
mv dev/tests/integration/etc/install-config-mysql.travis.php.dist dev/tests/integration/etc/install-config-mysql.php;
6056
fi"

0 commit comments

Comments
 (0)