Author: markt
Date: Fri Nov 10 10:57:07 2017
New Revision: 1814825
URL: http://svn.apache.org/viewvc?rev=1814825&view=rev
Log:
Correct the description of how the CGI servlet maps a request to a script in
the CGI How-To.
Modified:
tomcat/trunk/webapps/docs/cgi-howto.xml
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/webapps/docs/cgi-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/cgi-howto.xml?rev=1814825&r1=1814824&r2=1814825&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/cgi-howto.xml (original)
+++ tomcat/trunk/webapps/docs/cgi-howto.xml Fri Nov 10 10:57:07 2017
@@ -129,18 +129,16 @@ the reading of stderr to complete before
is <code>2000</code>.</li>
</ul>
-<p>The name and path of the CGI script to search for in the CGI search path
-depends on how the Servlet has been mapped. If the <strong>pathInfo</strong> is
-<code>null</code>, the <strong>servletPath</strong> will be used. If the
-<strong>pathInfo</strong> is not <code>null</code> then the
-<strong>servletPath</strong> is appended to the CGI search path and the
-<strong>pathInfo</strong> is used.</p>
+<p>The CGI script executed depends on the configuration of the CGI Servlet and
+how the request is mapped to the CGI Servlet. The CGI search path starts at the
+web application root directory + File.separator + cgiPathPrefix. The
+<strong>pathInfo</strong> is then searched unless it is <code>null</code> - in
+which case the <strong>servletPath</strong> is searched.</p>
-<p>The search will start with the first path segment and expand one path
segment
-at a time until no path segments are left (resulting in a 404) or a matching
-script is found in the CGI search path. Any remaining path segments will be
-passed to the CGI executable in the <strong>PATH_INFO</strong> environment
-variable.</p>
+<p>The search starts with the first path segment and expands one path segment
+at a time until no path segments are left (resulting in a 404) or a script is
+found. Any remaining path segments are passed to the script in the
+<strong>PATH_INFO</strong> environment variable.</p>
</section>
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1814825&r1=1814824&r2=1814825&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Nov 10 10:57:07 2017
@@ -125,6 +125,10 @@
<bug>61603</bug>: Add XML filtering for the status servlet output where
needed. (remm)
</fix>
+ <fix>
+ Correct the description of how the CGI servlet maps a request to a
+ script in the CGI How-To. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Tribes">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
