Author: markt
Date: Sat Oct 3 21:08:57 2009
New Revision: 821416
URL: http://svn.apache.org/viewvc?rev=821416&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47324
Correct submit URL so it works behind a reverse proxy for session list page
Patch by Maik Jablonski
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/manager/sessionsList.jsp
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 3 21:08:57 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,677910,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,721286,721708,721886,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,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,776921,776924,776935,776945,77
7464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809603,812125,812137,812432,813001,813013,813866,814180,815972,817442,819339
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,677910,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,721286,721708,721886,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,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,776921,776924,776935,776945,77
7464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809603,812125,812137,812432,813001,813013,813866,814180,815972,817442,819339,819361
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=821416&r1=821415&r2=821416&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Oct 3 21:08:57 2009
@@ -292,13 +292,6 @@
+1: rjung, pero
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47324
- Correct submit URL so it works behind a reverse proxy for session list page
- Patch by Maik Jablonski
- http://svn.apache.org/viewvc?rev=819361&view=rev
- +1: markt, kkolinko, rjung
- -1:
-
* Fix display of sessionList and sessionDetail pages in Internet Explorer
http://svn.apache.org/viewvc?rev=820110&view=rev
+1: kkolinko, rjung, markt
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=821416&r1=821415&r2=821416&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Oct 3 21:08:57 2009
@@ -316,6 +316,10 @@
(markt)
</fix>
<fix>
+ <bug>47324</bug>: Fix submit URL for session list page so it works
+ behind a reverse proxy. Patch provided by Maik Jablonski. (markt)
+ </fix>
+ <fix>
<bug>47425</bug>: Add crlFile attribute to the SSL configuration
documentation. (markt)
</fix>
Modified: tomcat/tc6.0.x/trunk/webapps/manager/sessionsList.jsp
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/manager/sessionsList.jsp?rev=821416&r1=821415&r2=821416&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/manager/sessionsList.jsp (original)
+++ tomcat/tc6.0.x/trunk/webapps/manager/sessionsList.jsp Sat Oct 3 21:08:57
2009
@@ -26,7 +26,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en">
<% String path = (String) request.getAttribute("path");
- String submitUrl =
((HttpServletRequest)pageContext.getRequest()).getRequestURL().append("?path=").append(path).toString();
+ String submitUrl =
((HttpServletRequest)pageContext.getRequest()).getRequestURI() + "?path=" +
path;
Collection activeSessions = (Collection)
request.getAttribute("activeSessions");
%>
<head>
@@ -36,7 +36,7 @@
<meta http-equiv="expires" content="0"/><!-- 0 is an invalid value and
should be treated as 'now' -->
<meta http-equiv="content-language" content="en"/>
<meta name="author" content="Cedrik LIME"/>
- <meta name="copyright" content="copyright 2005-2007 the Apache Software
Foundation"/>
+ <meta name="copyright" content="copyright 2005-2009 the Apache Software
Foundation"/>
<meta name="robots" content="noindex,nofollow,noarchive"/>
<title>Sessions Administration for <%= path %></title>
</head>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
