Skip to content

Commit 4bdbf6b

Browse files
magento-teammagento-team
committed
Merged commits from the original repository.
1 parent be09cb9 commit 4bdbf6b

File tree

10,959 files changed

+1835672
-0
lines changed

Some content is hidden

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

10,959 files changed

+1835672
-0
lines changed

‎.gitignore

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
/.buildpath
2+
/.cache
3+
/.htaccess
4+
/.metadata
5+
/.project
6+
/.settings
7+
/index.php
8+
/nbproject
9+
/sitemap
10+
/staging
11+
/.htaccess.orig
12+
/.idea
13+
/app/config_sandbox
14+
/app/etc/local.xml
15+
/app/etc/local.xml.*
16+
/app/etc/modules/XEnterprise_Enabler.xml
17+
/app/locale/en_US_org
18+
/downloader/.cache
19+
/downloader/cache.cfg
20+
/downloader/connect.cfg
21+
/lib/flex/uploader/.actionScriptProperties
22+
/lib/flex/uploader/.flexProperties
23+
/lib/flex/uploader/.project
24+
/lib/flex/uploader/.settings
25+
/lib/flex/varien/.actionScriptProperties
26+
/lib/flex/varien/.flexLibProperties
27+
/lib/flex/varien/.project
28+
/lib/flex/varien/.settings
29+
/pub/media/*
30+
/pub/media/customer/*
31+
/pub/media/downloadable/*
32+
/pub/media/xmlconnect/*
33+
/var/*

‎.htaccess

+186
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,186 @@
1+
############################################
2+
## uncomment these lines for CGI mode
3+
## make sure to specify the correct cgi php binary file name
4+
## it might be /cgi-bin/php-cgi
5+
6+
# Action php5-cgi /cgi-bin/php5-cgi
7+
# AddHandler php5-cgi .php
8+
9+
############################################
10+
## GoDaddy specific options
11+
12+
# Options -MultiViews
13+
14+
## you might also need to add this line to php.ini
15+
## cgi.fix_pathinfo = 1
16+
## if it still doesn't work, rename php.ini to php5.ini
17+
18+
############################################
19+
## this line is specific for 1and1 hosting
20+
21+
#AddType x-mapp-php5 .php
22+
#AddHandler x-mapp-php5 .php
23+
24+
############################################
25+
## default index file
26+
27+
DirectoryIndex index.php
28+
29+
<IfModule mod_php5.c>
30+
31+
############################################
32+
## adjust memory limit
33+
34+
# php_value memory_limit 64M
35+
php_value memory_limit 256M
36+
php_value max_execution_time 18000
37+
38+
############################################
39+
## disable magic quotes for php request vars
40+
41+
php_flag magic_quotes_gpc off
42+
43+
############################################
44+
## disable automatic session start
45+
## before autoload was initialized
46+
47+
php_flag session.auto_start off
48+
49+
############################################
50+
## enable resulting html compression
51+
52+
#php_flag zlib.output_compression on
53+
54+
###########################################
55+
# disable user agent verification to not break multiple image upload
56+
57+
php_flag suhosin.session.cryptua off
58+
59+
###########################################
60+
# turn off compatibility with PHP4 when dealing with objects
61+
62+
php_flag zend.ze1_compatibility_mode Off
63+
64+
</IfModule>
65+
66+
<IfModule mod_security.c>
67+
###########################################
68+
# disable POST processing to not break multiple image upload
69+
70+
SecFilterEngine Off
71+
SecFilterScanPOST Off
72+
</IfModule>
73+
74+
<IfModule mod_deflate.c>
75+
76+
############################################
77+
## enable apache served files compression
78+
## http://developer.yahoo.com/performance/rules.html#gzip
79+
80+
# Insert filter on all content
81+
###SetOutputFilter DEFLATE
82+
# Insert filter on selected content types only
83+
#AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript
84+
85+
# Netscape 4.x has some problems...
86+
#BrowserMatch ^Mozilla/4 gzip-only-text/html
87+
88+
# Netscape 4.06-4.08 have some more problems
89+
#BrowserMatch ^Mozilla/4\.0[678] no-gzip
90+
91+
# MSIE masquerades as Netscape, but it is fine
92+
#BrowserMatch \bMSIE !no-gzip !gzip-only-text/html
93+
94+
# Don't compress images
95+
#SetEnvIfNoCase Request_URI \.(?:gif|jpe?g|png)$ no-gzip dont-vary
96+
97+
# Make sure proxies don't deliver the wrong content
98+
#Header append Vary User-Agent env=!dont-vary
99+
100+
</IfModule>
101+
102+
<IfModule mod_ssl.c>
103+
104+
############################################
105+
## make HTTPS env vars available for CGI mode
106+
107+
SSLOptions StdEnvVars
108+
109+
</IfModule>
110+
111+
<IfModule mod_rewrite.c>
112+
113+
############################################
114+
## enable rewrites
115+
116+
Options +FollowSymLinks
117+
RewriteEngine on
118+
119+
############################################
120+
## you can put here your magento root folder
121+
## path relative to web root
122+
123+
#RewriteBase /magento/
124+
125+
############################################
126+
## workaround for HTTP authorization
127+
## in CGI environment
128+
129+
RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
130+
131+
############################################
132+
## always send 404 on missing files in these folders
133+
134+
RewriteCond %{REQUEST_URI} !^/pub/(media|js)/
135+
136+
############################################
137+
## never rewrite for existing files, directories and links
138+
139+
RewriteCond %{REQUEST_FILENAME} !-f
140+
RewriteCond %{REQUEST_FILENAME} !-d
141+
RewriteCond %{REQUEST_FILENAME} !-l
142+
143+
############################################
144+
## rewrite everything else to index.php
145+
146+
RewriteRule .* index.php [L]
147+
148+
</IfModule>
149+
150+
151+
############################################
152+
## Prevent character encoding issues from server overrides
153+
## If you still have problems, use the second line instead
154+
155+
AddDefaultCharset Off
156+
#AddDefaultCharset UTF-8
157+
158+
<IfModule mod_expires.c>
159+
160+
############################################
161+
## Add default Expires header
162+
## http://developer.yahoo.com/performance/rules.html#expires
163+
164+
ExpiresDefault "access plus 1 year"
165+
166+
</IfModule>
167+
168+
############################################
169+
## By default allow all access
170+
171+
Order allow,deny
172+
Allow from all
173+
174+
###########################################
175+
## Deny access to release notes to prevent disclosure of the installed Magento version
176+
177+
<Files RELEASE_NOTES.txt>
178+
order allow,deny
179+
deny from all
180+
</Files>
181+
182+
############################################
183+
## If running in cluster environment, uncomment this
184+
## http://developer.yahoo.com/performance/rules.html#etags
185+
186+
#FileETag none

0 commit comments

Comments
 (0)