svn commit: r1598284 - in /httpd/httpd/branches/2.4.x/docs/manual/mod: mod_proxy_connect.xml mod_proxy_express.xml

[ta...@apache.org]

Author: takashi
Date: Thu May 29 12:55:59 2014
New Revision: 1598284

URL: http://svn.apache.org/r1598284
Log:
Merge r1560683 and r1581011 from trunk:

(mod/mod_proxy_express.xml)
It does more than just a ProxyPass, but also looks at the HOST header,
so this gives somewhat deeper insight into what the end result looks
like.

(mod/mod_proxy_connect.xml)
a comma leaked onto the page

Modified:
    httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_connect.xml
    httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_express.xml

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_connect.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_connect.xml?rev=1598284&r1=1598283&r2=1598284&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_connect.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_connect.xml Thu May 29 12:55:59 2014
@@ -39,7 +39,7 @@
     requests, <module>mod_proxy</module> and
     <module>mod_proxy_connect</module> have to be present in the server.</p>
 
-    <p>CONNECT is also used, when the server needs to send an HTTPS request
+    <p>CONNECT is also used when the server needs to send an HTTPS request
     through a forward proxy. In this case the server acts as a CONNECT client.
     This functionality is part of <module>mod_proxy</module> and
     <module>mod_proxy_connect</module> is not needed in this case.</p>

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_express.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_express.xml?rev=1598284&r1=1598283&r2=1598284&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_express.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_express.xml Thu May 29 12:55:59 2014
@@ -61,10 +61,13 @@
     <li>It does not support regex or pattern matching at all.
     </li>
     <li>It emulates:
-      <example>
-        ProxyPass / backend.server:port<br />
-        ProxyPassReverse / backend.server:port<br />
-      </example>
+      <highlight language="config">
+&lt;VirtualHost *:80&gt;
+   ServerName front.end.server
+   ProxyPass / back.end.server:port
+   ProxyPassReverse / back.end.server:port
+&lt;/VirtualHost&gt;
+      </highlight>
       That is, the entire URL is appended to the mapped backend
       URL. This is in keeping with the intent of being a simple
       but fast reverse proxy switch.