httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From humbed...@apache.org
Subject svn commit: r1369762 - in /httpd/httpd/trunk/docs/manual: developer/lua.html.en howto/htaccess.html.en howto/htaccess.xml.fr howto/htaccess.xml.ja howto/htaccess.xml.ko howto/htaccess.xml.pt-br
Date Mon, 06 Aug 2012 09:41:16 GMT
Author: humbedooh
Date: Mon Aug  6 09:41:16 2012
New Revision: 1369762

URL: http://svn.apache.org/viewvc?rev=1369762&view=rev
Log:
xforms

Modified:
    httpd/httpd/trunk/docs/manual/developer/lua.html.en
    httpd/httpd/trunk/docs/manual/howto/htaccess.html.en
    httpd/httpd/trunk/docs/manual/howto/htaccess.xml.fr
    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

Modified: httpd/httpd/trunk/docs/manual/developer/lua.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/developer/lua.html.en?rev=1369762&r1=1369761&r2=1369762&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/developer/lua.html.en (original)
+++ httpd/httpd/trunk/docs/manual/developer/lua.html.en Mon Aug  6 09:41:16 2012
@@ -431,7 +431,7 @@ end
 <h2><a name="map_handler" id="map_handler">Example 5: Overlays using LuaMapHandler</a></h2>
 
 <pre class="prettyprint lang-config">
-LuaMaphandler ^/portal/([a-z]+)/   /path/to/lua/script.lua handle_$1
+LuaMapHandler ^/portal/([a-z]+)/   /path/to/lua/script.lua handle_$1
 </pre>
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"
/></a></div>
@@ -831,10 +831,6 @@ print(unescaped) -- prints "This is a te
 <br />
 <a href="#apache2.port">apache2.port</a>
 <br />
-<a href="#apache2.getenv">apache2.getenv</a>
-<br />
-<a href="#apache2.setenv">apache2.setenv</a>
-<br />
 <a href="#apache2.options">apache2.options</a>
 <br />
 <a href="#apache2.allowoverrides">apache2.allowoverrides</a>
@@ -843,8 +839,6 @@ print(unescaped) -- prints "This is a te
 <br />
 <a href="#apache2.add_input_filter">apache2.add_input_filter</a>
 <br />
-<a href="#apache2.add_output_filter">apache2.add_output_filter</a>
-<br />
 <a href="#apache2.get_basic_auth_pw">apache2.get_basic_auth_pw</a>
 <br />
 <a href="#apache2.get_limit_req_body">apache2.get_limit_req_body</a>
@@ -855,12 +849,10 @@ print(unescaped) -- prints "This is a te
 <br />
 <a href="#apache2.some_auth_required">apache2.some_auth_required</a>
 <br />
-<a href="#apache2.context_document_root">apache2.context_document_root</a>
-<br />
-<a href="#apache2.context_prefix">apache2.context_prefix</a>
-<br />
 <a href="#apache2.set_context_prefix">apache2.set_context_prefix</a>
 <br />
+<a href="#apache2.get_server_name_for_url">apache2.get_server_name_for_url</a>
+<br />
 <a href="#apache2.set_keepalive">apache2.set_keepalive</a>
 <br />
 <a href="#apache2.make_etag">apache2.make_etag</a>
