Author: markt
Date: Sun May 3 01:19:39 2009
New Revision: 771011
URL: http://svn.apache.org/viewvc?rev=771011&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46509
Correct link on error page. Patch provided by Michael Moody.
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/examples/jsp/security/protected/error.jsp
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun May 3 01:19:39 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763298,763302,763599,763681,763706,765662,768335
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763298,763302,763325,763599,763681,763706,765662,768335
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=771011&r1=771010&r2=771011&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun May 3 01:19:39 2009
@@ -111,13 +111,6 @@
+1: markt, pero
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46509
- Use correct link on error page in JSP security example
- Patch provided by Michael Moody
- http://svn.apache.org/viewvc?rev=763325&view=rev
- +1: markt, rjung, pero
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46909
Only include ';' in type attribute if there is a parameter
http://svn.apache.org/viewvc?rev=763611&view=rev
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=771011&r1=771010&r2=771011&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun May 3 01:19:39 2009
@@ -132,6 +132,10 @@
<subsection name="Webapps">
<changelog>
<fix>
+ <bug>46509</bug>: Use correct link on error page in JSP security
+ example. Patch provided by Michael Moody. (markt)
+ </fix>
+ <fix>
<bug>46599</bug>: Document known DAEMON issue. (markt)
</fix>
<fix>
Modified: tomcat/tc6.0.x/trunk/webapps/examples/jsp/security/protected/error.jsp
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/examples/jsp/security/protected/error.jsp?rev=771011&r1=771010&r2=771011&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/examples/jsp/security/protected/error.jsp
(original)
+++ tomcat/tc6.0.x/trunk/webapps/examples/jsp/security/protected/error.jsp Sun
May 3 01:19:39 2009
@@ -20,6 +20,6 @@
</head>
<body bgcolor="white">
Invalid username and/or password, please try
-<a href='<%= response.encodeURL("login.jsp") %>'>again</a>.
+<a href='<%= response.encodeURL("index.jsp") %>'>again</a>.
</body>
</html>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
