Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/develop' into feature/fix-rela…
Browse files Browse the repository at this point in the history 
…tive-template-paths
  • Loading branch information
@davidalger
davidalger committed Mar 23, 2017
2 parents caa4a98 + 2002ef2 commit 1c882c0
Show file tree
Hide file tree
Showing 26,905 changed files with 739,369 additions and 301,315 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
14 changes: 13 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
atlassian*
/nbproject
/sitemap
/sitemap.xml
/.idea
/.gitattributes
/app/config_sandbox
Expand All @@ -22,9 +23,18 @@ atlassian*
/lib/internal/flex/varien/.settings
/node_modules
/.grunt
/Gruntfile.js
/package.json
/.php_cs
/.php_cs.cache
/grunt-config.json
/dev/tools/grunt/configs/local-themes.js

/pub/media/*.*
!/pub/media/.htaccess
/pub/media/attribute/*
!/pub/media/attribute/.htaccess
/pub/media/analytics/*
/pub/media/catalog/*
!/pub/media/catalog/.htaccess
/pub/media/customer/*
Expand All @@ -46,5 +56,7 @@ atlassian*

/var/*
!/var/.htaccess
/vendor
/vendor/*
!/vendor/.htaccess
/generated/*
!/generated/.htaccess
86 changes: 73 additions & 13 deletions .htaccess
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
DirectoryIndex index.php

<IfModule mod_php5.c>

############################################
## adjust memory limit

Expand All @@ -55,9 +54,30 @@
## disable user agent verification to not break multiple image upload

php_flag suhosin.session.cryptua off

</IfModule>
<IfModule mod_php7.c>
############################################
## adjust memory limit

php_value memory_limit 768M
php_value max_execution_time 18000

############################################
## disable automatic session start
## before autoload was initialized

php_flag session.auto_start off

############################################
## enable resulting html compression

#php_flag zlib.output_compression on

###########################################
## disable user agent verification to not break multiple image upload

php_flag suhosin.session.cryptua off
</IfModule>
<IfModule mod_security.c>
###########################################
## disable POST processing to not break multiple image upload
Expand All @@ -75,7 +95,7 @@
# Insert filter on all content
###SetOutputFilter DEFLATE
# Insert filter on selected content types only
#AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript
#AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript application/javascript application/x-javascript application/json image/svg+xml

# Netscape 4.x has some problems...
#BrowserMatch ^Mozilla/4 gzip-only-text/html
Expand Down Expand Up @@ -103,6 +123,13 @@

</IfModule>

############################################
## workaround for Apache 2.4.6 CentOS build when working via ProxyPassMatch with HHVM (or any other)
## Please, set it on virtual host configuration level

## SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1
############################################

<IfModule mod_rewrite.c>

############################################
Expand Down Expand Up @@ -157,6 +184,7 @@

AddDefaultCharset Off
#AddDefaultCharset UTF-8
AddType 'text/html; charset=UTF-8' html

<IfModule mod_expires.c>

Expand All @@ -172,7 +200,7 @@

###########################################
## Deny access to root files to hide sensitive application information
RedirectMatch 404 /\.git
RedirectMatch 403 /\.git

<Files composer.json>
order allow,deny
Expand All @@ -194,7 +222,7 @@
order allow,deny
deny from all
</Files>
<Files .php_cs>
<Files .php_cs.dist>
order allow,deny
deny from all
</Files>
Expand All @@ -210,10 +238,6 @@
order allow,deny
deny from all
</Files>
<Files CONTRIBUTOR_LICENSE_AGREEMENT.html>
order allow,deny
deny from all
</Files>
<Files COPYING.txt>
order allow,deny
deny from all
Expand Down Expand Up @@ -246,16 +270,52 @@
order allow,deny
deny from all
</Files>
<Files magento_umask>
order allow,deny
deny from all
</Files>

# For 404s and 403s that aren't handled by the application, show plain 404 response
ErrorDocument 404 /pub/errors/404.php
ErrorDocument 403 /pub/errors/404.php

################################
## If running in cluster environment, uncomment this
## http://developer.yahoo.com/performance/rules.html#etags

#FileETag none

############################################
## Add custom headers
# ######################################################################
# # INTERNET EXPLORER #
# ######################################################################

# ----------------------------------------------------------------------
# | Document modes |
# ----------------------------------------------------------------------

# Force Internet Explorer 8/9/10 to render pages in the highest mode
# available in the various cases when it may not.
#
# https://hsivonen.fi/doctype/#ie8
#
# (!) Starting with Internet Explorer 11, document modes are deprecated.
# If your business still relies on older web apps and services that were
# designed for older versions of Internet Explorer, you might want to
# consider enabling `Enterprise Mode` throughout your company.
#
# https://msdn.microsoft.com/en-us/library/ie/bg182625.aspx#docmode
# http://blogs.msdn.com/b/ie/archive/2014/04/02/stay-up-to-date-with-enterprise-mode-for-internet-explorer-11.aspx

<IfModule mod_headers.c>
Header set X-Content-Type-Options "nosniff"
Header set X-XSS-Protection "1; mode=block"

Header set X-UA-Compatible "IE=edge"

# `mod_headers` cannot match based on the content-type, however,
# the `X-UA-Compatible` response header should be send only for
# HTML documents and not for the other resources.

<FilesMatch "\.(appcache|atom|bbaw|bmp|crx|css|cur|eot|f4[abpv]|flv|geojson|gif|htc|ico|jpe?g|js|json(ld)?|m4[av]|manifest|map|mp4|oex|og[agv]|opus|otf|pdf|png|rdf|rss|safariextz|svgz?|swf|topojson|tt[cf]|txt|vcard|vcf|vtt|webapp|web[mp]|webmanifest|woff2?|xloc|xml|xpi)$">
Header unset X-UA-Compatible
</FilesMatch>

</IfModule>
68 changes: 56 additions & 12 deletions .htaccess.sample
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
############################################
## uncomment the line below to enable developer mode
## overrides deployment configuration mode value
## use command bin/magento deploy:mode:set to switch modes

# SetEnv MAGE_MODE developer

Expand Down Expand Up @@ -31,8 +32,6 @@

DirectoryIndex index.php

<IfModule mod_php5.c>

############################################
## adjust memory limit

Expand All @@ -55,8 +54,6 @@

php_flag suhosin.session.cryptua off

</IfModule>

<IfModule mod_security.c>
###########################################
## disable POST processing to not break multiple image upload
Expand All @@ -74,7 +71,7 @@
# Insert filter on all content
###SetOutputFilter DEFLATE
# Insert filter on selected content types only
#AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript
#AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript application/javascript application/x-javascript application/json image/svg+xml

# Netscape 4.x has some problems...
#BrowserMatch ^Mozilla/4 gzip-only-text/html
Expand Down Expand Up @@ -102,6 +99,13 @@

</IfModule>

############################################
## workaround for Apache 2.4.6 CentOS build when working via ProxyPassMatch with HHVM (or any other)
## Please, set it on virtual host configuration level

## SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1
############################################

<IfModule mod_rewrite.c>

############################################
Expand Down Expand Up @@ -156,6 +160,7 @@

AddDefaultCharset Off
#AddDefaultCharset UTF-8
AddType 'text/html; charset=UTF-8' html

<IfModule mod_expires.c>

Expand All @@ -171,7 +176,7 @@

###########################################
## Deny access to root files to hide sensitive application information
RedirectMatch 404 /\.git
RedirectMatch 403 /\.git

<Files composer.json>
order allow,deny
Expand All @@ -193,7 +198,7 @@
order allow,deny
deny from all
</Files>
<Files .php_cs>
<Files .php_cs.dist>
order allow,deny
deny from all
</Files>
Expand All @@ -209,10 +214,6 @@
order allow,deny
deny from all
</Files>
<Files CONTRIBUTOR_LICENSE_AGREEMENT.html>
order allow,deny
deny from all
</Files>
<Files COPYING.txt>
order allow,deny
deny from all
Expand Down Expand Up @@ -245,9 +246,52 @@
order allow,deny
deny from all
</Files>
<Files magento_umask>
order allow,deny
deny from all
</Files>

# For 404s and 403s that aren't handled by the application, show plain 404 response
ErrorDocument 404 /pub/errors/404.php
ErrorDocument 403 /pub/errors/404.php

################################
## If running in cluster environment, uncomment this
## http://developer.yahoo.com/performance/rules.html#etags

#FileETag none

# ######################################################################
# # INTERNET EXPLORER #
# ######################################################################

# ----------------------------------------------------------------------
# | Document modes |
# ----------------------------------------------------------------------

# Force Internet Explorer 8/9/10 to render pages in the highest mode
# available in the various cases when it may not.
#
# https://hsivonen.fi/doctype/#ie8
#
# (!) Starting with Internet Explorer 11, document modes are deprecated.
# If your business still relies on older web apps and services that were
# designed for older versions of Internet Explorer, you might want to
# consider enabling `Enterprise Mode` throughout your company.
#
# https://msdn.microsoft.com/en-us/library/ie/bg182625.aspx#docmode
# http://blogs.msdn.com/b/ie/archive/2014/04/02/stay-up-to-date-with-enterprise-mode-for-internet-explorer-11.aspx

<IfModule mod_headers.c>

Header set X-UA-Compatible "IE=edge"

# `mod_headers` cannot match based on the content-type, however,
# the `X-UA-Compatible` response header should be send only for
# HTML documents and not for the other resources.

<FilesMatch "\.(appcache|atom|bbaw|bmp|crx|css|cur|eot|f4[abpv]|flv|geojson|gif|htc|ico|jpe?g|js|json(ld)?|m4[av]|manifest|map|mp4|oex|og[agv]|opus|otf|pdf|png|rdf|rss|safariextz|svgz?|swf|topojson|tt[cf]|txt|vcard|vcf|vtt|webapp|web[mp]|webmanifest|woff2?|xloc|xml|xpi)$">
Header unset X-UA-Compatible
</FilesMatch>

</IfModule>
53 changes: 0 additions & 53 deletions .php_cs
View file

This file was deleted.

Loading

0 comments on commit 1c882c0

Please sign in to comment.