@@ -912,40 +904,6 @@ apache2.add_input_filter(r, "SPAM_FILTER
 
 <p>&nbsp;</p>
 
-<h3><a name="apache2.add_output_filter" id="apache2.add_output_filter">apache2.add_output_filter(
-    request_rec<em>&nbsp;r</em>, &nbsp;string<em>&nbsp;filter</em>
-    )
-    </a></h3>
-
-<p>
-Adds an output filter to the request
-        </p>
-<p>
-<em>Arguments:</em>
-</p>
-<table class="bordered">
-<tr>
-<th>Argument</th>
-<th>Description</th>
-</tr>
-<tr>
-<td>r</td>
-<td>The mod_lua request handle</td>
-</tr>
-<tr>
-<td>filter</td>
-<td>The name of the filter handler to add</td>
-</tr>
-</table>
-<p>
-<em>Example:</em>
-</p>
-<pre class="prettyprint lang-lua">
-apache2.add_input_filter(r, "INCLUDES") -- Turn out output into an SSI-enabled document.
-        </pre>
-
-<p>&nbsp;</p>
-
 <h3><a name="apache2.allowoverrides" id="apache2.allowoverrides">apache2.allowoverrides(
     request_rec<em>&nbsp;r</em>
     )
@@ -1040,52 +998,6 @@ The current Authorization type used in t
         </p>
 <p>&nbsp;</p>
 
-<h3><a name="apache2.context_document_root" id="apache2.context_document_root">apache2.context_document_root(
-    request_rec<em>&nbsp;r</em>
-    )
-    </a></h3>
-
-<p>
-Get the context_document_root for a request. This is a generalization of the document root,
which is too limited in the presence of mappers like mod_userdir and mod_alias. The context_document_root
is the directory on disk that maps to the context_prefix URI prefix.
-        </p>
-<p>
-<em>Arguments:</em>
-</p>
-<table class="bordered">
-<tr>
-<th>Argument</th>
-<th>Description</th>
-</tr>
-<tr>
-<td>r</td>
-<td>The mod_lua request handle</td>
-</tr>
-</table>
-<p>&nbsp;</p>
-
-<h3><a name="apache2.context_prefix" id="apache2.context_prefix">apache2.context_prefix(
-    request_rec<em>&nbsp;r</em>
-    )
-    </a></h3>
-
-<p>
-Get the context_prefix for a request. The context_prefix URI prefix maps to the context_document_root
on disk.
-        </p>
-<p>
-<em>Arguments:</em>
-</p>
-<table class="bordered">
-<tr>
-<th>Argument</th>
-<th>Description</th>
-</tr>
-<tr>
-<td>r</td>
-<td>The mod_lua request handle</td>
-</tr>
-</table>
-<p>&nbsp;</p>
-
 <h3><a name="apache2.flush" id="apache2.flush">apache2.flush(
     request_rec<em>&nbsp;r</em>
     )
@@ -1182,7 +1094,7 @@ r:puts("You can't upload files bigger th
 <p>&nbsp;</p>
 
 <h3><a name="apache2.get_server_name" id="apache2.get_server_name">apache2.get_server_name(
-    
+    request_rec<em>&nbsp;r</em>
     )
     </a></h3>
 
@@ -1192,7 +1104,16 @@ Returns the current server name from the
 <p>
 <em>Arguments:</em>
 </p>
-<p>None</p>
+<table class="bordered">
+<tr>
+<th>Argument</th>
+<th>Description</th>
+</tr>
+<tr>
+<td>r</td>
+<td>The mod_lua request handle</td>
+</tr>
+</table>
 <p>
 <em>Return value(s):</em>
 <br />
@@ -1208,13 +1129,14 @@ r:puts("The ServerName is set to: ", nam
 
 <p>&nbsp;</p>
 
-<h3><a name="apache2.getenv" id="apache2.getenv">apache2.getenv(
-    request_rec<em>&nbsp;r</em>, &nbsp;string<em>&nbsp;key</em>
+<h3><a name="apache2.get_server_name_for_url" id="apache2.get_server_name_for_url">apache2.get_server_name_for_url(
+    request_rec<em>&nbsp;r</em>
     )
     </a></h3>
 
 <p>
-Returns the value of an environment variable
+Get the current server name from the request for the purposes of using in a URL. 
+If the server name is an IPv6 literal address, it will be returned in URL format (e.g., "[fe80::1]").
         </p>
 <p>
 <em>Arguments:</em>
@@ -1228,26 +1150,7 @@ Returns the value of an environment vari
 <td>r</td>
 <td>The mod_lua request handle</td>
 </tr>
-<tr>
-<td>key</td>
-<td>key</td>
-</tr>
 </table>
-<p>
-<em>Return value(s):</em>
-<br />
-The queried value
-        </p>
-<p>
-<em>Example:</em>
-</p>
-<pre class="prettyprint lang-lua">
-local env = apache2.getenv("HTTP_HOST")
-if env and env:len() &gt; 0 then
-    r:puts("HTTP_HOST equals ", env)
-end
-        </pre>
-
 <p>&nbsp;</p>
 
 <h3><a name="apache2.make_etag" id="apache2.make_etag">apache2.make_etag(
@@ -1394,7 +1297,7 @@ end
 <p>&nbsp;</p>
 
 <h3><a name="apache2.requestbody" id="apache2.requestbody">apache2.requestbody(
-    request_rec<em>&nbsp;r</em>, &nbsp;string<em>&nbsp;filename</em>
+    request_rec<em>&nbsp;r</em>, &nbsp;number<em>&nbsp;size</em>,
&nbsp;string<em>&nbsp;filename</em>
     )
     </a></h3>
 
@@ -1414,8 +1317,12 @@ Reads the request body. If a filename is
 <td>The mod_lua request handle</td>
 </tr>
 <tr>
+<td>size</td>
+<td>The maximum size allowed, or 0/nil for unlimited size</td>
+</tr>
+<tr>
 <td>filename</td>
-<td>filename</td>
+<td>The file to save the output to, or nil to return it as a string</td>
 </tr>
 </table>
 <p>
@@ -1428,10 +1335,10 @@ The number of bytes written if a filenam
 </p>
 <pre class="prettyprint lang-lua">
 if tonumber(r.headers_in['Content-Length'] or 0) &lt; 10000 then
-    local smallfile = apache2.requestbody(r) -- fetch a small file into memory
+    local smallfile = apache2.requestbody(r, 10000) -- fetch a small file into memory
     r:puts("I saved the uploaded file in memory")
 else
-    local read = apache2.requestbody(r, "/path/to/tmp")
+    local read = apache2.requestbody(r, 0, "/path/to/tmp")
     r:puts("I saved the uploaded file in a temp directory. Total bytes written was: ", read)
 end
         </pre>
@@ -1640,44 +1547,6 @@ True if keepalive can be set, false othe
         </p>
 <p>&nbsp;</p>
 
-<h3><a name="apache2.setenv" id="apache2.setenv">apache2.setenv(
-    request_rec<em>&nbsp;r</em>, &nbsp;string<em>&nbsp;key</em>,
&nbsp;string<em>&nbsp;val</em>
-    )
-    </a></h3>
-
-<p>
-Sets the value of an environment variable
-        </p>
-<p>
-<em>Arguments:</em>
-</p>
-<table class="bordered">
-<tr>
-<th>Argument</th>
-<th>Description</th>
-</tr>
-<tr>
-<td>r</td>
-<td>The mod_lua request handle</td>
-</tr>
-<tr>
-<td>key</td>
-<td>key</td>
-</tr>
-<tr>
-<td>val</td>
-<td>val</td>
-</tr>
-</table>
-<p>
-<em>Example:</em>
-</p>
-<pre class="prettyprint lang-lua">
-apache2.setenv("FOO_VAL", "bar and stuff")
-        </pre>
-
-<p>&nbsp;</p>
-
 <h3><a name="apache2.some_auth_required" id="apache2.some_auth_required">apache2.some_auth_required(
     request_rec<em>&nbsp;r</em>
     )
@@ -1762,7 +1631,7 @@ True if the expression evaluates as true
 </p>
 <pre class="prettyprint lang-lua">
 if apache2.expr("%{REQUEST_URI} =~ /force-gzip") then
-    apache2.add_output_filter(r, "DEFLATE")
+    r:addoutputfilter("DEFLATE")
 end
         </pre>
 
@@ -2360,7 +2229,7 @@ Kills off a server process. This has no 
     </a></h3>
 
 <p>
-Opens up a new database connection.
+Opens up a new database connection. See the DB functions for mod_pLua for more info on this.
         </p>
 <p>
 <em>Arguments:</em>

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=1369762&r1=1369761&r2=1369762&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/howto/htaccess.html.en (original)
+++ httpd/httpd/trunk/docs/manual/howto/htaccess.html.en Mon Aug  6 09:41:16 2012
@@ -43,7 +43,7 @@ changes on a per-directory basis.</p>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"
/></a></div>
 <div class="section">
 <h2><a name="related" id="related">.htaccess files</a></h2>
-    <table class="related"><tr><th>Related Modules</th><th>Related
Directives</th></tr><tr><td><ul><li><code class="module"><a
href="../mod/core.html">core</a></code></li><li><code class="module"><a
href="../mod/mod_authn_file.html">mod_authn_file</a></code></li><li><code
class="module"><a href="../mod/mod_authz_groupfile.html">mod_authz_groupfile</a></code></li><li><code
class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code></li><li><code
class="module"><a href="../mod/mod_include.html">mod_include</a></code></li><li><code
class="module"><a href="../mod/mod_mime.html">mod_mime</a></code></li></ul></td><td><ul><li><code
class="directive"><a href="../mod/core.html#accessfilename">AccessFileName</a></code></li><li><code
class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code></li><li><code
class="directive"><a href="../mod/core.html#options">Options</a></code></li><li><code
class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandl
 er</a></code></li><li><code class="directive"><a href="../mod/core.html#sethandler">SetHandler</a></code></li><li><code
class="directive"><a href="../mod/mod_authn_core.html#authtype">AuthType</a></code></li><li><code
class="directive"><a href="../mod/mod_authn_core.html#authname">AuthName</a></code></li><li><code
class="directive"><a href="../mod/mod_authn_file.html#authuserfile">AuthUserFile</a></code></li><li><code
class="directive"><a href="../mod/mod_authz_groupfile.html#authgroupfile">AuthGroupFile</a></code></li><li><code
class="directive"><a href="../mod/mod_authz_core.html#require">Require</a></code></li></ul></td></tr></table>
+    <table class="related"><tr><th>Related Modules</th><th>Related
Directives</th></tr><tr><td><ul><li><code class="module"><a
href="../mod/core.html">core</a></code></li><li><code class="module"><a
href="../mod/mod_authn_file.html">mod_authn_file</a></code></li><li><code
class="module"><a href="../mod/mod_authz_groupfile.html">mod_authz_groupfile</a></code></li><li><code
class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code></li><li><code
class="module"><a href="../mod/mod_include.html">mod_include</a></code></li><li><code
class="module"><a href="../mod/mod_mime.html">mod_mime</a></code></li></ul></td><td><ul><li><code
class="directive"><a href="../mod/core.html#accessfilename">AccessFileName</a></code></li><li><code
class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code></li><li><code
class="directive"><a href="../mod/core.html#options">Options</a></code></li><li><code
class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandl
 er</a></code></li><li><code class="directive"><a href="../mod/core.html#sethandler">SetHandler</a></code></li><li><code
class="directive"><a href="../mod/core.html#authtype">AuthType</a></code></li><li><code
class="directive"><a href="../mod/core.html#authname">AuthName</a></code></li><li><code
class="directive"><a href="../mod/mod_authn_file.html#authuserfile">AuthUserFile</a></code></li><li><code
class="directive"><a href="../mod/mod_authz_groupfile.html#authgroupfile">AuthGroupFile</a></code></li><li><code
class="directive"><a href="../mod/core.html#require">Require</a></code></li></ul></td></tr></table>
 
     <div class="note">You should avoid using <code>.htaccess</code> files
completely if you have access to
     httpd main server config file. Using <code>.htaccess</code> files slows down
your Apache http server.

Modified: httpd/httpd/trunk/docs/manual/howto/htaccess.xml.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/howto/htaccess.xml.fr?rev=1369762&r1=1369761&r2=1369762&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/howto/htaccess.xml.fr (original)
+++ httpd/httpd/trunk/docs/manual/howto/htaccess.xml.fr Mon Aug  6 09:41:16 2012
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1337880:1367778 (outdated) -->
+<!-- English Revision: 1337880:1369729 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 

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=1369762&r1=1369761&r2=1369762&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] Mon Aug  6 09:41:16 2012
@@ -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:1367778 (outdated) -->
+<!-- English Revision: 574882:1369729 (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=1369762&r1=1369761&r2=1369762&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] Mon Aug  6 09:41:16 2012
@@ -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:1367778 (outdated) -->
+<!-- English Revision: 151408:1369729 (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=1369762&r1=1369761&r2=1369762&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/howto/htaccess.xml.pt-br (original)
+++ httpd/httpd/trunk/docs/manual/howto/htaccess.xml.pt-br Mon Aug  6 09:41:16 2012
@@ -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:1367778 (outdated) -->
+<!-- English Revision: 151408:1369729 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more



Mime
View raw message