httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sl...@apache.org
Subject svn commit: r160085 - httpd/httpd/branches/simple-conf/docs/conf/httpd.conf.in
Date Mon, 04 Apr 2005 18:55:19 GMT
Author: slive
Date: Mon Apr  4 11:55:18 2005
New Revision: 160085

URL: http://svn.apache.org/viewcvs?view=rev&rev=160085
Log:
Put all the stuff related to MIME-types in the same general
area and move the EnableSendFile/EnableMMAP directives down to the
bottom in the "fix broken stuff" section.

Modified:
    httpd/httpd/branches/simple-conf/docs/conf/httpd.conf.in

Modified: httpd/httpd/branches/simple-conf/docs/conf/httpd.conf.in
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/simple-conf/docs/conf/httpd.conf.in?view=diff&r1=160084&r2=160085
==============================================================================
--- httpd/httpd/branches/simple-conf/docs/conf/httpd.conf.in (original)
+++ httpd/httpd/branches/simple-conf/docs/conf/httpd.conf.in Mon Apr  4 11:55:18 2005
@@ -208,34 +208,6 @@
     Deny from all
 </FilesMatch>
 
-<IfModule mime_module>
-    #
-    # TypesConfig describes where the mime.types file (or equivalent) is
-    # to be found.
-    #
-    TypesConfig @rel_sysconfdir@/mime.types
-</IfModule>
-
-#
-# DefaultType is the default MIME type the server will use for a document
-# if it cannot otherwise determine one, such as from filename extensions.
-# If your server contains mostly text or HTML documents, "text/plain" is
-# a good value.  If most of your content is binary, such as applications
-# or images, you may want to use "application/octet-stream" instead to
-# keep browsers from trying to display binary files as though they are
-# text.
-#
-DefaultType text/plain
-
-#
-# The mod_mime_magic module allows the server to use various hints from the
-# contents of the file itself to determine its type.  The MIMEMagicFile
-# directive tells the module where the hint definitions are located.
-#
-<IfModule mime_magic_module>
-    MIMEMagicFile @rel_sysconfdir@/magic
-</IfModule>
-
 #
 # HostnameLookups: Log the names of clients or just their IP addresses
 # e.g., www.apache.org (on) or 204.62.129.132 (off).
@@ -246,16 +218,6 @@
 #
 HostnameLookups Off
 
-# EnableMMAP and EnableSendfile: On systems that support it, 
-# memory-mapping or the sendfile syscall is used to deliver
-# files.  This usually improves server performance, but must
-# be turned off when serving from networked-mounted 
-# filesystems or if support for these functions is otherwise
-# broken on your system.
-#
-#EnableMMAP off
-#EnableSendfile off
-
 #
 # ErrorLog: The location of the error log file.
 # If you do not specify an ErrorLog directive within a <VirtualHost>
@@ -349,11 +311,27 @@
     Allow from all
 </Directory>
 
+#
+# DefaultType is the default MIME type the server will use for a document
+# if it cannot otherwise determine one, such as from filename extensions.
+# If your server contains mostly text or HTML documents, "text/plain" is
+# a good value.  If most of your content is binary, such as applications
+# or images, you may want to use "application/octet-stream" instead to
+# keep browsers from trying to display binary files as though they are
+# text.
+#
+DefaultType text/plain
+
 <IfModule mime_module>
+    #
+    # TypesConfig points to the file containing the list of mappings from
+    # filename extension to MIME-type.
+    #
+    TypesConfig @rel_sysconfdir@/mime.types
 
     #
     # AddType allows you to add to or override the MIME configuration
-    # file mime.types for specific file types.
+    # file specified in TypesConfig for specific file types.
     #
     #AddType application/x-gzip .tgz
     #
@@ -407,6 +385,15 @@
 </IfModule>
 
 #
+# The mod_mime_magic module allows the server to use various hints from the
+# contents of the file itself to determine its type.  The MIMEMagicFile
+# directive tells the module where the hint definitions are located.
+#
+<IfModule mime_magic_module>
+    MIMEMagicFile @rel_sysconfdir@/magic
+</IfModule>
+
+#
 # Action lets you define media types that will execute a script whenever
 # a matching file is called. This eliminates the need for repeated URL
 # pathnames for oft-used CGI file processors.
@@ -450,6 +437,15 @@
     BrowserMatch "^XML Spy" redirect-carefully
 </IfModule>
 
+# EnableMMAP and EnableSendfile: On systems that support it, 
+# memory-mapping or the sendfile syscall is used to deliver
+# files.  This usually improves server performance, but must
+# be turned off when serving from networked-mounted 
+# filesystems or if support for these functions is otherwise
+# broken on your system.
+#
+#EnableMMAP off
+#EnableSendfile off
 
 ### Section 3: Supplemental configuration
 #



Mime
View raw message