Re: svn commit: r957830 - in /tomcat/trunk: java/org/apache/catalina/loader/LocalStrings.properties java/org/apache/catalina/loader/WebappClassLoader.java webapps/docs/config/context.xml
On 25/06/2010 11:41, Konstantin Kolinko wrote:
2010/6/25:
Author: markt
Date: Fri Jun 25 07:53:24 2010
New Revision: 957830
URL: http://svn.apache.org/viewvc?rev=957830&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49414
Try to differentiate between request threads and threads started by applications
+/*
+ * Look at a threads stack trace to see if it is a request thread or not.
It
+ * isn't perfect, but it should be good-enough for most cases.
+ */
+private boolean isRequestThread(Thread thread) {
(...)
+// Step through the methods in reverse order looking for a
+// CoyoteAdapter.service() call. All requests will have this unless
There are also
CoyoteAdapter.event()
CoyoteAdapter.asyncDispatch()
Thanks for the catch. I think I'll drop the check of the method name.
Passing through CoyoteAdapter should be enough.
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r958192 - /tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Author: markt
Date: Sat Jun 26 07:04:32 2010
New Revision: 958192
URL: http://svn.apache.org/viewvc?rev=958192&view=rev
Log:
Improve fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=49414
Just look for presence of CoyoteAdapter class
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=958192&r1=958191&r2=958192&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Sat Jun
26 07:04:32 2010
@@ -2260,15 +2260,14 @@ public class WebappClassLoader
return false;
}
-// Step through the methods in reverse order looking for a
-// CoyoteAdapter.service() call. All requests will have this unless
+// Step through the methods in reverse order looking for calls to any
+// CoyoteAdapter method. All request threads will have this unless
// Tomcat has been heavily modified - in which case there isn't much we
// can do.
for (int i = 0; i < elements.length; i++) {
StackTraceElement element = elements[elements.length - (i+1)];
if ("org.apache.catalina.connector.CoyoteAdapter".equals(
-element.getClassName()) &&
-"service".equals(element.getMethodName())) {
+element.getClassName())) {
return true;
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r958193 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Sat Jun 26 07:07:17 2010 New Revision: 958193 URL: http://svn.apache.org/viewvc?rev=958193&view=rev Log: Improve proposal. I assume jfclere is OK with change but I'll wait a little while before committing Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=958193&r1=958192&r2=958193&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Jun 26 07:07:17 2010 @@ -190,13 +190,6 @@ PATCHES PROPOSED TO BACKPORT: Differentiate between request threads and application created threads when warning about still running threads when an application stops. http://svn.apache.org/viewvc?rev=957830&view=rev - +1: markt, jfclere - +1: kkolinko: (There is also CoyoteAdapter.event() in TC6 and TC7 and -CoyoteAdapter.asyncDispatch() in TC7. I think that there is actually -no need to test for the name of the method. If it is CoyoteAdapter, -I think is is enough to diagnose it as request processing thread. -+1 to the patch as is, -and +1 if "service".equals(element.getMethodName()) check -is removed from isRequestThread(Thread). - ) + http://svn.apache.org/viewvc?rev=958192&view=rev + +1: markt, jfclere, kkolinko -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49507] Server and client mutual authentication
https://issues.apache.org/bugzilla/show_bug.cgi?id=49507 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Comment #1 from Mark Thomas 2010-06-26 03:16:15 EDT --- Bugzilla is not a support forum. Please use the users mailing list. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r958194 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: markt Date: Sat Jun 26 07:28:41 2010 New Revision: 958194 URL: http://svn.apache.org/viewvc?rev=958194&view=rev Log: Vote Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=958194&r1=958193&r2=958194&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Sat Jun 26 07:28:41 2010 @@ -29,7 +29,7 @@ PATCHES PROPOSED TO BACKPORT: Reuses StringBuffer, uses char instead of single-char String, etc. http://people.apache.org/~kkolinko/patches/2009-07-15_tc55_ALV.patch http://people.apache.org/~kkolinko/patches/2009-07-15_tc55_FCALV.patch - +1: kkolinko, rjung + +1: kkolinko, rjung, markt -1: * Remove JSSE13Factory, JSSE13SocketFactory classes, @@ -57,5 +57,5 @@ PATCHES PROPOSED TO BACKPORT: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49445 The change in session ID is notified to other node. http://svn.apache.org/viewvc?view=revision&revision=955190 - +1: kfujino + +1: kfujino, markt -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r958195 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/valves/RemoteIpValve.java webapps/docs/changelog.xml webapps/docs/config/valve.xml
Author: markt Date: Sat Jun 26 07:33:57 2010 New Revision: 958195 URL: http://svn.apache.org/viewvc?rev=958195&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49443 Use remoteIpHeader rather then remoteIPHeader consistently Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/RemoteIpValve.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml tomcat/tc6.0.x/trunk/webapps/docs/config/valve.xml Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=958195&r1=958194&r2=958195&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Jun 26 07:33:57 2010 @@ -141,12 +141,6 @@ PATCHES PROPOSED TO BACKPORT: of "long time". 2) I see no way to turn off this feature or filter the output. -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49443 - Use remoteIpHeader rather then remoteIPHeader consistently - http://people.apache.org/~markt/patches/2010-06-18-bug49443-tc6.patch - +1: markt, kkolinko, rjung - -1: - * Backport the CSRF prevention filter to Tomcat 6 and configure the Manager and Host Manager applications to use it. The configuration is such that the using the old roles (manager, admin) will work and will bypass the CSRF protection Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/RemoteIpValve.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/RemoteIpValve.java?rev=958195&r1=958194&r2=958195&view=diff == --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/RemoteIpValve.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/RemoteIpValve.java Sat Jun 26 07:33:57 2010 @@ -54,7 +54,7 @@ import org.apache.juli.logging.LogFactor * If the incoming request.getRemoteAddr() matches the valve's list of internal proxies : * * Loop on the comma delimited list of IPs and hostnames passed by the preceding load balancer or proxy in the given request's Http - * header named $remoteIPHeader (default value x-forwarded-for). Values are processed in right-to-left order. + * header named $remoteIpHeader (default value x-forwarded-for). Values are processed in right-to-left order. * For each ip/host of the list: * * if it matches the internal proxies list, the ip/host is swallowed @@ -79,7 +79,7 @@ import org.apache.juli.logging.LogFactor * Default Value * * - * remoteIPHeader + * remoteIpHeader * Name of the Http Header read by this valve that holds the list of traversed IP addresses starting from the requesting client * RemoteIPHeader * Compliant http header name @@ -99,7 +99,7 @@ import org.apache.juli.logging.LogFactor * * proxiesHeader * Name of the http header created by this valve to hold the list of proxies that have been processed in the incoming - * remoteIPHeader + * remoteIpHeader * RemoteIPProxiesHeader * Compliant http header name * x-forwarded-by @@ -165,8 +165,8 @@ import org.apache.juli.logging.LogFactor ** @@ -227,8 +227,8 @@ import org.apache.juli.logging.LogFactor * * @@ -269,8 +269,8 @@ import org.apache.juli.logging.LogFactor * * @@ -312,8 +312,8 @@ import org.apache.juli.logging.LogFactor * * @@ -559,11 +559,11 @@ public class RemoteIpValve extends Valve // In java 6, proxiesHeaderValue should be declared as a java.util.Deque LinkedList proxie
DO NOT REPLY [Bug 49230] sun.net.www.http.KeepAliveCache preventing classloader from being garbage collected
https://issues.apache.org/bugzilla/show_bug.cgi?id=49230 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #4 from Mark Thomas 2010-06-26 04:29:39 EDT --- This has been fixed in 6.0.x and will be included in 6.0.28 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r958199 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java java/org/apache/catalina/core/LocalStrings.properties webapps/docs/chan
Author: markt Date: Sat Jun 26 08:30:06 2010 New Revision: 958199 URL: http://svn.apache.org/viewvc?rev=958199&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49230 Additional JRE leak protection. HttpClient keep-alive thread Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml tomcat/tc6.0.x/trunk/webapps/docs/config/listeners.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jun 26 08:30:06 2010 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,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,713953,714002,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,752323,753039,757335,757774,758249,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,77 0809,770876,772872,776921,776924,776935,776945,777464,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,791224,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,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901 39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,944409,944416,945231,945808,945835,945841,946686 ,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655 +/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,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,713953,714002,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,752323,753039,757335,757774,758249,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,77 0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,7
svn commit: r958200 - /tomcat/site/trunk/build.xml
Author: markt
Date: Sat Jun 26 08:44:36 2010
New Revision: 958200
URL: http://svn.apache.org/viewvc?rev=958200&view=rev
Log:
Add a force option. Useful when adding items to the menu.
Usage: ant -Dforce=true
Modified:
tomcat/site/trunk/build.xml
Modified: tomcat/site/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/build.xml?rev=958200&r1=958199&r2=958200&view=diff
==
--- tomcat/site/trunk/build.xml (original)
+++ tomcat/site/trunk/build.xml Sat Jun 26 08:44:36 2010
@@ -7,6 +7,8 @@
+
+
@@ -25,13 +27,14 @@
extension=".html"
style="${docs.src}/stylesheets/tomcat-site.xsl"
excludes="project.xml"
-includes="*.xml">
+includes="*.xml"
+ force="${force}">
-
+
@@ -41,7 +44,7 @@
-
+
@@ -49,7 +52,7 @@
-
+
@@ -57,14 +60,13 @@
-
+
-
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r958203 - in /tomcat/site/trunk: docs/ xdocs/ xdocs/stylesheets/
Author: markt Date: Sat Jun 26 09:15:41 2010 New Revision: 958203 URL: http://svn.apache.org/viewvc?rev=958203&view=rev Log: Add Tomcat 7 docs to the LHS menu Add the Tomcat 7 downloads page (not linked yet) Added: tomcat/site/trunk/docs/download-70.cgi (with props) tomcat/site/trunk/docs/download-70.html (with props) tomcat/site/trunk/xdocs/download-70.cgi - copied unchanged from r958185, tomcat/site/trunk/xdocs/download-60.cgi tomcat/site/trunk/xdocs/download-70.xml (with props) Modified: tomcat/site/trunk/docs/bugreport.html tomcat/site/trunk/docs/contact.html tomcat/site/trunk/docs/download-55.html tomcat/site/trunk/docs/download-60.html tomcat/site/trunk/docs/download-connectors.html tomcat/site/trunk/docs/download-native.html tomcat/site/trunk/docs/findhelp.html tomcat/site/trunk/docs/getinvolved.html tomcat/site/trunk/docs/heritage.html tomcat/site/trunk/docs/index.html tomcat/site/trunk/docs/irc.html tomcat/site/trunk/docs/legal.html tomcat/site/trunk/docs/lists.html tomcat/site/trunk/docs/migration.html tomcat/site/trunk/docs/oldnews.html tomcat/site/trunk/docs/resources.html tomcat/site/trunk/docs/security-3.html tomcat/site/trunk/docs/security-4.html tomcat/site/trunk/docs/security-5.html tomcat/site/trunk/docs/security-6.html tomcat/site/trunk/docs/security-7.html tomcat/site/trunk/docs/security-impact.html tomcat/site/trunk/docs/security-jk.html tomcat/site/trunk/docs/security-native.html tomcat/site/trunk/docs/security.html tomcat/site/trunk/docs/svn.html tomcat/site/trunk/docs/whichversion.html tomcat/site/trunk/docs/whoweare.html tomcat/site/trunk/xdocs/stylesheets/project.xml Modified: tomcat/site/trunk/docs/bugreport.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/bugreport.html?rev=958203&r1=958202&r2=958203&view=diff == --- tomcat/site/trunk/docs/bugreport.html (original) +++ tomcat/site/trunk/docs/bugreport.html Sat Jun 26 09:15:41 2010 @@ -86,6 +86,9 @@ +Tomcat 7.0 + + Tomcat 6.0 Modified: tomcat/site/trunk/docs/contact.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/contact.html?rev=958203&r1=958202&r2=958203&view=diff == --- tomcat/site/trunk/docs/contact.html (original) +++ tomcat/site/trunk/docs/contact.html Sat Jun 26 09:15:41 2010 @@ -85,6 +85,9 @@ +Tomcat 7.0 + + Tomcat 6.0 Modified: tomcat/site/trunk/docs/download-55.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-55.html?rev=958203&r1=958202&r2=958203&view=diff == --- tomcat/site/trunk/docs/download-55.html (original) +++ tomcat/site/trunk/docs/download-55.html Sat Jun 26 09:15:41 2010 @@ -85,6 +85,9 @@ +Tomcat 7.0 + + Tomcat 6.0 Modified: tomcat/site/trunk/docs/download-60.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-60.html?rev=958203&r1=958202&r2=958203&view=diff == --- tomcat/site/trunk/docs/download-60.html (original) +++ tomcat/site/trunk/docs/download-60.html Sat Jun 26 09:15:41 2010 @@ -85,6 +85,9 @@ +Tomcat 7.0 + + Tomcat 6.0 Added: tomcat/site/trunk/docs/download-70.cgi URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-70.cgi?rev=958203&view=auto == --- tomcat/site/trunk/docs/download-70.cgi (added) +++ tomcat/site/trunk/docs/download-70.cgi Sat Jun 26 09:15:41 2010 @@ -0,0 +1,6 @@ +#!/bin/sh +# Wrapper script around mirrors.cgi script +# (we must change to that directory in order for python to pick up the +# python includes correctly) +cd /www/www.apache.org/dyn/mirrors +/www/www.apache.org/dyn/mirrors/mirrors.cgi $* Propchange: tomcat/site/trunk/docs/download-70.cgi -- svn:eol-style = native Added: tomcat/site/trunk/docs/download-70.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-70.html?rev=958203&view=auto == --- tomcat/site/trunk/docs/download-70.html (added) +++ tomcat/site/trunk/docs/download-70.html Sat Jun 26 09:15:41 2010 @@ -0,0 +1,556 @@ + +http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> + + +Apache Tomcat - Apache Tomcat 7 Downloads + + + + + + + + + +http://tomcat.apache.org/";> + + + + + +Apache Tomcat + + + + +http://www.apache.org/";> +http://www.apache.org/images/asf-logo.gif"; align="right" alt="Apache Logo" border="0"/> + + + + + +http://www.google.com/search"; method="get"> + + + + + + + + + + + + + + + + +Apache Tomcat + + + +Home + + +Taglibs + + +
DO NOT REPLY [Bug 49443] RemoteIpValve : remoteIpHeader vs remoteIPHeader
https://issues.apache.org/bugzilla/show_bug.cgi?id=49443 Konstantin Kolinko changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Konstantin Kolinko 2010-06-26 07:12:41 EDT --- Fixed in 6.0 in r958195 and will be in 6.0.28 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49505] ApplicationHttpRequest.setAttribute doesn't call the wrapper's setAttribute in case of "special" attributes
https://issues.apache.org/bugzilla/show_bug.cgi?id=49505 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Comment #1 from Mark Thomas 2010-06-26 07:41:56 EDT --- My reading of the spec is that there is nothing mandating that these attributes must be set via a call to ServletRequest.setAttribute(). This looks to be one of those areas where implementations have some flexibility. Your wrapper should be able to call getAttribute() to determine if these attributes have been set. The users list is the best place to get additional help with this. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r958213 - in /tomcat/trunk/webapps/examples/WEB-INF/classes/cal: Entry.java JspCalendar.java
Author: markt
Date: Sat Jun 26 12:05:30 2010
New Revision: 958213
URL: http://svn.apache.org/viewvc?rev=958213&view=rev
Log:
Remove unused code
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/cal/Entry.java
tomcat/trunk/webapps/examples/WEB-INF/classes/cal/JspCalendar.java
Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/cal/Entry.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/cal/Entry.java?rev=958213&r1=958212&r2=958213&view=diff
==
--- tomcat/trunk/webapps/examples/WEB-INF/classes/cal/Entry.java (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/cal/Entry.java Sat Jun 26
12:05:30 2010
@@ -21,7 +21,6 @@ public class Entry {
String hour;
String description;
-String color;
public Entry(String hour) {
this.hour = hour;
Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/cal/JspCalendar.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/cal/JspCalendar.java?rev=958213&r1=958212&r2=958213&view=diff
==
--- tomcat/trunk/webapps/examples/WEB-INF/classes/cal/JspCalendar.java
(original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/cal/JspCalendar.java Sat Jun
26 12:05:30 2010
@@ -21,7 +21,6 @@ import java.util.*;
public class JspCalendar {
Calendar calendar = null;
-Date currentDate;
public JspCalendar() {
calendar = Calendar.getInstance();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r958214 - in /tomcat/trunk/webapps/examples/WEB-INF/classes: CookieExample.java RequestHeaderExample.java RequestInfoExample.java RequestParamExample.java SessionExample.java chat/ChatServ
Author: markt
Date: Sat Jun 26 12:17:33 2010
New Revision: 958214
URL: http://svn.apache.org/viewvc?rev=958214&view=rev
Log:
Fix some Eclispe / Findbugs warnings
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/CookieExample.java
tomcat/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java
tomcat/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java
tomcat/trunk/webapps/examples/WEB-INF/classes/RequestParamExample.java
tomcat/trunk/webapps/examples/WEB-INF/classes/SessionExample.java
tomcat/trunk/webapps/examples/WEB-INF/classes/chat/ChatServlet.java
Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/CookieExample.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/CookieExample.java?rev=958214&r1=958213&r2=958214&view=diff
==
--- tomcat/trunk/webapps/examples/WEB-INF/classes/CookieExample.java (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/CookieExample.java Sat Jun 26
12:17:33 2010
@@ -35,7 +35,7 @@ public class CookieExample extends HttpS
private static final long serialVersionUID = 1L;
-ResourceBundle rb = ResourceBundle.getBundle("LocalStrings");
+private transient ResourceBundle rb =
ResourceBundle.getBundle("LocalStrings");
@Override
public void doGet(HttpServletRequest request,
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java?rev=958214&r1=958213&r2=958214&view=diff
==
--- tomcat/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java
(original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java Sat
Jun 26 12:17:33 2010
@@ -35,7 +35,7 @@ public class RequestHeaderExample extend
private static final long serialVersionUID = 1L;
-ResourceBundle rb = ResourceBundle.getBundle("LocalStrings");
+private transient ResourceBundle rb =
ResourceBundle.getBundle("LocalStrings");
@Override
public void doGet(HttpServletRequest request,
Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java?rev=958214&r1=958213&r2=958214&view=diff
==
--- tomcat/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java
(original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java Sat
Jun 26 12:17:33 2010
@@ -35,7 +35,7 @@ public class RequestInfoExample extends
private static final long serialVersionUID = 1L;
-ResourceBundle rb = ResourceBundle.getBundle("LocalStrings");
+private transient ResourceBundle rb =
ResourceBundle.getBundle("LocalStrings");
@Override
public void doGet(HttpServletRequest request,
Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/RequestParamExample.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/RequestParamExample.java?rev=958214&r1=958213&r2=958214&view=diff
==
--- tomcat/trunk/webapps/examples/WEB-INF/classes/RequestParamExample.java
(original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/RequestParamExample.java Sat
Jun 26 12:17:33 2010
@@ -35,7 +35,7 @@ public class RequestParamExample extends
private static final long serialVersionUID = 1L;
-ResourceBundle rb = ResourceBundle.getBundle("LocalStrings");
+private transient ResourceBundle rb =
ResourceBundle.getBundle("LocalStrings");
@Override
public void doGet(HttpServletRequest request,
Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/SessionExample.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/SessionExample.java?rev=958214&r1=958213&r2=958214&view=diff
==
--- tomcat/trunk/webapps/examples/WEB-INF/classes/SessionExample.java (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/SessionExample.java Sat Jun
26 12:17:33 2010
@@ -35,7 +35,7 @@ public class SessionExample extends Http
private static final long serialVersionUID = 1L;
-ResourceBundle rb = ResourceBundle.getBundle("LocalStrings");
+private transient ResourceBundle rb =
ResourceBundle.getBundle("LocalStrings");
@Override
public void doGet(HttpServletRequest request,
Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/chat/ChatServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/chat/ChatServlet.java?rev=958214&r1=958213&r2=958214&view=diff
=
svn commit: r958215 - in /tomcat/site/trunk: docs/download-70.html xdocs/download-70.xml
Author: markt Date: Sat Jun 26 12:21:31 2010 New Revision: 958215 URL: http://svn.apache.org/viewvc?rev=958215&view=rev Log: Make extras part of binary, not separate Modified: tomcat/site/trunk/docs/download-70.html tomcat/site/trunk/xdocs/download-70.xml Modified: tomcat/site/trunk/docs/download-70.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-70.html?rev=958215&r1=958214&r2=958215&view=diff == --- tomcat/site/trunk/docs/download-70.html (original) +++ tomcat/site/trunk/docs/download-70.html Sat Jun 26 12:21:31 2010 @@ -418,52 +418,29 @@ - - - - - - - - - - - - - - - - - - -Extras - - - - - - - - - - JMX Remote jar - (http://www.apache.org/dist/tomcat/tomcat-7/v7.0.0-beta/bin/extras/catalina-jmx-remote.jar.asc";>pgp, - http://www.apache.org/dist/tomcat/tomcat-7/v7.0.0-beta/bin/extras/catalina-jmx-remote.jar.md5";>md5) - - - Web services jar - (http://www.apache.org/dist/tomcat/tomcat-7/v7.0.0-beta/bin/extras/catalina-ws.jar.asc";>pgp, - http://www.apache.org/dist/tomcat/tomcat-7/v7.0.0-beta/bin/extras/catalina-ws.jar.md5";>md5) - - - JULI adapters jar - (http://www.apache.org/dist/tomcat/tomcat-7/v7.0.0-beta/bin/extras/tomcat-juli-adapters.jar.asc";>pgp, - http://www.apache.org/dist/tomcat/tomcat-7/v7.0.0-beta/bin/extras/tomcat-juli-adapters.jar.md5";>md5) - - - JULI log4j jar - (http://www.apache.org/dist/tomcat/tomcat-7/v7.0.0-beta/bin/extras/tomcat-juli.jar.asc";>pgp, - http://www.apache.org/dist/tomcat/tomcat-7/v7.0.0-beta/bin/extras/tomcat-juli.jar.md5";>md5) +Extras: + + +JMX Remote jar +(http://www.apache.org/dist/tomcat/tomcat-7/v7.0.0-beta/bin/extras/catalina-jmx-remote.jar.asc";>pgp, +http://www.apache.org/dist/tomcat/tomcat-7/v7.0.0-beta/bin/extras/catalina-jmx-remote.jar.md5";>md5) + + +Web services jar +(http://www.apache.org/dist/tomcat/tomcat-7/v7.0.0-beta/bin/extras/catalina-ws.jar.asc";>pgp, +http://www.apache.org/dist/tomcat/tomcat-7/v7.0.0-beta/bin/extras/catalina-ws.jar.md5";>md5) + + +JULI adapters jar +(http://www.apache.org/dist/tomcat/tomcat-7/v7.0.0-beta/bin/extras/tomcat-juli-adapters.jar.asc";>pgp, +http://www.apache.org/dist/tomcat/tomcat-7/v7.0.0-beta/bin/extras/tomcat-juli-adapters.jar.md5";>md5) + + +JULI log4j jar +(http://www.apache.org/dist/tomcat/tomcat-7/v7.0.0-beta/bin/extras/tomcat-juli.jar.asc";>pgp, +http://www.apache.org/dist/tomcat/tomcat-7/v7.0.0-beta/bin/extras/tomcat-juli.jar.md5";>md5) + + Modified: tomcat/site/trunk/xdocs/download-70.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-70.xml?rev=958215&r1=958214&r2=958215&view=diff == --- tomcat/site/trunk/xdocs/download-70.xml (original) +++ tomcat/site/trunk/xdocs/download-70.xml Sat Jun 26 12:21:31 2010 @@ -123,36 +123,33 @@ - - - - - - - - - JMX Remote jar - (http://www.apache.org/dist/tomcat/tomcat-7/v7.0.0-beta/bin/extras/catalina-jmx-remote.jar.asc";>pgp, - http://www.apache.org/dist/tomcat/tomcat-7/v7.0.0-beta/bin/extras/catalina-jmx-remote.jar.md5";>md5) - - - Web services jar - (http://www.apache.org/dist/tomcat/tomcat-7/v7.0.0-beta/bin/extras/catalina-ws.jar.asc";>pgp, - http://www.apache.org/dist/tomcat/tomcat-7/v7.0.0-beta/bin/extras/catalina-ws.jar.md5";>md5) - - - JULI adapters jar - (http://www.apache.org/dist/tomcat/tomcat-7/v7.0.0-beta/bin/extras/tomcat-juli-adapters.jar.asc";>pgp, - http://www.apache.org/dist/tomcat/tomcat-7/v7.0.0-beta/bin/extras/tomcat-juli-adapters.jar.md5";>md5) - - - JULI log4j jar - (http://www.apache.org/dist/tomcat/tomcat-7/v7.0.0-beta/bin/extras/tomcat-juli.jar.asc";>pgp, - http://www.apache.org/dist/tomcat/tomcat-7/v7.0.0-beta/bin/extras/tomcat-juli.jar.md5";>md5) +Extras: + + +JMX Remote jar +(http://www.apache.org/dist/tomcat/tomcat-7/v7.0.0-beta/bin/extras/catalina-jmx-remote.jar.asc";>pgp, +http://www.apache.org/dist/tomcat/tomcat-7/v7.0.0-beta/bin/extras/catalina-jmx-remote.jar.md5";>md5) + + +Web services jar +(http://www.apache.org/dist/tomcat/tomcat-7/v7.0.0-b
DO NOT REPLY [Bug 49351] Tomcat Embedded fails if StandardService is not set
https://issues.apache.org/bugzilla/show_bug.cgi?id=49351
--- Comment #1 from Mark Thomas 2010-06-26 08:44:45 EDT ---
Trunk has been re-factored so that code doesn't exist any more.
The following patch should work for 6.0.x:
Index: java/org/apache/catalina/core/StandardEngine.java
===
--- java/org/apache/catalina/core/StandardEngine.java(revision 958198)
+++ java/org/apache/catalina/core/StandardEngine.java(working copy)
@@ -354,6 +354,8 @@
service=new StandardService();
service.setContainer( this );
service.initialize();
+// Use same name for Service
+service.setName(getName());
} catch( Throwable t ) {
log.error(t);
}
--
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r958221 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Sat Jun 26 12:45:36 2010 New Revision: 958221 URL: http://svn.apache.org/viewvc?rev=958221&view=rev Log: Proposal Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=958221&r1=958220&r2=958221&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Jun 26 12:45:36 2010 @@ -179,3 +179,9 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?rev=958192&view=rev +1: markt, jfclere, kkolinko -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49351 + Avoid possible NPE when embedding + https://issues.apache.org/bugzilla/show_bug.cgi?id=49351#c1 + +1: markt + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r958214 - in /tomcat/trunk/webapps/examples/WEB-INF/classes: CookieExample.java RequestHeaderExample.java RequestInfoExample.java RequestParamExample.java SessionExample.java chat/Chat
Hi Mark,
Am Samstag, den 26.06.2010, 12:17 + schrieb ma...@apache.org:
> Author: markt
> Date: Sat Jun 26 12:17:33 2010
> New Revision: 958214
>
> URL: http://svn.apache.org/viewvc?rev=958214&view=rev
> Log:
> Fix some Eclispe / Findbugs warnings
...
> Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/CookieExample.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/CookieExample.java?rev=958214&r1=958213&r2=958214&view=diff
> ==
> --- tomcat/trunk/webapps/examples/WEB-INF/classes/CookieExample.java
> (original)
> +++ tomcat/trunk/webapps/examples/WEB-INF/classes/CookieExample.java Sat Jun
> 26 12:17:33 2010
> @@ -35,7 +35,7 @@ public class CookieExample extends HttpS
>
> private static final long serialVersionUID = 1L;
>
> -ResourceBundle rb = ResourceBundle.getBundle("LocalStrings");
> +private transient ResourceBundle rb =
> ResourceBundle.getBundle("LocalStrings");
shouldn't we init rb in an init method, so that it will be reinitialized
after deserialization, like messageSender in ChatServlet? That way we
would get rid of the warnings and have a correct servlet.
Regards,
Felix
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r958214 - in /tomcat/trunk/webapps/examples/WEB-INF/classes: CookieExample.java RequestHeaderExample.java RequestInfoExample.java RequestParamExample.java SessionExample.java chat/Ch
On 26/06/2010, Felix Schumacher wrote:
> Hi Mark,
>
> Am Samstag, den 26.06.2010, 12:17 + schrieb ma...@apache.org:
>
> > Author: markt
> > Date: Sat Jun 26 12:17:33 2010
> > New Revision: 958214
> >
> > URL: http://svn.apache.org/viewvc?rev=958214&view=rev
> > Log:
> > Fix some Eclispe / Findbugs warnings
> ...
> > Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/CookieExample.java
>
> > URL:
> > http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/CookieExample.java?rev=958214&r1=958213&r2=958214&view=diff
> >
> ==
> > --- tomcat/trunk/webapps/examples/WEB-INF/classes/CookieExample.java
> (original)
> > +++ tomcat/trunk/webapps/examples/WEB-INF/classes/CookieExample.java Sat
> Jun 26 12:17:33 2010
> > @@ -35,7 +35,7 @@ public class CookieExample extends HttpS
> >
> > private static final long serialVersionUID = 1L;
> >
> > -ResourceBundle rb = ResourceBundle.getBundle("LocalStrings");
> > +private transient ResourceBundle rb =
> ResourceBundle.getBundle("LocalStrings");
>
> shouldn't we init rb in an init method, so that it will be reinitialized
> after deserialization, like messageSender in ChatServlet? That way we
> would get rid of the warnings and have a correct servlet.
Or could they be "private static final" instead?
> Regards,
>
> Felix
>
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r958224 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Sat Jun 26 13:38:03 2010 New Revision: 958224 URL: http://svn.apache.org/viewvc?rev=958224&view=rev Log: vote Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=958224&r1=958223&r2=958224&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Jun 26 13:38:03 2010 @@ -183,5 +183,5 @@ PATCHES PROPOSED TO BACKPORT: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49351 Avoid possible NPE when embedding https://issues.apache.org/bugzilla/show_bug.cgi?id=49351#c1 - +1: markt + +1: markt, kkolinko -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r958214 - in /tomcat/trunk/webapps/examples/WEB-INF/classes: CookieExample.java RequestHeaderExample.java RequestInfoExample.java RequestParamExample.java SessionExample.java chat/Ch
On 26/06/2010 14:18, sebb wrote:
On 26/06/2010, Felix Schumacher wrote:
Hi Mark,
Am Samstag, den 26.06.2010, 12:17 + schrieb ma...@apache.org:
Author: markt
> Date: Sat Jun 26 12:17:33 2010
> New Revision: 958214
>
> URL: http://svn.apache.org/viewvc?rev=958214&view=rev
> Log:
> Fix some Eclispe / Findbugs warnings
...
> Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/CookieExample.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/CookieExample.java?rev=958214&r1=958213&r2=958214&view=diff
>
==
> --- tomcat/trunk/webapps/examples/WEB-INF/classes/CookieExample.java
(original)
> +++ tomcat/trunk/webapps/examples/WEB-INF/classes/CookieExample.java Sat
Jun 26 12:17:33 2010
> @@ -35,7 +35,7 @@ public class CookieExample extends HttpS
>
> private static final long serialVersionUID = 1L;
>
> -ResourceBundle rb = ResourceBundle.getBundle("LocalStrings");
> +private transient ResourceBundle rb =
ResourceBundle.getBundle("LocalStrings");
shouldn't we init rb in an init method, so that it will be reinitialized
after deserialization, like messageSender in ChatServlet? That way we
would get rid of the warnings and have a correct servlet.
Or could they be "private static final" instead?
That would be less work and probably more correct.
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r958226 - in /tomcat/trunk/webapps/examples/WEB-INF/classes: CookieExample.java RequestHeaderExample.java RequestInfoExample.java RequestParamExample.java SessionExample.java
Author: markt
Date: Sat Jun 26 13:50:32 2010
New Revision: 958226
URL: http://svn.apache.org/viewvc?rev=958226&view=rev
Log:
Better way to keep Eclipse happy
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/CookieExample.java
tomcat/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java
tomcat/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java
tomcat/trunk/webapps/examples/WEB-INF/classes/RequestParamExample.java
tomcat/trunk/webapps/examples/WEB-INF/classes/SessionExample.java
Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/CookieExample.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/CookieExample.java?rev=958226&r1=958225&r2=958226&view=diff
==
--- tomcat/trunk/webapps/examples/WEB-INF/classes/CookieExample.java (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/CookieExample.java Sat Jun 26
13:50:32 2010
@@ -35,7 +35,7 @@ public class CookieExample extends HttpS
private static final long serialVersionUID = 1L;
-private transient ResourceBundle rb =
ResourceBundle.getBundle("LocalStrings");
+private static final ResourceBundle RB =
ResourceBundle.getBundle("LocalStrings");
@Override
public void doGet(HttpServletRequest request,
@@ -49,7 +49,7 @@ public class CookieExample extends HttpS
out.println("");
out.println("");
-String title = rb.getString("cookies.title");
+String title = RB.getString("cookies.title");
out.println("" + title + "");
out.println("");
out.println("");
@@ -71,7 +71,7 @@ public class CookieExample extends HttpS
Cookie[] cookies = request.getCookies();
if ((cookies != null) && (cookies.length > 0)) {
-out.println(rb.getString("cookies.cookies") + "");
+out.println(RB.getString("cookies.cookies") + "");
for (int i = 0; i < cookies.length; i++) {
Cookie cookie = cookies[i];
out.print("Cookie Name: " + HTMLFilter.filter(cookie.getName())
@@ -81,7 +81,7 @@ public class CookieExample extends HttpS
+ "");
}
} else {
-out.println(rb.getString("cookies.no-cookies"));
+out.println(RB.getString("cookies.no-cookies"));
}
String cookieName = request.getParameter("cookiename");
@@ -90,20 +90,20 @@ public class CookieExample extends HttpS
Cookie cookie = new Cookie(cookieName, cookieValue);
response.addCookie(cookie);
out.println("");
-out.println(rb.getString("cookies.set") + "");
-out.print(rb.getString("cookies.name") + " "
+out.println(RB.getString("cookies.set") + "");
+out.print(RB.getString("cookies.name") + " "
+ HTMLFilter.filter(cookieName) + "");
-out.print(rb.getString("cookies.value") + " "
+out.print(RB.getString("cookies.value") + " "
+ HTMLFilter.filter(cookieValue));
}
out.println("");
-out.println(rb.getString("cookies.make-cookie") + "");
+out.println(RB.getString("cookies.make-cookie") + "");
out.print("");
-out.print(rb.getString("cookies.name") + " ");
+out.print(RB.getString("cookies.name") + " ");
out.println("");
-out.print(rb.getString("cookies.value") + " ");
+out.print(RB.getString("cookies.value") + " ");
out.println("");
out.println("");
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java?rev=958226&r1=958225&r2=958226&view=diff
==
--- tomcat/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java
(original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java Sat
Jun 26 13:50:32 2010
@@ -35,7 +35,7 @@ public class RequestHeaderExample extend
private static final long serialVersionUID = 1L;
-private transient ResourceBundle rb =
ResourceBundle.getBundle("LocalStrings");
+private static final ResourceBundle RB =
ResourceBundle.getBundle("LocalStrings");
@Override
public void doGet(HttpServletRequest request,
@@ -49,7 +49,7 @@ public class RequestHeaderExample extend
out.println("");
out.println("");
-String title = rb.getString("requestheader.title");
+String title = RB.getString("requestheader.title");
out.println("" + title + "");
out.println("");
out.println("");
Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java
URL:
http://svn.apache.org/viewvc
svn commit: r958258 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Sat Jun 26 17:51:00 2010 New Revision: 958258 URL: http://svn.apache.org/viewvc?rev=958258&view=rev Log: Updated patch addressing review comments Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=958258&r1=958257&r2=958258&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Jun 26 17:51:00 2010 @@ -146,31 +146,9 @@ PATCHES PROPOSED TO BACKPORT: the old roles (manager, admin) will work and will bypass the CSRF protection but using the new roles (manager-gui, admin-gui etc.) will not bypass the CSRF protection. - http://people.apache.org/~markt/patches/2010-06-20-crsf-prevention-filter-tc6.patch + http://people.apache.org/~markt/patches/2010-06-26-crsf-prevention-filter-tc6.patch +1: markt - -1: kkolinko: ( - minor: - s/Tomact/Tomcat/ in several comments - - @author xxd in FilterBase.java - - In CsrfPreventionFilter.setEntryPoints(String) maybe do trimming of the strings, -this.entryPoints.add(value.trim()); - major: - Running with a user that has role manager-gui. - 1. Sessions list page does not work. -Cannot see session detail, cannot invalidate a session. -It is similar to BZ 49476 of TC7. - -This issue also occurs for the user with role "manager". Maybe -allow the filter to skip its check if the user has certain role? - - 2. Showing the standard "error 403" page without any explanation is rude. - 3. I cannot access the Server Status page. This differs with TC7, where - all "manager-*" roles have access to /status/* - 4. I cannot access the following URL, which worked in TC 6.0.26: -http://localhost:8080/manager/html/ - The filter prevents access to it. - The following URL works: -http://localhost:8080/manager/html - ) + -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49414 Differentiate between request threads and application created threads when - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r958287 - /tomcat/trunk/java/org/apache/catalina/core/StandardService.java
Author: kkolinko
Date: Sat Jun 26 21:35:58 2010
New Revision: 958287
URL: http://svn.apache.org/viewvc?rev=958287&view=rev
Log:
Simplify code
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardService.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardService.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardService.java?rev=958287&r1=958286&r2=958287&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardService.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardService.java Sat Jun 26
21:35:58 2010
@@ -380,9 +380,9 @@ public class StandardService extends Lif
*/
public Executor getExecutor(String name) {
synchronized (executors) {
-for (int i = 0; i < executors.size(); i++) {
-if (name.equals(executors.get(i).getName()))
-return executors.get(i);
+for (Executor executor: executors) {
+if (name.equals(executor.getName()))
+return executor;
}
}
return null;
@@ -429,20 +429,20 @@ public class StandardService extends Lif
}
synchronized (executors) {
-for ( int i=0; i
svn commit: r958294 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: kkolinko Date: Sat Jun 26 22:50:58 2010 New Revision: 958294 URL: http://svn.apache.org/viewvc?rev=958294&view=rev Log: vote Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=958294&r1=958293&r2=958294&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Sat Jun 26 22:50:58 2010 @@ -58,4 +58,7 @@ PATCHES PROPOSED TO BACKPORT: The change in session ID is notified to other node. http://svn.apache.org/viewvc?view=revision&revision=955190 +1: kfujino, markt + +1: kkolinko: + 1. to apply to both o.a.c.cluster.session.* and o.a.c.ha.session.* + 2. do not forget to omit the @Override annotation -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
