buildfluff

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

diff --git a/docs/manual/dso.xml.ja b/docs/manual/dso.xml.ja
index 2109b899522d406e904db0318f4716efdffcc415..0ea5f9c633461bb00e95776e08a4c1e053336260 100644 (file)
--- a/docs/manual/dso.xml.ja
+++ b/docs/manual/dso.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-2022-jp" ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
-<!-- English Revision: 420990 -->
+<!-- English Revision: 420990:578697 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/dso.xml.ko b/docs/manual/dso.xml.ko
index 29b9fb93540c2b6187ea42adb01133f4062faece..c7deab6c59c389c42eaac4ce4806c402b2507883 100644 (file)
--- a/docs/manual/dso.xml.ko
+++ b/docs/manual/dso.xml.ko
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="EUC-KR" ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ko.xsl"?>
-<!-- English Revision: 105989:420990 (outdated) -->
+<!-- English Revision: 105989:578697 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/dso.xml.meta b/docs/manual/dso.xml.meta
index 318174a753da448cfcaef79ee1c09378f7448162..47355afd3325f425c1ea1fc1e87d2b96277b57f5 100644 (file)
--- a/docs/manual/dso.xml.meta
+++ b/docs/manual/dso.xml.meta
@@ -7,7 +7,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant>ja</variant>
+    <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
   </variants>
 </metafile>

diff --git a/docs/manual/env.xml.ja b/docs/manual/env.xml.ja
index 0ad56a40f741df9a91b28c701dce3580d05c13c5..c4357528af50c82af75438a7c59ed60175a92c23 100644 (file)
--- a/docs/manual/env.xml.ja
+++ b/docs/manual/env.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-2022-jp" ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
-<!-- English Revision: 420990:434071 (outdated) -->
+<!-- English Revision: 420990:580734 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/env.xml.ko b/docs/manual/env.xml.ko
index e1611aafb8359f8ecf34f5e37956b72cd4816b35..5e79e2e46c14098b7003247d45b0b537a352f3b2 100644 (file)
--- a/docs/manual/env.xml.ko
+++ b/docs/manual/env.xml.ko
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="EUC-KR" ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ko.xsl"?>
-<!-- English Revision: 105989:434071 (outdated) -->
+<!-- English Revision: 105989:580734 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index 7de1b66543ef7ccbc11c43469183ac67eb87c61a..edb28c9a9e9255948e23f7982416d24b68969ec7 100644 (file)
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -570,7 +570,7 @@ headers</td></tr>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>MIME content-type that will be sent if the
 server cannot determine a type in any other way</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>DefaultType <var>MIME-type</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>DefaultType <var>MIME-type|none</var></code></td></tr>
 <tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>DefaultType text/plain</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>
@@ -591,6 +591,17 @@ server cannot determine a type in any other way</td></tr>
     <p>would be appropriate for a directory which contained many GIF
     images with filenames missing the <code>.gif</code> extension.</p>
 
+    <p>Sometimes it may be better to omit the MIME type altogether if it
+    cannot be determined by the server.  This can be accomplished using</p>
+    <div class="example"><p><code>
+      DefaultType None
+    </code></p></div>
+    <p>DefaultType None is only available in httpd-2.2.7 and later.</p>
+
+    <p>This can be suppressed by setting <code>DefaultType None</code>.
+    With this setting, Apache will omit <em>any</em> Content-Type
+    header if it not able to determine the correct MIME type.</p>
+
     <p>Note that unlike <code class="directive"><a href="#forcetype">ForceType</a></code>, this directive only
     provides the default mime-type. All other mime-type definitions,
     including filename extensions, that might identify the media type

diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de
index 23b1358dbbbf15b808d755a8c9b54343a53a39d1..747f686e84c1ab46cc9a277d1bc98302f3ec56da 100644 (file)
--- a/docs/manual/mod/core.xml.de
+++ b/docs/manual/mod/core.xml.de
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.de.xsl"?>
-<!-- English Revision: 167959:574882 (outdated) -->
+<!-- English Revision: 167959:580502 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/mod/core.xml.ja b/docs/manual/mod/core.xml.ja
index acf87a511a82a5e6579784ca578d480d5553cb44..5d9a1eb81ce604c9a6e621435da6aab757b8645a 100644 (file)
--- a/docs/manual/mod/core.xml.ja
+++ b/docs/manual/mod/core.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-2022-jp"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 190982:574882 (outdated) -->
+<!-- English Revision: 190982:580502 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/mod/mod_dbd.html.en b/docs/manual/mod/mod_dbd.html.en
index dd6fceac5792b80a276d1cfc0cc82dddae6f77a9..8ab7ad4a18644c057080c4b9ccd60d12afa63aa7 100644 (file)
--- a/docs/manual/mod/mod_dbd.html.en
+++ b/docs/manual/mod/mod_dbd.html.en
@@ -195,6 +195,8 @@ APR_DECLARE_OPTIONAL_FN(void, ap_dbd_prepare, (server_rec*, const char*, const c
     password, database name, hostname and port number for connection.</p>
     <p>Connection string parameters for current drivers include:</p>
     <dl>
+    <dt>FreeTDS (for MSSQL and SyBase)</dt>
+    <dd>username, password, appname, dbname, host, charset, lang, server</dd>
     <dt>MySQL</dt>
     <dd>host, port, user, pass, dbname, sock</dd> 
     <dt>Oracle</dt>
@@ -205,6 +207,9 @@ APR_DECLARE_OPTIONAL_FN(void, ap_dbd_prepare, (server_rec*, const char*, const c
     <dd>The connection string is split on a colon, and <code>part1:part2</code> is used as <code>sqlite_open(part1, atoi(part2), NULL)</code></dd>
     <dt>SQLite3</dt>
     <dd>The connection string is passed straight through to <code>sqlite3_open</code></dd>
+    <dt>ODBC</dt>
+    <dd>Please see <a href="http://code.google.com/p/odbc-dbd/">the
+        author's project pages</a> for this third-party driver.</dd>
     </dl>
 
 </div>

diff --git a/docs/manual/mod/mod_log_config.html.en b/docs/manual/mod/mod_log_config.html.en
index 4a2410f02ef61131fc5a93211e7babc46831a013..ec350270b76b0cad4de4424060cbfa5201c9698f 100644 (file)
--- a/docs/manual/mod/mod_log_config.html.en
+++ b/docs/manual/mod/mod_log_config.html.en
@@ -120,42 +120,47 @@
         in the reply.</td></tr>
 <tr><td><code>%p</code></td>
         <td>The canonical port of the server serving the request</td></tr>
-<tr class="odd"><td><code>%P</code></td>
+<tr class="odd"><td><code>%{<var>format</var>}p</code></td>
+        <td>The canonical port of the server serving the request or the
+        server's actual port or the client's actual port.  Valid formats
+        are <code>canonical</code>, <code>local</code>, or <code>remote</code>.
+        </td></tr>
+<tr><td><code>%P</code></td>
         <td>The process ID of the child that serviced the request.</td></tr>
-<tr><td><code>%{<var>format</var>}P</code></td>
+<tr class="odd"><td><code>%{<var>format</var>}P</code></td>
         <td>The process ID or thread id of the child that serviced the 
         request.  Valid formats are <code>pid</code>, <code>tid</code>,
         and <code>hextid</code>.  <code>hextid</code> requires APR 1.2.0 or 
         higher.
         </td></tr>
-<tr class="odd"><td><code>%q</code></td>
+<tr><td><code>%q</code></td>
         <td>The query string (prepended with a <code>?</code> if a query
         string exists, otherwise an empty string)</td></tr>
-<tr><td><code>%r</code></td>
+<tr class="odd"><td><code>%r</code></td>
         <td>First line of request</td></tr>
-<tr class="odd"><td><code>%s</code></td>
+<tr><td><code>%s</code></td>
         <td>Status. For requests that got internally redirected, this is
         the status of the *original* request --- <code>%&gt;s</code>
         for the last.</td></tr>
-<tr><td><code>%t</code></td>
+<tr class="odd"><td><code>%t</code></td>
         <td>Time the request was received (standard english
         format)</td></tr>
-<tr class="odd"><td><code>%{<var>format</var>}t</code></td>
+<tr><td><code>%{<var>format</var>}t</code></td>
         <td>The time, in the form given by format, which should be in
         <code>strftime(3)</code> format. (potentially localized)</td></tr>
-<tr><td><code>%T</code></td>
+<tr class="odd"><td><code>%T</code></td>
         <td>The time taken to serve the request, in seconds.</td></tr>
-<tr class="odd"><td><code>%u</code></td>
+<tr><td><code>%u</code></td>
         <td>Remote user (from auth; may be bogus if return status
         (<code>%s</code>) is 401)</td></tr>
-<tr><td><code>%U</code></td>
+<tr class="odd"><td><code>%U</code></td>
         <td>The URL path requested, not including any query string.</td></tr>
-<tr class="odd"><td><code>%v</code></td>
+<tr><td><code>%v</code></td>
         <td>The canonical <code class="directive"><a href="../mod/core.html#servername">ServerName</a></code>
         of the server serving the request.</td></tr>
-<tr><td><code>%V</code></td>
+<tr class="odd"><td><code>%V</code></td>
         <td>The server name according to the <code class="directive"><a href="../mod/core.html#usecanonicalname">UseCanonicalName</a></code> setting.</td></tr>
-<tr class="odd"><td><code>%X</code></td>
+<tr><td><code>%X</code></td>
         <td>Connection status when response is completed:
 
         <table>
@@ -173,10 +178,10 @@
         <p>(This directive was <code>%c</code> in late versions of Apache
         1.3, but this conflicted with the historical ssl
         <code>%{<var>var</var>}c</code> syntax.)</p></td></tr>
-<tr><td><code>%I</code></td>
+<tr class="odd"><td><code>%I</code></td>
         <td>Bytes received, including request and headers, cannot be zero.
         You need to enable <code class="module"><a href="../mod/mod_logio.html">mod_logio</a></code> to use this.</td></tr>
-<tr class="odd"><td><code>%O</code></td>
+<tr><td><code>%O</code></td>
         <td>Bytes sent, including headers, cannot be zero. You need to
         enable <code class="module"><a href="../mod/mod_logio.html">mod_logio</a></code> to use this.</td></tr>
 </table>

diff --git a/docs/manual/mod/mod_log_config.xml.ja b/docs/manual/mod/mod_log_config.xml.ja
index 359cd3f4c8f104d6fb74f4c2ab6d6c7bda2b5333..acad178e927d259df560106d972366edc570ed25 100644 (file)
--- a/docs/manual/mod/mod_log_config.xml.ja
+++ b/docs/manual/mod/mod_log_config.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-2022-jp"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 420990 -->
+<!-- English Revision: 420990:579425 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/mod/mod_log_config.xml.ko b/docs/manual/mod/mod_log_config.xml.ko
index ee68091a8b092319aaa5b04d9bcd65687913edeb..93958423add69080b46f3616544022c404cb0f14 100644 (file)
--- a/docs/manual/mod/mod_log_config.xml.ko
+++ b/docs/manual/mod/mod_log_config.xml.ko
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="EUC-KR" ?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 105989:420990 (outdated) -->
+<!-- English Revision: 105989:579425 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/mod/mod_log_config.xml.meta b/docs/manual/mod/mod_log_config.xml.meta
index 34d03d2b3e8803393f4aa252ff8983a156ce8068..f9817111e816ea5f9254d8c186b650b32a93c9e0 100644 (file)
--- a/docs/manual/mod/mod_log_config.xml.meta
+++ b/docs/manual/mod/mod_log_config.xml.meta
@@ -7,7 +7,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant>ja</variant>
+    <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
   </variants>
 </metafile>

diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en
index 2219a639cfebcecda417730d8805207ce34dc445..ef53e2853f05deefcce06c7f29deb4eccc20c91b 100644 (file)
--- a/docs/manual/mod/quickreference.html.en
+++ b/docs/manual/mod/quickreference.html.en
@@ -281,7 +281,7 @@ a DAV resource</td></tr>
 configured</td></tr>
 <tr><td><a href="mod_mime.html#defaultlanguage">DefaultLanguage <var>MIME-lang</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sets all files in the given scope to the specified
 language</td></tr>
-<tr class="odd"><td><a href="core.html#defaulttype">DefaultType <var>MIME-type</var></a></td><td> text/plain </td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">MIME content-type that will be sent if the
+<tr class="odd"><td><a href="core.html#defaulttype">DefaultType <var>MIME-type|none</var></a></td><td> text/plain </td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">MIME content-type that will be sent if the
 server cannot determine a type in any other way</td></tr>
 <tr><td><a href="core.html#define">Define <var>parameter-name</var></a></td><td></td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">Define the existence of a variable</td></tr>
 <tr class="odd"><td><a href="mod_deflate.html#deflatebuffersize">DeflateBufferSize <var>value</var></a></td><td> 8096 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Fragment size to be compressed at one time by zlib</td></tr>