httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From humbed...@apache.org
Subject svn commit: r1519279 [1/3] - in /httpd/httpd/trunk/docs/manual: ./ howto/ mod/ vhosts/
Date Sun, 01 Sep 2013 15:12:48 GMT
Author: humbedooh
Date: Sun Sep  1 15:12:48 2013
New Revision: 1519279

URL: http://svn.apache.org/r1519279
Log:
some xforms

Modified:
    httpd/httpd/trunk/docs/manual/caching.xml.meta
    httpd/httpd/trunk/docs/manual/howto/htaccess.html.en
    httpd/httpd/trunk/docs/manual/howto/htaccess.xml.ja
    httpd/httpd/trunk/docs/manual/howto/htaccess.xml.ko
    httpd/httpd/trunk/docs/manual/howto/htaccess.xml.pt-br
    httpd/httpd/trunk/docs/manual/mod/directives.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_cache.xml.meta
    httpd/httpd/trunk/docs/manual/mod/mod_deflate.xml.meta
    httpd/httpd/trunk/docs/manual/mod/mod_ldap.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_lua.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_lua.xml.fr
    httpd/httpd/trunk/docs/manual/mod/mod_lua.xml.meta
    httpd/httpd/trunk/docs/manual/mod/mod_macro.xml.meta
    httpd/httpd/trunk/docs/manual/mod/mod_negotiation.xml.meta
    httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.ja
    httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.meta
    httpd/httpd/trunk/docs/manual/mod/quickreference.html.en
    httpd/httpd/trunk/docs/manual/vhosts/name-based.xml.meta

Modified: httpd/httpd/trunk/docs/manual/caching.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/caching.xml.meta?rev=1519279&r1=1519278&r2=1519279&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/caching.xml.meta (original)
+++ httpd/httpd/trunk/docs/manual/caching.xml.meta Sun Sep  1 15:12:48 2013
@@ -8,7 +8,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant outdated="yes">fr</variant>
+    <variant>fr</variant>
     <variant outdated="yes">tr</variant>
   </variants>
 </metafile>

Modified: httpd/httpd/trunk/docs/manual/howto/htaccess.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/howto/htaccess.html.en?rev=1519279&r1=1519278&r2=1519279&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/howto/htaccess.html.en (original)
+++ httpd/httpd/trunk/docs/manual/howto/htaccess.html.en Sun Sep  1 15:12:48 2013
@@ -259,7 +259,7 @@ changes on a per-directory basis.</p>
 
     <p>As discussed in the documentation on <a href="../sections.html">Configuration
Sections</a>,
     <code>.htaccess</code> files can override the <code class="directive"><a
href="../mod/core.html#directory">&lt;Directory&gt;</a></code> sections
for
-    the corresponding directory, but will be overriden by other types
+    the corresponding directory, but will be overridden by other types
     of configuration sections from the main configuration files. This
     fact can be used to enforce certain configurations, even in the
     presence of a liberal <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code>
setting. For example, to

