Skip to content

Commit

Permalink
Update Debian and Ubuntu Apache configuration.
Browse files Browse the repository at this point in the history
Support PHP 7 for Stretch, Xenial and later,
and version 5 for Jessie, Wily and earlier.

BUG=621694

Review-Url: https://codereview.chromium.org/2502893002
Cr-Commit-Position: refs/heads/master@{#432542}
  • Loading branch information
jablko authored and Commit bot committed Nov 16, 2016
1 parent 5ab336c commit a13cddf
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 11 deletions.
1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,7 @@ Ion Rosca <rosca@adobe.com>
Isaac Reilly <reillyi@amazon.com>
Ivan Sham <ivansham@amazon.com>
J. Ryan Stinnett <jryans@chromium.org>
Jack Bates <jack@nottheoilrig.com>
Jacob Mandelson <jacob@mandelson.org>
Jaehun Lim <ljaehun.lim@samsung.com>
Jaekyeom Kim <btapiz@gmail.com>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ LoadModule alias_module modules/mod_alias.so
LoadModule rewrite_module modules/mod_rewrite.so
LoadModule cgi_module modules/mod_cgi.so
LoadModule ssl_module modules/mod_ssl.so
LoadModule php5_module modules/libphp5.so
Include /etc/apache2/mods-available/php*.load
LoadModule asis_module modules/mod_asis.so

ServerName 127.0.0.1
Expand Down Expand Up @@ -113,19 +113,17 @@ AddOutputFilter INCLUDES .shtml

AddHandler send-as-is asis

<IfModule mod_php5.c>
AddType application/x-httpd-php .php
AddType application/x-httpd-php .bat
AddType application/x-httpd-php-source .phps
AddType application/x-httpd-php .php
AddType application/x-httpd-php .bat
AddType application/x-httpd-php-source .phps

<IfModule mod_dir.c>
DirectoryIndex index.html index.php
</IfModule>

php_flag log_errors on
php_flag short_open_tag on
<IfModule mod_dir.c>
DirectoryIndex index.html index.php
</IfModule>

php_flag log_errors on
php_flag short_open_tag on

<IfModule mod_rewrite.c>
RewriteEngine On
RewriteCond %{REQUEST_METHOD} ^TRACE
Expand Down

0 comments on commit a13cddf

Please sign in to comment.