Fix bug 42979. Update sample.war to include recent security fixes.

Ported from TC5.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@561188 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/webapps/docs/appdev/sample/index.html b/webapps/docs/appdev/sample/index.html
index 582c970..ed355be 100644 (file)
--- a/webapps/docs/appdev/sample/index.html
+++ b/webapps/docs/appdev/sample/index.html
@@ -20,7 +20,7 @@
         <a href="http://localhost:8080/sample">http://localhost:8080/sample</a>
       </p>
       <p>
-        If you just want to browse the code you can unpack the war file 
+        If you just want to browse the contents, you can unpack the war file 
         with the <b>jar</b> command.
         <source>
           jar -xvf sample.war

diff --git a/webapps/docs/appdev/sample/sample.war b/webapps/docs/appdev/sample/sample.war
index b649cc8..0a127e6 100644 (file)
Binary files a/webapps/docs/appdev/sample/sample.war and b/webapps/docs/appdev/sample/sample.war differ

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 8663dc7..26ba961 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -26,9 +26,17 @@
          stop to fail. Based on a fix suggested by Michael Vorburger.
          Port of r454193 (<bug>36976</bug>) from Tomcat 5.5.x. (markt,rjung)
       </fix>
+    </changelog>
+  </subsection>
+  <subsection name="Webapps">
+    <changelog>
       <fix>
         Fix WebDAV Servlet so it works correctly with MS clients. (markt)
       </fix>
+      <fix>
+        <bug>42979</bug>: Update sample.war to include recent security fixes
+        in the source code. (markt)
+      </fix>
     </changelog>
   </subsection>
 </section>