Skip to content

Commit

Permalink
Removed php5 settings from .htaccess (OpenMage#1001)
Browse files Browse the repository at this point in the history
  • Loading branch information
sreichel authored Jun 26, 2020
1 parent 85191ff commit aa14d40
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 64 deletions.
37 changes: 1 addition & 36 deletions .htaccess
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
############################################
## uncomment these lines for CGI mode
## make sure to specify the correct cgi php binary file name
## it might be /cgi-bin/php-cgi

# Action php5-cgi /cgi-bin/php5-cgi
# AddHandler php5-cgi .php

############################################
## GoDaddy specific options

Expand All @@ -15,12 +7,6 @@
## cgi.fix_pathinfo = 1
## if it still doesn't work, rename php.ini to php5.ini

############################################
## this line is specific for 1and1 hosting

#AddType x-mapp-php5 .php
#AddHandler x-mapp-php5 .php

############################################
## default index file

Expand All @@ -29,18 +15,13 @@
############################################
## php5 settings

<IfModule mod_php5.c>
<IfModule mod_php7.c>

############################################
## adjust max execution time

php_value max_execution_time 18000

############################################
## disable magic quotes for php request vars

php_flag magic_quotes_gpc off

############################################
## disable automatic session start
## before autoload was initialized
Expand All @@ -57,22 +38,6 @@

php_flag suhosin.session.cryptua off

###########################################
# turn off compatibility with PHP4 when dealing with objects

php_flag zend.ze1_compatibility_mode Off

</IfModule>

############################################
## php7 settings
## see above for php_flag descriptions

<IfModule mod_php7.c>
php_value max_execution_time 18000
php_flag session.auto_start off
#php_flag zlib.output_compression on
php_flag suhosin.session.cryptua off
</IfModule>

<IfModule mod_security.c>
Expand Down
26 changes: 1 addition & 25 deletions .htaccess.sample
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
############################################
## uncomment these lines for CGI mode
## make sure to specify the correct cgi php binary file name
## it might be /cgi-bin/php-cgi

# Action php5-cgi /cgi-bin/php5-cgi
# AddHandler php5-cgi .php

############################################
## GoDaddy specific options

Expand All @@ -15,29 +7,18 @@
## cgi.fix_pathinfo = 1
## if it still doesn't work, rename php.ini to php5.ini

############################################
## this line is specific for 1and1 hosting

#AddType x-mapp-php5 .php
#AddHandler x-mapp-php5 .php

############################################
## default index file

DirectoryIndex index.php

<IfModule mod_php5.c>
<IfModule mod_php7.c>

############################################
## adjust max execution time

php_value max_execution_time 18000

############################################
## disable magic quotes for php request vars

php_flag magic_quotes_gpc off

############################################
## disable automatic session start
## before autoload was initialized
Expand All @@ -54,11 +35,6 @@

php_flag suhosin.session.cryptua off

###########################################
# turn off compatibility with PHP4 when dealing with objects

php_flag zend.ze1_compatibility_mode Off

</IfModule>

<IfModule mod_security.c>
Expand Down
3 changes: 0 additions & 3 deletions media/.htaccess
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
Options All -Indexes
<IfModule mod_php5.c>
php_flag engine 0
</IfModule>
<IfModule mod_php7.c>
php_flag engine 0
</IfModule>
Expand Down

0 comments on commit aa14d40

Please sign in to comment.