discovered some useful stuff in the code,

see: server/core.c:core_override_type

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97218 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index 6600a42ff8b590e8042773903c541ef3e7b65eed..5fb53d23b455e4262f09cdacd5dd45fdcf27d22e 100644 (file)
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -844,7 +844,7 @@ filenames</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
     request is received</li></ul></div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="ForceType" id="ForceType">ForceType</a> <a name="forcetype" id="forcetype">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description: 
               </a></th><td>Forces all matching files to be served with the specified
 MIME content-type</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
-              </a></th><td><code>ForceType <var>MIME-type</var></code></td></tr><tr><th><a href="directive-dict.html#Context">Context:
+              </a></th><td><code>ForceType <var>MIME-type</var>|none</code></td></tr><tr><th><a href="directive-dict.html#Context">Context:
               </a></th><td>directory, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">Override:
               </a></th><td>FileInfo</td></tr><tr><th><a href="directive-dict.html#Status">Status:
               </a></th><td>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:
@@ -867,6 +867,25 @@ MIME content-type</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
     <p>Note that unlike <code class="directive"><a href="#defaulttype">DefaultType</a></code>,
     this directive overrides all mime-type associations, including
     filename extensions, that might identify the media type.</p>
+
+    <p>You can override any <code class="directive">ForceType</code> setting
+    by using the value of <code>none</code>:</p>
+
+    <div class="example"><p><code>
+      # force all files to be image/gif:<br />
+      &lt;Location /images&gt;<br />
+        <span class="indent">
+          ForceType image/gif<br />
+        </span>
+      &lt;/Location&gt;<br />
+      <br />
+      # but normal mime-type associations here:<br />
+      &lt;Location /images/mixed&gt;<br />
+      <span class="indent">
+        ForceType none<br />
+      </span>
+      &lt;/Location&gt;
+    </code></p></div>
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="HostnameLookups" id="HostnameLookups">HostnameLookups</a> <a name="hostnamelookups" id="hostnamelookups">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description: 
               </a></th><td>Enables DNS lookups on client IP addresses</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
               </a></th><td><code>HostnameLookups on|off|double</code></td></tr><tr><th><a href="directive-dict.html#Default">Default: 
@@ -2136,7 +2155,7 @@ is accessed by an incompatible browser</td></tr><tr><th><a href="directive-dict.
 <h3>See also</h3><ul><li><code class="directive"><a href="#serversignature">ServerSignature</a></code></li></ul></div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="SetHandler" id="SetHandler">SetHandler</a> <a name="sethandler" id="sethandler">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description: 
               </a></th><td>Forces all matching files to be processed by a
 handler</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax:
-              </a></th><td><code>SetHandler <var>handler-name</var></code></td></tr><tr><th><a href="directive-dict.html#Context">Context:
+              </a></th><td><code>SetHandler <var>handler-name</var>|none</code></td></tr><tr><th><a href="directive-dict.html#Context">Context:
               </a></th><td>server config, virtual host, directory, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">Override:
               </a></th><td>FileInfo</td></tr><tr><th><a href="directive-dict.html#Status">Status:
               </a></th><td>Core</td></tr><tr><th><a href="directive-dict.html#Module">Module:

diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index c081ca4b7886da8ffdc824c0c4c1026cec578a89..3816068ba5c0e50dc1d070bbd3d3c75f6605511d 100644 (file)
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -961,7 +961,7 @@ filenames</description>
 <name>ForceType</name>
 <description>Forces all matching files to be served with the specified
 MIME content-type</description>
-<syntax>ForceType <var>MIME-type</var></syntax>
+<syntax>ForceType <var>MIME-type</var>|none</syntax>
 <contextlist><context>directory</context><context>.htaccess</context>
 </contextlist>
 <override>FileInfo</override>
@@ -985,6 +985,25 @@ MIME content-type</description>
     <p>Note that unlike <directive module="core">DefaultType</directive>,
     this directive overrides all mime-type associations, including
     filename extensions, that might identify the media type.</p>
+
+    <p>You can override any <directive>ForceType</directive> setting
+    by using the value of <code>none</code>:</p>
+
+    <example>
+      # force all files to be image/gif:<br />
+      &lt;Location /images&gt;<br />
+        <indent>
+          ForceType image/gif<br />
+        </indent>
+      &lt;/Location&gt;<br />
+      <br />
+      # but normal mime-type associations here:<br />
+      &lt;Location /images/mixed&gt;<br />
+      <indent>
+        ForceType none<br />
+      </indent>
+      &lt;/Location&gt;
+    </example>
 </usage>
 </directivesynopsis>
 
@@ -2480,7 +2499,7 @@ is accessed by an incompatible browser</description>
 <name>SetHandler</name>
 <description>Forces all matching files to be processed by a
 handler</description>
-<syntax>SetHandler <var>handler-name</var></syntax>
+<syntax>SetHandler <var>handler-name</var>|none</syntax>
 <contextlist><context>server config</context><context>virtual host</context>
 <context>directory</context><context>.htaccess</context>
 </contextlist>

diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en
index 28537a86fb2097ee951fd90aed830ff34ba6c7d7..80888f5be81a7c5dbb40d5ff1cd188bb94edb64c 100644 (file)
--- a/docs/manual/mod/quickreference.html.en
+++ b/docs/manual/mod/quickreference.html.en
@@ -258,7 +258,7 @@ filenames</td></tr>
 filenames</td></tr>
 <tr><td><a href="mod_negotiation.html#forcelanguagepriority">ForceLanguagePriority None|Prefer|Fallback [Prefer|Fallback]</a></td><td> Prefer </td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Action to take if a single acceptable document is not 
 found</td></tr>
-<tr class="odd"><td><a href="core.html#forcetype">ForceType <var>MIME-type</var></a></td><td /><td>dh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Forces all matching files to be served with the specified
+<tr class="odd"><td><a href="core.html#forcetype">ForceType <var>MIME-type</var>|none</a></td><td /><td>dh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Forces all matching files to be served with the specified
 MIME content-type</td></tr>
 <tr><td><a href="mpm_common.html#group" id="G" name="G">Group <em>unix-group</em></a></td><td> #-1 </td><td>sv</td><td>M</td></tr><tr><td class="descr" colspan="4">Group under which the server will answer
 requests</td></tr>
@@ -512,7 +512,7 @@ is accessed by an incompatible browser</td></tr>
         [!]env-variable</em>[=<em>value</em>]
     [[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td /><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sets environment variables based on attributes of the request
 without respect to case</td></tr>
-<tr><td><a href="core.html#sethandler">SetHandler <var>handler-name</var></a></td><td /><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Forces all matching files to be processed by a
+<tr><td><a href="core.html#sethandler">SetHandler <var>handler-name</var>|none</a></td><td /><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Forces all matching files to be processed by a
 handler</td></tr>
 <tr class="odd"><td><a href="core.html#setinputfilter">SetInputFilter <var>filter</var>[;<var>filter</var>...]</a></td><td /><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the filters that will process client requests and POST
 input</td></tr>