Author: kkolinko
Date: Thu Jun 28 05:54:00 2012
New Revision: 1354820
URL: http://svn.apache.org/viewvc?rev=1354820&view=rev
Log:
CTR: docs
Merged revision 1354685 from tomcat/trunk:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53473
Correct documentation and web.xml comments for SSI isVirtualWebappRelative
option since the allowed values are true or false
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/conf/web.xml
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/ssi-howto.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1354685
Modified: tomcat/tc6.0.x/trunk/conf/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/conf/web.xml?rev=1354820&r1=1354819&r2=1354820&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/conf/web.xml (original)
+++ tomcat/tc6.0.x/trunk/conf/web.xml Thu Jun 28 05:54:00 2012
@@ -284,7 +284,7 @@
<!-- isVirtualWebappRelative -->
<!-- Should "virtual" paths be interpreted as -->
<!-- relative to the context root, instead of -->
- <!-- the server root? (0=false, 1=true) [0] -->
+ <!-- the server root? [false] -->
<!-- -->
<!-- inputEncoding The encoding to assume for SSI resources if -->
<!-- one is not available from the resource. -->
@@ -315,7 +315,7 @@
</init-param>
<init-param>
<param-name>isVirtualWebappRelative</param-name>
- <param-value>0</param-value>
+ <param-value>false</param-value>
</init-param>
<load-on-startup>4</load-on-startup>
</servlet>
@@ -477,7 +477,7 @@
<!-- isVirtualWebappRelative -->
<!-- Should "virtual" paths be interpreted as -->
<!-- relative to the context root, instead of -->
- <!-- the server root? (0=false, 1=true) [0] -->
+ <!-- the server root? [false] -->
<!-- -->
<!-- allowExec Is use of the exec command enabled? [false] -->
@@ -501,7 +501,7 @@
</init-param>
<init-param>
<param-name>isVirtualWebappRelative</param-name>
- <param-value>0</param-value>
+ <param-value>false</param-value>
</init-param>
</filter>
-->
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1354820&r1=1354819&r2=1354820&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Jun 28 05:54:00 2012
@@ -265,6 +265,11 @@
Change the index page of ROOT webapp to mention "manager-gui" role
instead of "manager" one. (kkolinko)
</update>
+ <fix>
+ <bug>53473</bug>: Correct the allowed values for the SSI option
+ <code>isVirtualWebappRelative</code> which are <code>true</code> or
+ <code>false</code>. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Other">
Modified: tomcat/tc6.0.x/trunk/webapps/docs/ssi-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/ssi-howto.xml?rev=1354820&r1=1354819&r2=1354820&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/ssi-howto.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/ssi-howto.xml Thu Jun 28 05:54:00 2012
@@ -99,7 +99,7 @@ directives will expire. Default behaviou
evaluated for every request.</li>
<li><strong>isVirtualWebappRelative</strong> - Should "virtual" SSI directive
paths be interpreted as relative to the context root, instead of the server
-root? (0=false, 1=true) Default 0 (false).</li>
+root? Default false.</li>
<li><strong>inputEncoding</strong> - The encoding to be assumed for SSI
resources if one cannot be determined from the resource itself. Default is
the default platform encoding.</li>
@@ -129,7 +129,7 @@ directives will expire. Default behaviou
evaluated for every request.</li>
<li><strong>isVirtualWebappRelative</strong> - Should "virtual" SSI directive
paths be interpreted as relative to the context root, instead of the server
-root? (0=false, 1=true) Default 0 (false).</li>
+root? Default false.</li>
<li><strong>allowExec</strong> - Is the exec command enabled? Default is
false.</li>
</ul>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