Modified: httpd/httpd/trunk/docs/manual/howto/htaccess.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/howto/htaccess.xml.ja?rev=1519279&r1=1519278&r2=1519279&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/howto/htaccess.xml.ja [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/howto/htaccess.xml.ja [utf-8] Sun Sep  1 15:12:48 2013
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 574882:1369729 (outdated) -->
+<!-- English Revision: 574882:1517962 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

Modified: httpd/httpd/trunk/docs/manual/howto/htaccess.xml.ko
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/howto/htaccess.xml.ko?rev=1519279&r1=1519278&r2=1519279&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/howto/htaccess.xml.ko [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/howto/htaccess.xml.ko [euc-kr] Sun Sep  1 15:12:48 2013
@@ -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: 151408:1369729 (outdated) -->
+<!-- English Revision: 151408:1517962 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

Modified: httpd/httpd/trunk/docs/manual/howto/htaccess.xml.pt-br
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/howto/htaccess.xml.pt-br?rev=1519279&r1=1519278&r2=1519279&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/howto/htaccess.xml.pt-br (original)
+++ httpd/httpd/trunk/docs/manual/howto/htaccess.xml.pt-br Sun Sep  1 15:12:48 2013
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.pt-br.xsl"?>
-<!-- English Revision: 151408:1369729 (outdated) -->
+<!-- English Revision: 151408:1517962 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

Modified: httpd/httpd/trunk/docs/manual/mod/directives.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/directives.html.en?rev=1519279&r1=1519278&r2=1519279&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/directives.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/directives.html.en Sun Sep  1 15:12:48 2013
@@ -362,6 +362,7 @@
 <li><a href="mod_lua.html#luahookcheckuserid">LuaHookCheckUserID</a></li>
 <li><a href="mod_lua.html#luahookfixups">LuaHookFixups</a></li>
 <li><a href="mod_lua.html#luahookinsertfilter">LuaHookInsertFilter</a></li>
+<li><a href="mod_lua.html#luahooklog">LuaHookLog</a></li>
 <li><a href="mod_lua.html#luahookmaptostorage">LuaHookMapToStorage</a></li>
 <li><a href="mod_lua.html#luahooktranslatename">LuaHookTranslateName</a></li>
 <li><a href="mod_lua.html#luahooktypechecker">LuaHookTypeChecker</a></li>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_cache.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_cache.xml.meta?rev=1519279&r1=1519278&r2=1519279&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_cache.xml.meta (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_cache.xml.meta Sun Sep  1 15:12:48 2013
@@ -8,7 +8,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant outdated="yes">fr</variant>
+    <variant>fr</variant>
     <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
   </variants>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_deflate.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_deflate.xml.meta?rev=1519279&r1=1519278&r2=1519279&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_deflate.xml.meta (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_deflate.xml.meta Sun Sep  1 15:12:48 2013
@@ -8,7 +8,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant outdated="yes">fr</variant>
+    <variant>fr</variant>
     <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
   </variants>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_ldap.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_ldap.html.en?rev=1519279&r1=1519278&r2=1519279&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_ldap.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_ldap.html.en Sun Sep  1 15:12:48 2013
@@ -609,7 +609,7 @@ valid</td></tr>
 <div class="directive-section"><h2><a name="LDAPReferrals" id="LDAPReferrals">LDAPReferrals</a>
<a name="ldapreferrals" id="ldapreferrals">Directive</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Enable
referral chasing during queries to the LDAP server.</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LDAPReferrals
<var>On|Off</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LDAPReferrals
On|Off|default</code></td></tr>
 <tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>LDAPReferrals
On</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>AuthConfig</td></tr>
@@ -617,12 +617,33 @@ valid</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_ldap</td></tr>
 </table>
     <p>Some LDAP servers divide their directory among multiple domains and use referrals
-    to direct a client when a domain boundary is crossed. By setting <code>LDAPReferrals
On</code>
-    referrals will be chased (setting it to off causes referrals to be ignored). The directive
-    <code>LDAPReferralHopLimit</code> works in conjunction with this directive
to limit the
-    number of referral hops to follow before terminating the LDAP query. When referral processing
-    is enabled client credentials will be provided, via a rebind callback, for any LDAP server
-    requiring them. </p>
+    to direct a client when a domain boundary is crossed. This is similar to a HTTP redirect.
+    LDAP client libraries may or may not chase referrals by default. This directive 
+    explicitly configures the referral chasing in the underlying SDK.</p> 
+    
+  
+    <p><code class="directive">LDAPReferrals</code> takes the takes the
following values:
+    <dl>
+     <dt>"on"</dt>
+     <dd> <p> When set to "on", the underlying SDK's referral chasing state
+              is enabled, <code class="directive">LDAPReferralHopLimit</code>
is used to 
+              override the SDK's hop limit, and an LDAP rebind callback is 
+              registered.</p></dd>
+     <dt>"off"</dt>
+     <dd> <p> When set to "off", the underlying SDK's referral chasing state
+              is disabled completely.</p></dd>
+     <dt>"default"</dt>
+     <dd> <p> When set to "default", the underlying SDK's referral chasing state
+              is not changed, <code class="directive">LDAPReferralHopLimit</code>
is not 
+              used to overide the SDK's hop limit, and no LDAP rebind callback is 
+              registered.</p></dd>
+    </dl>
+    </p>
+
+    <p> The directive <code>LDAPReferralHopLimit</code> works in conjunction
with
+    this directive to limit the number of referral hops to follow before terminating the
LDAP query.
+    When referral processing is enabled by a value of "On", client credentials will be provided,

+    via a rebind callback, for any LDAP server requiring them. </p>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"
/></a></div>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_lua.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_lua.html.en?rev=1519279&r1=1519278&r2=1519279&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_lua.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_lua.html.en Sun Sep  1 15:12:48 2013
@@ -67,6 +67,7 @@ trust, as it can be abused to change the
 <li><img alt="" src="../images/down.gif" /> <a href="#luahookcheckuserid">LuaHookCheckUserID</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#luahookfixups">LuaHookFixups</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#luahookinsertfilter">LuaHookInsertFilter</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#luahooklog">LuaHookLog</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#luahookmaptostorage">LuaHookMapToStorage</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#luahooktranslatename">LuaHookTranslateName</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#luahooktypechecker">LuaHookTypeChecker</a></li>
@@ -312,9 +313,10 @@ performing access control, or setting mi
     </tr>
 <tr class="odd">
         <td>Logging</td>
-        <td>(none)</td>
+        <td><code class="directive"><a href="#luahooklog">LuaHookLog</a></code></td>
         <td>Once a request has been handled, it enters several logging phases, 
-            which logs the request in either the error or access log</td>
+            which logs the request in either the error or access log. Mod_lua
+            is able to hook into the start of this and control logging output.</td>
     </tr>
 </table>
 
@@ -1483,6 +1485,56 @@ processing</td></tr>
 </table><p>Not Yet Implemented</p>
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"
/></a></div>
+<div class="directive-section"><h2><a name="LuaHookLog" id="LuaHookLog">LuaHookLog</a>
<a name="luahooklog" id="luahooklog">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Provide
a hook for the access log phase of a request
+processing</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LuaHookLog
 /path/to/lua/script.lua log_function_name</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>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr>
+</table>
+<p>
+    This simple logging hook allows you to run a function when httpd enters the 
+    logging phase of a request. With it, you can append data to your own logs, 
+    manipulate data before the regular log is written, or prevent a log entry 
+    from being created. To prevent the usual logging from happening, simply return
+    <code>apache2.DONE</code> in your logging handler, otherwise return 
+    <code>apache2.OK</code> to tell httpd to log as normal.
+</p>
+<p>Example:</p>
+<pre class="prettyprint lang-config">
+LuaHookLog /path/to/script.lua logger
+</pre>
+
+<pre class="prettyprint lang-lua">
+-- /path/to/script.lua --
+function logger(r)
+    -- flip a coin:
+    -- If 1, then we write to our own Lua log and tell httpd not to log
+    -- in the main log.
+    -- If 2, then we just sanitize the output a bit and tell httpd to 
+    -- log the sanitized bits.
+
+    if math.random(1,2) == 1 then
+        -- Log stuff ourselves and don't log in the regular log
+        local f = io.open("/foo/secret.log", "a")
+        if f then
+            f:write("Something secret happened at " .. r.uri .. "\n")
+            f:close()
+        end
+        return apache2.DONE -- Tell httpd not to use the regular logging functions
+    else
+        r.uri = r.uri:gsub("somesecretstuff", "") -- sanitize the URI
+        return apache2.OK -- tell httpd to log it.
+    end
+end
+</pre>
+
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"
/></a></div>
 <div class="directive-section"><h2><a name="LuaHookMapToStorage" id="LuaHookMapToStorage">LuaHookMapToStorage</a>
<a name="luahookmaptostorage" id="luahookmaptostorage">Directive</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Provide
a hook for the map_to_storage phase of request processing</td></tr>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_lua.xml.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_lua.xml.fr?rev=1519279&r1=1519278&r2=1519279&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_lua.xml.fr (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_lua.xml.fr Sun Sep  1 15:12:48 2013
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision : 1498179 -->
+<!-- English Revision: 1498179:1519277 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 

Modified: httpd/httpd/trunk/docs/manual/mod/mod_lua.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_lua.xml.meta?rev=1519279&r1=1519278&r2=1519279&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_lua.xml.meta (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_lua.xml.meta Sun Sep  1 15:12:48 2013
@@ -8,6 +8,6 @@
 
   <variants>
     <variant>en</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
   </variants>
 </metafile>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_macro.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_macro.xml.meta?rev=1519279&r1=1519278&r2=1519279&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_macro.xml.meta (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_macro.xml.meta Sun Sep  1 15:12:48 2013
@@ -8,6 +8,6 @@
 
   <variants>
     <variant>en</variant>
-    <variant outdated="yes">fr</variant>
+    <variant>fr</variant>
   </variants>
 </metafile>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_negotiation.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_negotiation.xml.meta?rev=1519279&r1=1519278&r2=1519279&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_negotiation.xml.meta (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_negotiation.xml.meta Sun Sep  1 15:12:48 2013
@@ -8,7 +8,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant outdated="yes">fr</variant>
+    <variant>fr</variant>
     <variant outdated="yes">ja</variant>
   </variants>
 </metafile>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.ja?rev=1519279&r1=1519278&r2=1519279&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.ja [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.ja [utf-8] Sun Sep  1 15:12:48 2013
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 344971:1517406 (outdated) -->
+<!-- English Revision: 344971:1518023 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.meta?rev=1519279&r1=1519278&r2=1519279&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.meta (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.meta Sun Sep  1 15:12:48 2013
@@ -8,7 +8,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant outdated="yes">fr</variant>
+    <variant>fr</variant>
     <variant outdated="yes">ja</variant>
   </variants>
 </metafile>



Mime
View raw message