Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(165)

Unified Diff: third_party/WebKit/Tools/Scripts/apache_config/debian-httpd-2.4.conf

Issue 2502893002: Update Debian and Ubuntu Apache configuration. (Closed)
Patch Set: Avoid duplication Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « AUTHORS ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Tools/Scripts/apache_config/debian-httpd-2.4.conf
diff --git a/third_party/WebKit/Tools/Scripts/apache_config/debian-httpd-2.4.conf b/third_party/WebKit/Tools/Scripts/apache_config/debian-httpd-2.4.conf
index b1e641513698a0714e9f6e30f9f53746773d9ac6..978e441ab13cf6c3d7b3c09ee720dee7297783af 100644
--- a/third_party/WebKit/Tools/Scripts/apache_config/debian-httpd-2.4.conf
+++ b/third_party/WebKit/Tools/Scripts/apache_config/debian-httpd-2.4.conf
@@ -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
@@ -113,19 +113,17 @@ AddOutputFilter INCLUDES .shtml
AddHandler send-as-is asis
-<IfModule mod_php5.c>
Jack Bates 2016/11/15 15:48:47 The module is loaded unconditionally, so <IfModule
- 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
« no previous file with comments | « AUTHORS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698