]> git.pld-linux.org Git - packages/apache.git/commitdiff
- The DefaultType directive no longer has any effect
authorAdam Gołębiowski <adamg@pld-linux.org>
Sat, 25 Feb 2012 22:51:39 +0000 (22:51 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
- include -> includeoptional

Changed files:
    apache-httpd.conf -> 1.59

apache-httpd.conf

index 613e5336f58bbab77105281595916f4ee29a4423..99c8dc2f8999df48cf24377e21393d169dc5a33d 100644 (file)
@@ -10,7 +10,6 @@
 # for a discussion of each configuration directive.
 
 ServerRoot "/etc/httpd"
-DefaultType text/plain
 
 # User/Group: The name (or #number) of the user/group to run httpd as.
 # It is usually good practice to create a dedicated user and group for
@@ -67,10 +66,10 @@ HostnameLookups Off
 TraceEnable Off
 
 # Include other modules and packages config.
-Include conf.d/*.conf
+IncludeOptional conf.d/*.conf
 
 # Include webapps config
-Include webapps.d/*.conf
+IncludeOptional webapps.d/*.conf
 
 <IfModule alias_module>
        # ScriptAlias: This controls which directories contain server scripts.
@@ -110,4 +109,4 @@ NameVirtualHost *:80
 #      TransferLog logs/host.example.com-access_log
 </VirtualHost>
 
-Include vhosts.d/*.conf
+IncludeOptional vhosts.d/*.conf
This page took 0.187668 seconds and 4 git commands to generate.