svn commit: r1186631 - /tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
Author: kfujino
Date: Thu Oct 20 07:00:57 2011
New Revision: 1186631
URL: http://svn.apache.org/viewvc?rev=1186631&view=rev
Log:
Avoid an unnecessary session ID change notice.
Notice of changed session ID by JvmRouteBinderValve is unnecessary to
BackupManager.
In BackupManager, change of session ID is replicated by the call of a setId()
method.
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java?rev=1186631&r1=1186630&r2=1186631&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
Thu Oct 20 07:00:57 2011
@@ -411,7 +411,7 @@ public class JvmRouteBinderValve extends
protected void sendSessionIDClusterBackup(Request request, String
sessionId,
String newSessionID) {
CatalinaCluster c = getCluster();
-if (c != null) {
+if (c != null && getManager(request) instanceof DeltaManager) {
SessionIDMessage msg = new SessionIDMessage();
msg.setOrignalSessionID(sessionId);
msg.setBackupSessionID(newSessionID);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1186632 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/ha/session/JvmRouteBinderValve.java webapps/docs/changelog.xml
Author: kfujino
Date: Thu Oct 20 07:03:03 2011
New Revision: 1186632
URL: http://svn.apache.org/viewvc?rev=1186632&view=rev
Log:
Avoid an unnecessary session ID change notice.
Notice of changed session ID by JvmRouteBinderValve is unnecessary to
BackupManager.
In BackupManager, change of session ID is replicated by the call of a setId()
method.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java?rev=1186632&r1=1186631&r2=1186632&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
Thu Oct 20 07:03:03 2011
@@ -411,7 +411,7 @@ public class JvmRouteBinderValve extends
protected void sendSessionIDClusterBackup(Request request, String
sessionId,
String newSessionID) {
CatalinaCluster c = getCluster();
-if (c != null) {
+if (c != null && getManager(request) instanceof DeltaManager) {
SessionIDMessage msg = new SessionIDMessage();
msg.setOrignalSessionID(sessionId);
msg.setBackupSessionID(newSessionID);
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1186632&r1=1186631&r2=1186632&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Oct 20 07:03:03 2011
@@ -150,6 +150,16 @@
+
+
+
+Avoid an unnecessary session ID change notice.
+Notice of changed session ID by JvmRouteBinderValve is unnecessary to
+BackupManager. In BackupManager, change of session ID is replicated by
+the call of a setId() method. (kfujino)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1186635 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kfujino Date: Thu Oct 20 07:12:17 2011 New Revision: 1186635 URL: http://svn.apache.org/viewvc?rev=1186635&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=1186635&r1=1186634&r2=1186635&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Oct 20 07:12:17 2011 @@ -84,6 +84,12 @@ PATCHES PROPOSED TO BACKPORT: +1: kkolinko -1: +* Avoid an unnecessary session ID change notice. + Notice of changed session ID by JvmRouteBinderValve is unnecessary to BackupManager. + In BackupManager, change of session ID is replicated by the call of a setId() method. + http://svn.apache.org/viewvc?view=revision&revision=1186632 + +1: kfujino + -1: PATCHES/ISSUES THAT ARE STALLED - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/2389 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1186631 Blamelist: kfujino Build succeeded! sincerely, -The Buildbot
Re: svn commit: r1186485 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/http11/AbstractHttp11Processor.java webapps/docs/changelog.xml
2011/10/20 :
> Author: markt
> Date: Wed Oct 19 20:55:39 2011
> New Revision: 1186485
>
> URL: http://svn.apache.org/viewvc?rev=1186485&view=rev
> Log:
> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52055
> Buffers not correctly reset between keep-alive requests when using async
>
> Modified:
> tomcat/tc7.0.x/trunk/ (props changed)
>
> tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
> tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
>
> ---
> tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
> (original)
> +++
> tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
> Wed Oct 19 20:55:39 2011
> @@ -1538,6 +1538,8 @@ public abstract class AbstractHttp11Proc
> if (!keepAlive) {
> return SocketState.CLOSED;
> } else {
> + getInputBuffer().nextRequest();
> + getOutputBuffer().nextRequest();
> return SocketState.OPEN;
> }
> }
>
Searching for places that use org.apache.coyote.Constants.STAGE_ENDED ...
1) it looks like AbstractAjpProcessor#asyncDispatch(SocketStatus)
needs similar patch:
it has "return SocketState.OPEN;"
If I understand correctly in Ajp that will be recycle(false)
2) In Http11NioProcessor#event() I do not see nextRequest() calls, but
similar implementation in Http11AprProcessor#event() has nextRequest()
calls.
Best regards,
Konstantin Kolinko
> --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
> +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Oct 19 20:55:39 2011
> @@ -110,6 +110,11 @@
> authentication from being lost during the authentication process.
> (markt)
>
> +
> + 52055: Ensure that the input and output buffers are
> correctly
> + reset between keep-alive requests when using Servlet 3.0 asynchronous
> + request processing. (markt)
> +
>
>
>
>
>
>
> -
> 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: r1186681 - /tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java
Author: kfujino
Date: Thu Oct 20 09:19:37 2011
New Revision: 1186681
URL: http://svn.apache.org/viewvc?rev=1186681&view=rev
Log:
Fix BZ52015.
JdbcInterceptor passes not 'this' but 'proxy' to getNext().invoke.
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java?rev=1186681&r1=1186680&r2=1186681&view=diff
==
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java
Thu Oct 20 09:19:37 2011
@@ -92,7 +92,7 @@ public abstract class JdbcInterceptor im
@Override
public Object invoke(Object proxy, Method method, Object[] args) throws
Throwable {
-if (getNext()!=null) return getNext().invoke(this,method,args);
+if (getNext()!=null) return getNext().invoke(proxy,method,args);
else throw new NullPointerException();
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1186683 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: kfujino Date: Thu Oct 20 09:24:59 2011 New Revision: 1186683 URL: http://svn.apache.org/viewvc?rev=1186683&view=rev Log: update changelog for bz52015. Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1186683&r1=1186682&r2=1186683&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Oct 20 09:24:59 2011 @@ -185,6 +185,10 @@ Remove some unused code from the packaged renamed Commons BCEL. (markt) + +52015: In jdbc-pool: JdbcInterceptor passes not 'this' but +'proxy' to getNext().invoke. (kfujino) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1186687 - /tomcat/tc7.0.x/trunk/modules/
Author: kfujino Date: Thu Oct 20 09:28:52 2011 New Revision: 1186687 URL: http://svn.apache.org/viewvc?rev=1186687&view=rev Log: Update external. Modified: tomcat/tc7.0.x/trunk/modules/ (props changed) Propchange: tomcat/tc7.0.x/trunk/modules/ -- --- svn:externals (original) +++ svn:externals Thu Oct 20 09:28:52 2011 @@ -1 +1 @@ -^/tomcat/trunk/modules/jdbc-pool@1186079 jdbc-pool +^/tomcat/trunk/modules/jdbc-pool@1186681 jdbc-pool - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51953] Proposal: netmask filtering valve and filter
https://issues.apache.org/bugzilla/show_bug.cgi?id=51953 --- Comment #23 from Francis Galiegue 2011-10-20 09:31:34 UTC --- Comments? -- 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 52015] JdbcInterceptor passes wrong argument to getNext().invoke
https://issues.apache.org/bugzilla/show_bug.cgi?id=52015 Keiichi Fujino changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Keiichi Fujino 2011-10-20 09:34:13 UTC --- Thanks for report. This is fixed in r1186681 and will be in 7.0.23 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: r1186712 - /tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
Author: kkolinko
Date: Thu Oct 20 10:18:40 2011
New Revision: 1186712
URL: http://svn.apache.org/viewvc?rev=1186712&view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=51940#c9
Restore original method name when forward to the login page returns
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java?rev=1186712&r1=1186711&r2=1186712&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
Thu Oct 20 10:18:40 2011
@@ -391,9 +391,6 @@ public class FormAuthenticator
config.getLoginPage(), context.getName()));
}
-// Always use GET for the login page, regardless of the method used
-request.getCoyoteRequest().method().setString("GET");
-
String loginPage = config.getLoginPage();
if (loginPage == null || loginPage.length() == 0) {
String msg = sm.getString("formAuthenticator.noLoginPage",
@@ -404,6 +401,10 @@ public class FormAuthenticator
return;
}
+// Always use GET for the login page, regardless of the method used
+String oldMethod = request.getMethod();
+request.getCoyoteRequest().method().setString("GET");
+
RequestDispatcher disp =
context.getServletContext().getRequestDispatcher(loginPage);
try {
@@ -418,6 +419,9 @@ public class FormAuthenticator
request.setAttribute(RequestDispatcher.ERROR_EXCEPTION, t);
response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
msg);
+} finally {
+// Restore original method so that it is written into access log
+request.getCoyoteRequest().method().setString(oldMethod);
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1186719 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/authenticator/FormAuthenticator.java webapps/docs/changelog.xml
Author: kkolinko Date: Thu Oct 20 10:25:45 2011 New Revision: 1186719 URL: http://svn.apache.org/viewvc?rev=1186719&view=rev Log: Merged revision 1186712 from tomcat/trunk: https://issues.apache.org/bugzilla/show_bug.cgi?id=51940#c9 Restore original method name when forward to the login page returns Simplify a changelog message. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 20 10:25:45 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712 Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java?rev=1186719&r1=1186718&r2=1186719&view=diff == --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator
DO NOT REPLY [Bug 51940] Form Authentication Valve should restore request body on PUT method
https://issues.apache.org/bugzilla/show_bug.cgi?id=51940
--- Comment #11 from Konstantin Kolinko 2011-10-20
10:28:18 UTC ---
(In reply to comment #10)
> (In reply to comment #9)
> > 1. I tried to test this in trunk, and replaying a POST request fails for me.
>
> That is a side-effect of r987955 which is not directly related to this bug.
Confirming that r1186379 / r1186383 fixed it.
Tomcat 6 is not affected by this issue.
>
> > 2. request.getCoyoteRequest().method().setString("GET");
> > is seen as GET in access log. Not much of an issue though, as anyway we
> > return
> > not what was originally requested by client.
> >
> > I think that to fix this one can restore the original method in
> > FormAuthenticator#forwardToLoginPage(..) when disp.forward() call returns.
>
> That would work. I'm on the fence. We can record what was requested or what we
> process.
Fixed this in r1186712 / r1186719
--
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 51940] Form Authentication Valve should restore request body on PUT method
https://issues.apache.org/bugzilla/show_bug.cgi?id=51940 --- Comment #12 from Konstantin Kolinko 2011-10-20 10:39:24 UTC --- Created attachment 27825 --> https://issues.apache.org/bugzilla/attachment.cgi?id=27825 2011-10-20_tc6_51940_v3.patch TC 6 version of the patch In trunk these are r1181028, r1181136, r1186378, r1186712 -- 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: r1186731 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko
Date: Thu Oct 20 10:49:49 2011
New Revision: 1186731
URL: http://svn.apache.org/viewvc?rev=1186731&view=rev
Log:
Updated the patch.
Added r1186378 and aligned with r1186712.
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=1186731&r1=1186730&r2=1186731&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Oct 20 10:49:49 2011
@@ -77,10 +77,9 @@ PATCHES PROPOSED TO BACKPORT:
actual patch:
http://people.apache.org/~kkolinko/patches/2011-10-19_tc6_51940.patch
- A slightly changed version of the patch, that adds a finally{} block
- to restore original method name, so that it is printed correctly
- in access logs:
- http://people.apache.org/~kkolinko/patches/2011-10-19_tc6_51940_v2.patch
+ Updated patch: added r1186378, r1186712
+ r1186712 = restore original method name, so that it is printed correctly in
access logs
+ https://issues.apache.org/bugzilla/attachment.cgi?id=27825
+1: kkolinko
-1:
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1186743 - /tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
Author: kkolinko
Date: Thu Oct 20 11:29:38 2011
New Revision: 1186743
URL: http://svn.apache.org/viewvc?rev=1186743&view=rev
Log:
in TestFormAuthenticator:
Replaced string concatenation with StringBuilder. Autoformatted the code.
No functional change.
Modified:
tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
Modified:
tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java?rev=1186743&r1=1186742&r2=1186743&view=diff
==
---
tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
Thu Oct 20 11:29:38 2011
@@ -57,18 +57,17 @@ public class TestFormAuthenticator exten
doTest("POST", "POST", true);
}
-
private void doTest(String resourceMethod, String redirectMethod,
boolean useContinue) throws Exception {
FormAuthClient client = new FormAuthClient();
-// First request for authenticated resource
+// First request for authenticated resource
client.setUseContinue(useContinue);
client.doResourceRequest(resourceMethod);
assertTrue(client.isResponse200());
assertTrue(client.isResponseBodyOK());
client.reset();
-
+
// Second request for the login page
client.setUseContinue(useContinue);
client.doLoginRequest();
@@ -95,7 +94,6 @@ public class TestFormAuthenticator exten
}
}
-
private final class FormAuthClient extends SimpleHttpClient {
private static final String LOGIN_PAGE = "j_security_check";
@@ -108,9 +106,9 @@ public class TestFormAuthenticator exten
private FormAuthClient() throws Exception {
Tomcat tomcat = getTomcatInstance();
File appDir = new File(getBuildDirectory(), "webapps/examples");
-Context ctx =
-tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath());
-
+Context ctx = tomcat.addWebapp(null, "/examples",
+appDir.getAbsolutePath());
+
MapRealm realm = new MapRealm();
realm.addUser("tomcat", "tomcat");
realm.addUserRole("tomcat", "tomcat");
@@ -120,61 +118,65 @@ public class TestFormAuthenticator exten
tomcat.start();
}
-
+
private void doResourceRequest(String method) throws Exception {
-String request[] = new String[2];
-request [0] = method + " " + protectedLocation + protectedPage +
-" HTTP/1.1" + CRLF;
-request[0] = request[0] +
-"Host: localhost" + CRLF +
-"Connection: close" + CRLF;
+StringBuilder requestHead = new StringBuilder(128);
+String requestTail;
+requestHead.append(method).append(" ").append(protectedLocation)
+.append(protectedPage).append(" HTTP/1.1").append(CRLF);
+requestHead.append("Host: localhost").append(CRLF);
+requestHead.append("Connection: close").append(CRLF);
if (getUseContinue()) {
-request[0] = request[0] +
-"Expect: 100-continue" + CRLF;
+requestHead.append("Expect: 100-continue").append(CRLF);
}
if (sessionId != null) {
-request[0] = request[0] +
-"Cookie: JSESSIONID=" + sessionId + CRLF;
+requestHead.append("Cookie: JSESSIONID=").append(sessionId)
+.append(CRLF);
}
if ("POST".equals(method)) {
-request[0] = request[0] +
-"Content-Type: application/x-www-form-urlencoded" +
CRLF +
-"Content-length: 7" + CRLF +
-CRLF;
-request[1] = "foo=bar";
+requestHead.append(
+"Content-Type: application/x-www-form-urlencoded")
+.append(CRLF);
+requestHead.append("Content-length: 7").append(CRLF);
+requestHead.append(CRLF);
+requestTail = "foo=bar";
} else {
-request[1] = CRLF;
+requestTail = CRLF;
}
+String request[] = new String[2];
+request[0] = requestHead.toString();
+request[1] = requestTail;
doRequest(request);
}
private void doLoginRequest() throws Exception {
-String request[] = new String[2];
-request [0] = "POST " + protectedLocation + LOGIN_PAGE +
-" HTTP/1.1" + CRLF;
-request[0]
svn commit: r1186750 - /tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
Author: kkolinko
Date: Thu Oct 20 11:56:54 2011
New Revision: 1186750
URL: http://svn.apache.org/viewvc?rev=1186750&view=rev
Log:
Expand the test to cover regression fixed in 7.0.23:
check that parameters in the original request have reached the protected page.
https://issues.apache.org/bugzilla/show_bug.cgi?id=51940#c9
Modified:
tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
Modified:
tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java?rev=1186750&r1=1186749&r2=1186750&view=diff
==
---
tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
Thu Oct 20 11:56:54 2011
@@ -19,6 +19,7 @@ package org.apache.catalina.authenticato
import java.io.File;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import org.junit.Test;
@@ -123,7 +124,11 @@ public class TestFormAuthenticator exten
StringBuilder requestHead = new StringBuilder(128);
String requestTail;
requestHead.append(method).append(" ").append(protectedLocation)
-.append(protectedPage).append(" HTTP/1.1").append(CRLF);
+.append(protectedPage);
+if ("GET".equals(method)) {
+requestHead.append("?role=bar");
+}
+requestHead.append(" HTTP/1.1").append(CRLF);
requestHead.append("Host: localhost").append(CRLF);
requestHead.append("Connection: close").append(CRLF);
if (getUseContinue()) {
@@ -137,9 +142,9 @@ public class TestFormAuthenticator exten
requestHead.append(
"Content-Type: application/x-www-form-urlencoded")
.append(CRLF);
-requestHead.append("Content-length: 7").append(CRLF);
+requestHead.append("Content-length: 8").append(CRLF);
requestHead.append(CRLF);
-requestTail = "foo=bar";
+requestTail = "role=bar";
} else {
requestTail = CRLF;
}
@@ -190,20 +195,32 @@ public class TestFormAuthenticator exten
@Override
public boolean isResponseBodyOK() {
-String expected;
-
if (requestCount == 1) {
// First request should result in the login page
-expected = "Login Page for Examples";
+assertContains(getResponseBody(),
+"Login Page for Examples");
+return true;
} else if (requestCount == 2) {
// Second request should result in a redirect
return true;
} else {
// Subsequent requests should result in the protected page
-expected = "Protected Page for Examples";
+// The role parameter should have reached the page
+String body = getResponseBody();
+assertContains(body,
+"Protected Page for Examples");
+assertContains(body,
+"
svn commit: r1186752 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/authenticator/TestFormAuthenticator.java
Author: kkolinko Date: Thu Oct 20 11:58:57 2011 New Revision: 1186752 URL: http://svn.apache.org/viewvc?rev=1186752&view=rev Log: Merged revision 1186743 from tomcat/trunk: in TestFormAuthenticator: Replaced string concatenation with StringBuilder. Autoformatted the code. No functional change. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 20 11:58:57 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743 Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java?rev=1186752&r1=1186751&r2=1186752&view=diff == --- tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java (original) +++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java Thu Oct 20 11:58:57 2011 @@ -57,18 +57,17 @@
svn commit: r1186753 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/authenticator/TestFormAuthenticator.java
Author: kkolinko Date: Thu Oct 20 12:01:22 2011 New Revision: 1186753 URL: http://svn.apache.org/viewvc?rev=1186753&view=rev Log: Merged revision 1186750 from tomcat/trunk: Expand the test to cover regression fixed in 7.0.23: check that parameters in the original request have reached the protected page. https://issues.apache.org/bugzilla/show_bug.cgi?id=51940#c9 Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 20 12:01:22 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750 Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java?rev=1186753&r1=1186752&r2=1186753&view=diff == --- tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java (original) +++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/a
DO NOT REPLY [Bug 49779] 501 Method not implemented with successive POST requests
https://issues.apache.org/bugzilla/show_bug.cgi?id=49779 --- Comment #4 from Konstantin Kolinko 2011-10-20 12:13:52 UTC --- (In reply to comment #3) > One side-effect of consuming the Request's body is that consumers of the > restored request are forced into using request.getInputStream() i.e. you > cannot > attempt to obtain a reader via request.getReader(). https://issues.apache.org/bugzilla/show_bug.cgi?id=51940#c9 Should be fixed in 7.0.23 with r1186383 , but please check it. Comments in FIXED bugs are usually lost. It is always better to REOPEN it if there are problems and the fix was done recently, or file a NEW bug if time has passed. As usual you'd better provide a scenario / sample webapp to reproduce it. -- 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: r1186763 - /tomcat/trunk/res/tomcat.nsi
Author: kkolinko Date: Thu Oct 20 12:36:07 2011 New Revision: 1186763 URL: http://svn.apache.org/viewvc?rev=1186763&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52059 Delete Tomcat key from HKLM branch of Windows Registry on deinstallation. The bug affects 32-bit systems only. The code for 64-bit registry a few lines below is OK. Modified: tomcat/trunk/res/tomcat.nsi Modified: tomcat/trunk/res/tomcat.nsi URL: http://svn.apache.org/viewvc/tomcat/trunk/res/tomcat.nsi?rev=1186763&r1=1186762&r2=1186763&view=diff == --- tomcat/trunk/res/tomcat.nsi (original) +++ tomcat/trunk/res/tomcat.nsi Thu Oct 20 12:36:07 2011 @@ -1108,7 +1108,7 @@ Section Uninstall ; Don't know if 32-bit or 64-bit registry was used so, for now, remove both SetRegView 32 DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Apache Tomcat @VERSION_MAJOR_MINOR@ $TomcatServiceName" - DeleteRegKey HKLM "SOFTWARE\Apache Software Foundation\Tomcat\@VERSION_MAJOR_MINOR@ $TomcatServiceName" + DeleteRegKey HKLM "SOFTWARE\Apache Software Foundation\Tomcat\@VERSION_MAJOR_MINOR@\$TomcatServiceName" DeleteRegValue HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Run" "ApacheTomcatMonitor@VERSION_MAJOR_MINOR@_$TomcatServiceName" DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "ApacheTomcatMonitor@VERSION_MAJOR_MINOR@_$TomcatServiceName" SetRegView 64 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1186769 - in /tomcat/tc7.0.x/trunk: ./ res/tomcat.nsi webapps/docs/changelog.xml
Author: kkolinko Date: Thu Oct 20 12:46:47 2011 New Revision: 1186769 URL: http://svn.apache.org/viewvc?rev=1186769&view=rev Log: Merged revision 1186763 from tomcat/trunk: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52059 Delete Tomcat key from HKLM branch of Windows Registry on deinstallation. The bug affects 32-bit systems only. The code for 64-bit registry a few lines below is OK. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/res/tomcat.nsi tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 20 12:46:47 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763 Modified: tomcat/tc7.0.x/trunk/res/tomcat.nsi URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/tomcat.nsi?rev=1186769&r1=1186768&r2=1186769&view=diff == --- tomcat/tc7.0.x/trunk/res/tomcat.nsi (original) +++ tomcat/tc7.0.x/trunk/res/tomcat.nsi Thu Oct 20 12:46:47 2011 @@ -1108,7 +1108,7 @@ Section Uninstall ; Don't know if 32-bit or 64-bit registry was use
DO NOT REPLY [Bug 52059] Windows Registry are not removed after uninstall
https://issues.apache.org/bugzilla/show_bug.cgi?id=52059 Konstantin Kolinko changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|WORKSFORME | --- Comment #2 from Konstantin Kolinko 2011-10-20 12:49:42 UTC --- Reproduced with 7.0.22 on WinXP 32-bit. It is a typo in 32-bit branch of code. Fixed by r1186763 and will be in 7.0.23 I'll propose backport for 6.0 and 5.5. -- 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: r1186776 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Thu Oct 20 12:56:31 2011 New Revision: 1186776 URL: http://svn.apache.org/viewvc?rev=1186776&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=1186776&r1=1186775&r2=1186776&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Oct 20 12:56:31 2011 @@ -90,6 +90,19 @@ PATCHES PROPOSED TO BACKPORT: +1: kfujino -1: +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52059 + http://svn.apache.org/viewvc?rev=1186763&view=rev + Fix a typo in Windows uninstaller: + Do not forget to remove Tomcat keys from 32-bit registry on deinstallation. + +1: kkolinko + -1: + +* In GenericPrincipal, SerializablePrincipal: + Do not sort lists that have only one element + http://svn.apache.org/viewvc?view=revision&revision=1178684 + +1: kkolinko + -1: + PATCHES/ISSUES THAT ARE STALLED * Backport JSP unloading patch (BZ48358). - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1186777 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: kkolinko Date: Thu Oct 20 12:57:13 2011 New Revision: 1186777 URL: http://svn.apache.org/viewvc?rev=1186777&view=rev Log: proposal 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=1186777&r1=1186776&r2=1186777&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Oct 20 12:57:13 2011 @@ -44,3 +44,9 @@ PATCHES PROPOSED TO BACKPORT: immediately before tagging. -1: +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52059 + http://svn.apache.org/viewvc?rev=1186763&view=rev + Fix a typo in Windows uninstaller: + Do not forget to remove Tomcat keys from 32-bit registry on deinstallation. + +1: 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 52059] Windows Registry are not removed after uninstall
https://issues.apache.org/bugzilla/show_bug.cgi?id=52059 --- Comment #3 from Mark Thomas 2011-10-20 15:29:16 UTC --- Ah. I was testing on 64-bit which is why I didn't see it. -- 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
Re: svn commit: r1186631 - /tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
On 20/10/2011 08:00, kfuj...@apache.org wrote:
> Author: kfujino
> Date: Thu Oct 20 07:00:57 2011
> New Revision: 1186631
>
> URL: http://svn.apache.org/viewvc?rev=1186631&view=rev
> Log:
> Avoid an unnecessary session ID change notice.
Given this...
> Notice of changed session ID by JvmRouteBinderValve is unnecessary to
> BackupManager.
> +if (c != null && getManager(request) instanceof DeltaManager) {
Might this be better to account for custom Manager implementations?
if (c != null && !(getManager(request) instanceof BackupManager)) {
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52059] Windows Registry are not removed after uninstall
https://issues.apache.org/bugzilla/show_bug.cgi?id=52059 Mark Thomas changed: What|Removed |Added Component|Packaging |Native:Packaging Version|7.0.22 |6.0.33 Product|Tomcat 7|Tomcat 6 Target Milestone|--- |default --- Comment #4 from Mark Thomas 2011-10-20 15:38:06 UTC --- Moving to 6 since fixed in 7. -- 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
Re: svn commit: r1186485 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/http11/AbstractHttp11Processor.java webapps/docs/changelog.xml
On 20/10/2011 10:07, Konstantin Kolinko wrote: > 2011/10/20 : >> Author: markt >> Date: Wed Oct 19 20:55:39 2011 >> New Revision: 1186485 >> >> URL: http://svn.apache.org/viewvc?rev=1186485&view=rev >> Log: >> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52055 >> Buffers not correctly reset between keep-alive requests when using async > Searching for places that use org.apache.coyote.Constants.STAGE_ENDED ... SocketState.OPEN is probably a clearer indication of this particular circumstance. > 1) it looks like AbstractAjpProcessor#asyncDispatch(SocketStatus) > needs similar patch: > it has "return SocketState.OPEN;" > > If I understand correctly in Ajp that will be recycle(false) This already happens. asyncDispatch() is called from AbstractProtocol$AbstractConnectionHandler which will call release() when SocketState.OPEN is returned which in turn calls processor.recycle(false) > 2) In Http11NioProcessor#event() I do not see nextRequest() calls, but > similar implementation in Http11AprProcessor#event() has nextRequest() > calls. For APR on CLOSED, I don't see that the nextRequest() calls are doing anything useful. The processor is going to get recycled which will recycle the buffers. There is no need for nextRequest() in this case. For NIO on OPEN, I think there is a case for nextRequest(). I'll add the necessary calls. The more similar the connectors, the easier this type of code review becomes. I would suggest that this supports the view that refactoring the connections to align the code is a good thing. I think there is still scope to further align code both across the BIO/NIO/APR boundary but also across the HTTP/AJP boundary. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1186890 - in /tomcat/trunk/java/org/apache/coyote/http11: Http11AprProcessor.java Http11NioProcessor.java
Author: markt
Date: Thu Oct 20 16:30:22 2011
New Revision: 1186890
URL: http://svn.apache.org/viewvc?rev=1186890&view=rev
Log:
Clean-up. No functional change.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1186890&r1=1186889&r2=1186890&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Thu Oct
20 16:30:22 2011
@@ -61,7 +61,7 @@ public class Http11AprProcessor extends
int maxTrailerSize) {
super(endpoint);
-
+
inputBuffer = new InternalAprInputBuffer(request, headerBufferSize);
request.setInputBuffer(inputBuffer);
@@ -106,7 +106,7 @@ public class Http11AprProcessor extends
* provider is used to perform the conversion. For example it is used with
* the AJP connectors, the HTTP APR connector and with the
* {@link org.apache.catalina.valves.SSLValve}. If not specified, the
- * default provider will be used.
+ * default provider will be used.
*/
protected String clientCertProvider = null;
public String getClientCertProvider() { return clientCertProvider; }
@@ -125,9 +125,9 @@ public class Http11AprProcessor extends
@Override
public SocketState event(SocketStatus status)
throws IOException {
-
+
RequestInfo rp = request.getRequestProcessor();
-
+
try {
rp.setStage(org.apache.coyote.Constants.STAGE_SERVICE);
error = !adapter.event(request, response, status);
@@ -141,7 +141,7 @@ public class Http11AprProcessor extends
adapter.log(request, response, 0);
error = true;
}
-
+
rp.setStage(org.apache.coyote.Constants.STAGE_ENDED);
if (error) {
@@ -156,7 +156,7 @@ public class Http11AprProcessor extends
return SocketState.LONG;
}
}
-
+
@Override
protected boolean disableKeepAlive() {
return false;
@@ -170,10 +170,10 @@ public class Http11AprProcessor extends
// APR uses simulated blocking so if some request line data is present
// then it must all be presented (with the normal socket timeout).
-
+
// When entering the processing loop for the first time there will
// always be some data to read so the keep-alive timeout is not
required
-
+
// For the second and subsequent executions of the processing loop, if
// there is no request line data present then no further data will be
// read from the socket. If there is request line data present then it
@@ -182,7 +182,7 @@ public class Http11AprProcessor extends
// When the socket is created it is given the correct timeout.
// sendfile may change the timeout but will restore it
// This processor may change the timeout for uploads but will restore
it
-
+
// NO-OP
}
@@ -209,8 +209,8 @@ public class Http11AprProcessor extends
protected void setSocketTimeout(int timeout) {
Socket.timeoutSet(socket.getSocket().longValue(), timeout * 1000);
}
-
-
+
+
@Override
protected void setCometTimeouts(SocketWrapper socketWrapper) {
// NO-OP for APR/native
@@ -257,7 +257,7 @@ public class Http11AprProcessor extends
socket = null;
sendfileData = null;
}
-
+
// - ActionHook Methods
@@ -272,7 +272,7 @@ public class Http11AprProcessor extends
public void actionInternal(ActionCode actionCode, Object param) {
long socketRef = socket.getSocket().longValue();
-
+
if (actionCode == ActionCode.REQ_HOST_ADDR_ATTRIBUTE) {
// Get remote host address
@@ -375,10 +375,10 @@ public class Http11AprProcessor extends
certs = new X509Certificate[certLength + 1];
CertificateFactory cf;
if (clientCertProvider == null) {
-cf = CertificateFactory.getInstance("X.509");
+cf = CertificateFactory.getInstance("X.509");
} else {
cf = CertificateFactory.getInstance("X.509",
-clientCertProvider);
+clientCertProvider);
}
certs[0] = (X509Certificate)
cf.generateCertificate(new ByteArrayInputStream(clientCert));
for (int i =
svn commit: r1186891 - /tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
Author: olamy
Date: Thu Oct 20 16:30:28 2011
New Revision: 1186891
URL: http://svn.apache.org/viewvc?rev=1186891&view=rev
Log:
[MTOMCAT-102] not fail if META-INF/context.xml is not here
Modified:
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
Modified:
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java?rev=1186891&r1=1186890&r2=1186891&view=diff
==
---
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
Thu Oct 20 16:30:28 2011
@@ -28,6 +28,7 @@ import org.apache.tomcat.util.http.fileu
import java.io.BufferedOutputStream;
import java.io.File;
+import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -231,6 +232,10 @@ public class Tomcat7Runner
return url;
}
}
+catch ( FileNotFoundException e )
+{
+return null;
+}
finally
{
IOUtils.closeQuietly( inputStream );
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1186892 - /tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
Author: markt
Date: Thu Oct 20 16:31:02 2011
New Revision: 1186892
URL: http://svn.apache.org/viewvc?rev=1186892&view=rev
Log:
Remove unnecessary calls. Closing the socket recycles the processor
which in turn recycles the buffers.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1186892&r1=1186891&r2=1186892&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Thu Oct
20 16:31:02 2011
@@ -145,8 +145,6 @@ public class Http11AprProcessor extends
rp.setStage(org.apache.coyote.Constants.STAGE_ENDED);
if (error) {
-inputBuffer.nextRequest();
-outputBuffer.nextRequest();
return SocketState.CLOSED;
} else if (!comet) {
inputBuffer.nextRequest();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1186894 - /tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
Author: markt
Date: Thu Oct 20 16:31:38 2011
New Revision: 1186894
URL: http://svn.apache.org/viewvc?rev=1186894&view=rev
Log:
When a comet request ends and the socket is being kept alive, prepare
the buffers for the next request.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1186894&r1=1186893&r2=1186894&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Thu Oct
20 16:31:38 2011
@@ -157,7 +157,13 @@ public class Http11NioProcessor extends
if (error) {
return SocketState.CLOSED;
} else if (!comet) {
-return (keepAlive)?SocketState.OPEN:SocketState.CLOSED;
+if (keepAlive) {
+inputBuffer.nextRequest();
+outputBuffer.nextRequest();
+return SocketState.OPEN;
+} else {
+return SocketState.CLOSED;
+}
} else {
return SocketState.LONG;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1186898 - /tomcat/tc7.0.x/trunk/
Author: markt Date: Thu Oct 20 16:32:12 2011 New Revision: 1186898 URL: http://svn.apache.org/viewvc?rev=1186898&view=rev Log: Clean-up. No functional change. Modified: tomcat/tc7.0.x/trunk/ (props changed) Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 20 16:32:12 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186891 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1186899 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/http11/Http11AprProcessor.java
Author: markt Date: Thu Oct 20 16:33:05 2011 New Revision: 1186899 URL: http://svn.apache.org/viewvc?rev=1186899&view=rev Log: Remove unnecessary calls. Closing the socket recycles the processor which in turn recycles the buffers. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 20 16:33:05 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186891 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186891-1186892 Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1186899&r1=1186898&r2=1186899&view=diff == --- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Thu Oct 20 16:33:05 2011 @@ -145,8 +145,6 @@ public class Http11AprProcessor extends rp.setStage(o
svn commit: r1186900 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/http11/Http11NioProcessor.java
Author: markt Date: Thu Oct 20 16:33:52 2011 New Revision: 1186900 URL: http://svn.apache.org/viewvc?rev=1186900&view=rev Log: When a comet request ends and the socket is being kept alive, prepare the buffers for the next request. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 20 16:33:52 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186891-1186892 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186891-1186892,1186894 Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1186900&r1=1186899&r2=1186900&view=diff == --- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Thu Oct 20 16:33:52 2011 @@ -155,7 +155,13 @@ public class Http11NioProcessor extends
[jira] [Commented] (MTOMCAT-102) Add a mojo to build a standalone jar to run a web application
[ https://issues.apache.org/jira/browse/MTOMCAT-102?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13131742#comment-13131742 ] Hudson commented on MTOMCAT-102: Integrated in TomcatMavenPlugin #52 (See [https://builds.apache.org/job/TomcatMavenPlugin/52/]) [MTOMCAT-102] not fail if META-INF/context.xml is not here olamy : http://svn.apache.org/viewvc/?view=rev&rev=1186891 Files : * /tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java > Add a mojo to build a standalone jar to run a web application > - > > Key: MTOMCAT-102 > URL: https://issues.apache.org/jira/browse/MTOMCAT-102 > Project: Apache Tomcat Maven Plugin > Issue Type: New Feature > Components: tomcat7 >Reporter: Olivier Lamy >Assignee: Olivier Lamy > Fix For: 2.0 > > > goal exec-war will create a standalone jar which will contains all tomcat > jars, a war to run your application with a simple java -jar -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1186898 - /tomcat/tc7.0.x/trunk/
2011/10/20 : > Author: markt > Date: Thu Oct 20 16:32:12 2011 > New Revision: 1186898 > > URL: http://svn.apache.org/viewvc?rev=1186898&view=rev > Log: > Clean-up. No functional change. Empty commit. You merged r1186891 (Oliver's commit on maven-tomcat), but cleanup was in r1186890 Hint: cd tc7.0.x\trunk\ svn diff -c 1186898 > > Modified: > tomcat/tc7.0.x/trunk/ (props changed) > > Propchange: tomcat/tc7.0.x/trunk/ > -- > --- svn:mergeinfo (original) > +++ svn:mergeinfo Thu Oct 20 16:32:12 2011 > @@ -1 +1 @@ > -/(...)б1186479-1186480,1186712,1186743,1186750,1186763 > +/(...),1186479-1186480,1186712,1186743,1186750,1186763,1186891 Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1186926 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Thu Oct 20 17:10:16 2011 New Revision: 1186926 URL: http://svn.apache.org/viewvc?rev=1186926&view=rev Log: Use Konstantin's more complete patch 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=1186926&r1=1186925&r2=1186926&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Oct 20 17:10:16 2011 @@ -66,21 +66,10 @@ PATCHES PROPOSED TO BACKPORT: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51940 Don't limit saving of request bodies during FORM authentication to POST - requests since any HTTP method may include a body. + requests since any HTTP method may include a body plus review improvements. Based on a patch by Nicholas Sushkin - http://svn.apache.org/viewvc?rev=1181030&view=rev - http://svn.apache.org/viewvc?rev=1181137&view=rev - (1181028,1181136 in trunk) - +1: markt, rjung - -1: - +1: kkolinko: Performing a merge does not complete cleanly. Here is the - actual patch: - http://people.apache.org/~kkolinko/patches/2011-10-19_tc6_51940.patch - - Updated patch: added r1186378, r1186712 - r1186712 = restore original method name, so that it is printed correctly in access logs https://issues.apache.org/bugzilla/attachment.cgi?id=27825 - +1: kkolinko + +1: kkolinko, markt -1: * Avoid an unnecessary session ID change notice. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1186932 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Thu Oct 20 17:12:52 2011 New Revision: 1186932 URL: http://svn.apache.org/viewvc?rev=1186932&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=1186932&r1=1186931&r2=1186932&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Oct 20 17:12:52 2011 @@ -77,19 +77,20 @@ PATCHES PROPOSED TO BACKPORT: In BackupManager, change of session ID is replicated by the call of a setId() method. http://svn.apache.org/viewvc?view=revision&revision=1186632 +1: kfujino + +0: markt (see http://markmail.org/message/otohu2w3o5v7l732) -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52059 http://svn.apache.org/viewvc?rev=1186763&view=rev Fix a typo in Windows uninstaller: Do not forget to remove Tomcat keys from 32-bit registry on deinstallation. - +1: kkolinko + +1: kkolinko, markt -1: * In GenericPrincipal, SerializablePrincipal: Do not sort lists that have only one element http://svn.apache.org/viewvc?view=revision&revision=1178684 - +1: kkolinko + +1: kkolinko, markt -1: PATCHES/ISSUES THAT ARE STALLED - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1186898 - /tomcat/tc7.0.x/trunk/
On 20/10/2011 17:41, Konstantin Kolinko wrote: > 2011/10/20 : >> Author: markt >> Date: Thu Oct 20 16:32:12 2011 >> New Revision: 1186898 >> >> URL: http://svn.apache.org/viewvc?rev=1186898&view=rev >> Log: >> Clean-up. No functional change. > > Empty commit. You merged r1186891 (Oliver's commit on maven-tomcat), > but cleanup was in r1186890 Thanks. I'll fix that. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1186935 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/http11/Http11AprProcessor.java java/org/apache/coyote/http11/Http11NioProcessor.java
Author: markt Date: Thu Oct 20 17:15:59 2011 New Revision: 1186935 URL: http://svn.apache.org/viewvc?rev=1186935&view=rev Log: Clean-up. No functional change. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 20 17:15:59 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186891-1186892,1186894 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894 Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1186935&r1=1186934&r2=1186935&view=diff == --- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Thu Oct 20 17:15:59 2011 @@ -61,7 +61,7 @@ public class Http11AprProcessor ex
svn commit: r1186949 - /tomcat/trunk/webapps/docs/setup.xml
Author: markt Date: Thu Oct 20 17:31:31 2011 New Revision: 1186949 URL: http://svn.apache.org/viewvc?rev=1186949&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52049 Improve setup instructions for running as a Windows service - remove references to specific Windows OSes - it easily gets dated - correct info on how a JRE is identified / selected Modified: tomcat/trunk/webapps/docs/setup.xml Modified: tomcat/trunk/webapps/docs/setup.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/setup.xml?rev=1186949&r1=1186948&r2=1186949&view=diff == --- tomcat/trunk/webapps/docs/setup.xml (original) +++ tomcat/trunk/webapps/docs/setup.xml Thu Oct 20 17:31:31 2011 @@ -55,24 +55,27 @@ Installation as a service: Tomcat will be -installed as a Windows -NT/2k/XP service no matter what setting is selected. Using the -checkbox on the component page sets the service as "auto" +installed as a Windows service no matter what setting is selected. +Using the checkbox on the component page sets the service as "auto" startup, so that Tomcat is automatically started when Windows starts. For optimal security, the service should be run as a separate user, with reduced permissions (see the Windows Services administration tool and its documentation). -Java location: The installer will use the registry -or the JAVA_HOME environment variable to determine the base path -of a Java SE 6 JRE. - +Java location: The installer will provide a default +JRE to use to run the service. The installer uses the registry to +determine the base path of a Java 6 or later JRE, including the JRE +installed as part of the full JDK. When running on a 64-bit +operating system, the installer will first look for a 64-bit JRE and +only look for a 32-bit JRE if a 64-bit JRE is not found. It is not +mandatory to use the default JRE detected by the installer. Any +installed Java 6 or later JRE (32-bit or 64-bit) may be used. Tray icon: When Tomcat is run as a service, there will not be any tray icon present when Tomcat is running. Note that when choosing to run Tomcat at the end of installation, the tray icon will be used even if Tomcat was installed as a service. Refer to the Windows Service HOW-TO -for information on how to manage Tomcat as Windows NT service. +for information on how to manage Tomcat as a Windows service. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1186954 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/setup.xml
Author: markt Date: Thu Oct 20 17:36:23 2011 New Revision: 1186954 URL: http://svn.apache.org/viewvc?rev=1186954&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52049 Improve setup instructions for running as a Windows service - remove references to specific Windows OSes - it easily gets dated - correct info on how a JRE is identified / selected Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml tomcat/tc7.0.x/trunk/webapps/docs/setup.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 20 17:36:23 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949 Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1186954&r1=1186953&r2=1186954&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Oct 20 17:36:23 2011 @@
svn commit: r1186957 - in /tomcat/tc6.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/setup.xml
Author: markt Date: Thu Oct 20 17:38:17 2011 New Revision: 1186957 URL: http://svn.apache.org/viewvc?rev=1186957&view=rev Log: CTR: Docs Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52049 Improve setup instructions for running as a Windows service - remove references to specific Windows OSes - it easily gets dated - correct info on how a JRE is identified / selected Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml tomcat/tc6.0.x/trunk/webapps/docs/setup.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 20 17:38:17 2011 @@ -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,943112,944409,944416,945231,945808,945835,945841 ,946686,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,961948,962865,962872,962881,962900,963106,963865,963868,964614,966177-966178,966292,966692,966863,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003461,1003481,1003488,1003556,1003572,1003581,1003861,1004393,1004409,1004415,1004868-1004869,1004912,1005452,1005467,1005647,1005802,1022120,1022134,1022323,1022415,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920,1029767,1033415,1033448,1033842,1033897,1037715,1037794,1037887,1037924,1038041,1042022,1042029,1042447,1042452,1042494,1044944,1044987,1050249,1055055,1055236,1055458,1055975,1056264,1056828,1056889,1059881,1061412,1061442,1061446,1062398,1064652,1066244,1066772,1067039,1067139,1069824,1070139,1070420,1070609,1072042,1073393,1075458,1076212,1078409,1078412,1079801,1081334,1088179,1088460,1090022,1094069,1094089,1095138,1097899,1099575 ,1099586,1099772,1099789,1100145,1100822,1101094,1101144,1124680,1130774,1133014,1137862,1137996,1138950,1138953,1140693,1141104,1141441,1142043,1142904,1143134,1143150,1148216,1148471,1152601,1156171,1156519,1164567,1167394,1172233-1172234,1172236,1173614,1174353,1174882,1174884,1175158,1175190,
DO NOT REPLY [Bug 52049] Incorrect setup instructions
https://issues.apache.org/bugzilla/show_bug.cgi?id=52049 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #3 from Mark Thomas 2011-10-20 17:38:44 UTC --- Fixed in trunk, 7.0.x (will be in 7.0.23 onwards) and 6.0.x (will be in 6.0.34 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 52066] New: ConnectionPool.borrowConnection swallows interrupt state.
https://issues.apache.org/bugzilla/show_bug.cgi?id=52066
Bug #: 52066
Summary: ConnectionPool.borrowConnection swallows interrupt
state.
Product: Tomcat Modules
Version: unspecified
Platform: PC
OS/Version: Windows XP
Status: NEW
Severity: normal
Priority: P2
Component: jdbc-pool
AssignedTo: dev@tomcat.apache.org
ReportedBy: alex-pub.apache-...@reflexion.net
Classification: Unclassified
In this code snippet starting on line 6.15 of ConnectionPool.java version
7.0.22
try {
//retrieve an existing connection
con = idle.poll(timetowait, TimeUnit.MILLISECONDS);
} catch (InterruptedException ex) {
Thread.interrupted();//clear the flag, and bail out
SQLException sx = new SQLException("Pool wait interrupted.");
sx.initCause(ex);
throw sx;
} finally {
waitcount.decrementAndGet();
}
The line marked '//clear the flag, and bail out' is wrong, because after that
there is no way for calling code to find out that the thread has been
interrupted.
The correct behavior should be
Thread.currentThread( ).interrupt( );
Here is the excerpt from the Biran Goetz's "Java Concurrency in Practice"
chapter 5.4.
For library code there are basically two choices:
-- Propagate the InterruptedException. This is often the most sensible policy
if you can get away with it -- just propagate the InterruptedException to your
caller. This could involve not catching InterruptedException, or catching it
and throwing it again after performing some brief activity-specific cleanup.
-- Restore the interrupt. Sometimes you cannot throw InterruptedException, for
instance when your code is part of a Runnable. In these situations, you must
catch InterruptedException and restore the interrupted status by calling
interrupt on the current thread, so that code higher up the call stack can see
that an interrupt was issued.
In the case of borrowConnection, #1 is not really a choice, as it is running in
the confines of JDBC interface. But it can definitely restore the interrupt
status of the thread.
--
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: r1187018 [2/2] - in /tomcat/trunk: ./ java/org/apache/catalina/startup/ java/org/apache/catalina/valves/
Modified: tomcat/trunk/java/org/apache/catalina/valves/SemaphoreValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/SemaphoreValve.java?rev=1187018&r1=1187017&r2=1187018&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/SemaphoreValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/SemaphoreValve.java Thu Oct 20
19:52:47 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -60,18 +60,18 @@ public class SemaphoreValve extends Valv
* Semaphore.
*/
protected Semaphore semaphore = null;
-
+
// - Properties
-
+
/**
* Concurrency level of the semaphore.
*/
protected int concurrency = 10;
public int getConcurrency() { return concurrency; }
public void setConcurrency(int concurrency) { this.concurrency =
concurrency; }
-
+
/**
* Fairness of the semaphore.
@@ -79,7 +79,7 @@ public class SemaphoreValve extends Valv
protected boolean fairness = false;
public boolean getFairness() { return fairness; }
public void setFairness(boolean fairness) { this.fairness = fairness; }
-
+
/**
* Block until a permit is available.
@@ -87,7 +87,7 @@ public class SemaphoreValve extends Valv
protected boolean block = true;
public boolean getBlock() { return block; }
public void setBlock(boolean block) { this.block = block; }
-
+
/**
* Block interruptibly until a permit is available.
@@ -95,7 +95,7 @@ public class SemaphoreValve extends Valv
protected boolean interruptible = false;
public boolean getInterruptible() { return interruptible; }
public void setInterruptible(boolean interruptible) { this.interruptible =
interruptible; }
-
+
/**
* Start this component and implement the requirements
@@ -106,7 +106,7 @@ public class SemaphoreValve extends Valv
*/
@Override
protected synchronized void startInternal() throws LifecycleException {
-
+
semaphore = new Semaphore(concurrency, fairness);
setState(LifecycleState.STARTING);
@@ -128,7 +128,7 @@ public class SemaphoreValve extends Valv
semaphore = null;
}
-
+
// - Public Methods
@@ -165,7 +165,7 @@ public class SemaphoreValve extends Valv
shouldRelease = false;
permitDenied(request, response);
return;
-}
+}
} else {
semaphore.acquireUninterruptibly();
}
@@ -188,22 +188,22 @@ public class SemaphoreValve extends Valv
}
-
+
/**
* Subclass friendly method to add conditions.
- * @param request
- * @param response
+ * @param request
+ * @param response
*/
public boolean controlConcurrency(Request request, Response response) {
return true;
}
-
+
/**
* Subclass friendly method to add error handling when a permit isn't
* granted.
- * @param request
- * @param response
+ * @param request
+ * @param response
* @throws IOException
* @throws ServletException
*/
@@ -211,6 +211,6 @@ public class SemaphoreValve extends Valv
throws IOException, ServletException {
// NO-OP by default
}
-
+
}
Modified:
tomcat/trunk/java/org/apache/catalina/valves/StuckThreadDetectionValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/StuckThreadDetectionValve.java?rev=1187018&r1=1187017&r2=1187018&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/StuckThreadDetectionValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/StuckThreadDetectionValve.java
Thu Oct 20 19:52:47 2011
@@ -38,7 +38,7 @@ import org.apache.tomcat.util.res.String
* This valve allows to detect requests that take a long time to process,
which might
* indicate that the thread that is processing it is stuck.
* Based on code proposed by TomLu in Bugzilla entry #50306
- *
+ *
* @author slaurent
*
*/
@@ -53,7 +53,7 @@ public class StuckThreadDetectionValve e
* Logger
*/
pr
svn commit: r1187022 [2/2] - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/ java/org/apache/catalina/valves/
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/RequestFilterValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/RequestFilterValve.java?rev=1187022&r1=1187021&r2=1187022&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/RequestFilterValve.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/RequestFilterValve.java
Thu Oct 20 19:55:37 2011
@@ -5,17 +5,15 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package org.apache.catalina.valves;
@@ -59,9 +57,7 @@ import org.apache.catalina.connector.Res
* @author Craig R. McClanahan
* @version $Id$
*/
-
-public abstract class RequestFilterValve
-extends ValveBase {
+public abstract class RequestFilterValve extends ValveBase {
//-- Constructor
public RequestFilterValve() {
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/SSLValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/SSLValve.java?rev=1187022&r1=1187021&r2=1187022&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/SSLValve.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/SSLValve.java Thu Oct
20 19:55:37 2011
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.catalina.valves;
import java.io.ByteArrayInputStream;
@@ -39,10 +38,10 @@ import org.apache.juli.logging.LogFactor
* In httpd, mod_headers is used to add the SSL information as HTTP headers. In
* Tomcat, this valve is used to read the information from the HTTP headers and
* insert it into the request.
- *
+ *
* Note: Ensure that the headers are always set by httpd for all requests to
* prevent a client spoofing SSL information by sending fake headers.
- *
+ *
* In httpd.conf add the following:
*
*
@@ -52,7 +51,7 @@ import org.apache.juli.logging.LogFactor
* RequestHeader set SSL_CIPHER_USEKEYSIZE "%{SSL_CIPHER_USEKEYSIZE}s"
*
*
- *
+ *
* In server.xml, configure this valve under the Engine element in server.xml:
*
*
@@ -62,10 +61,10 @@ import org.apache.juli.logging.LogFactor
*
*/
public class SSLValve extends ValveBase {
-
+
private static final Log log = LogFactory.getLog(SSLValve.class);
-
+
//-- Constructor
public SSLValve() {
super(true);
@@ -75,13 +74,15 @@ public class SSLValve extends ValveBase
public String mygetHeader(Request request, String header) {
String strcert0 = request.getHeader(header);
-if (strcert0 == null)
+if (strcert0 == null) {
return null;
+}
/* mod_header writes "(null)" when the ssl variable is no filled */
-if ("(null)".equals(strcert0))
+if ("(null)".equals(strcert0)) {
return null;
+}
return strcert0;
-}
+}
@Override
public void invoke(Request request, Response response)
throws IOException, ServletException {
@@ -103,7 +104,7 @@ public class SSLValve extends ValveBase
try {
CertificateFactory cf;
if (providerName == null) {
-cf = CertificateFactory.getInstance("X.509");
+cf = CertificateFactory.getInstance("X.509");
} else {
cf = CertificateFactory.getInstance("X.509", providerName);
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/SemaphoreValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/SemaphoreValve.java?rev=1187022&r1=1187021&r2=1187022&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/SemaphoreValve.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/SemaphoreValve.java
Thu Oct 20 19:55:37 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
*
svn commit: r1187027 - /tomcat/trunk/java/org/apache/catalina/valves/RequestFilterValve.java
Author: markt
Date: Thu Oct 20 19:57:15 2011
New Revision: 1187027
URL: http://svn.apache.org/viewvc?rev=1187027&view=rev
Log:
Thread safety
Modified:
tomcat/trunk/java/org/apache/catalina/valves/RequestFilterValve.java
Modified: tomcat/trunk/java/org/apache/catalina/valves/RequestFilterValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/RequestFilterValve.java?rev=1187027&r1=1187026&r2=1187027&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/RequestFilterValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/RequestFilterValve.java Thu
Oct 20 19:57:15 2011
@@ -80,13 +80,13 @@ public abstract class RequestFilterValve
/**
* The regular expression used to test for allowed requests.
*/
-protected Pattern allow = null;
+protected volatile Pattern allow = null;
/**
* The regular expression used to test for denied requests.
*/
-protected Pattern deny = null;
+protected volatile Pattern deny = null;
// - Properties
@@ -97,6 +97,8 @@ public abstract class RequestFilterValve
* Valve, if any; otherwise, return null.
*/
public String getAllow() {
+// Use local copies for thread safety
+Pattern allow = this.allow;
if (allow == null) {
return null;
}
@@ -124,6 +126,8 @@ public abstract class RequestFilterValve
* Valve, if any; otherwise, return null.
*/
public String getDeny() {
+// Use local copies for thread safety
+Pattern deny = this.deny;
if (deny == null) {
return null;
}
@@ -195,6 +199,10 @@ public abstract class RequestFilterValve
Request request, Response response)
throws IOException, ServletException {
+// Use local copies for thread safety
+Pattern deny = this.deny;
+Pattern allow = this.allow;
+
// Check the deny patterns, if any
if (deny != null && deny.matcher(property).matches()) {
response.sendError(HttpServletResponse.SC_FORBIDDEN);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1187028 - /tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
Author: markt
Date: Thu Oct 20 19:58:13 2011
New Revision: 1187028
URL: http://svn.apache.org/viewvc?rev=1187028&view=rev
Log:
Remove Java 1.2 error handling
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Catalina.java?rev=1187028&r1=1187027&r2=1187028&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/Catalina.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Catalina.java Thu Oct 20
19:58:13 2011
@@ -631,34 +631,27 @@ public class Catalina {
log.info("Server startup in " + ((t2 - t1) / 100) + " ms");
}
-try {
-// Register shutdown hook
-if (useShutdownHook) {
-if (shutdownHook == null) {
-shutdownHook = new CatalinaShutdownHook();
-}
-Runtime.getRuntime().addShutdownHook(shutdownHook);
+// Register shutdown hook
+if (useShutdownHook) {
+if (shutdownHook == null) {
+shutdownHook = new CatalinaShutdownHook();
+}
+Runtime.getRuntime().addShutdownHook(shutdownHook);
-// If JULI is being used, disable JULI's shutdown hook since
-// shutdown hooks run in parallel and log messages may be lost
-// if JULI's hook completes before the CatalinaShutdownHook()
-LogManager logManager = LogManager.getLogManager();
-if (logManager instanceof ClassLoaderLogManager) {
-((ClassLoaderLogManager) logManager).setUseShutdownHook(
-false);
-}
+// If JULI is being used, disable JULI's shutdown hook since
+// shutdown hooks run in parallel and log messages may be lost
+// if JULI's hook completes before the CatalinaShutdownHook()
+LogManager logManager = LogManager.getLogManager();
+if (logManager instanceof ClassLoaderLogManager) {
+((ClassLoaderLogManager) logManager).setUseShutdownHook(
+false);
}
-} catch (Throwable t) {
-ExceptionUtils.handleThrowable(t);
-// This will fail on JDK 1.2. Ignoring, as Tomcat can run
-// fine without the shutdown hook.
}
if (await) {
await();
stop();
}
-
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1187029 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/valves/RequestFilterValve.java webapps/docs/changelog.xml
Author: markt Date: Thu Oct 20 20:00:41 2011 New Revision: 1187029 URL: http://svn.apache.org/viewvc?rev=1187029&view=rev Log: Thread safety Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/RequestFilterValve.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 20 20:00:41 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027 Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/RequestFilterValve.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/RequestFilterValve.java?rev=1187029&r1=1187028&r2=1187029&view=diff == --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/RequestFilterValve.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/RequestFilterValve.java Thu Oct 20 20:00:41 2011 @@ -80,13 +80,13 @@ public abstract class Req
Re: ApacheMeetupsNa11 tomcat one?
All, On 10/19/2011 3:52 PM, Rainer Jung wrote: > On 18.10.2011 10:15, Keiichi Fujino wrote: >> I am going to stay in Vancouver from Monday to Friday. > > I'll be there too, including the weekends before and after. I'm arriving at 12:47 local time on Tuesday and I've got nothing to do until the next morning besides check-into the hotel. If anyone is interested in getting together for some drinks or exploring the city (I've never been to Vancouver) on Thursday, email me privately and I'll give you my mobile number. See you all there! -chris signature.asc Description: OpenPGP digital signature
svn commit: r1187149 - /tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
Author: kfujino
Date: Fri Oct 21 01:10:51 2011
New Revision: 1187149
URL: http://svn.apache.org/viewvc?rev=1187149&view=rev
Log:
follow-up r1186631.
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java?rev=1187149&r1=1187148&r2=1187149&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
Fri Oct 21 01:10:51 2011
@@ -411,7 +411,7 @@ public class JvmRouteBinderValve extends
protected void sendSessionIDClusterBackup(Request request, String
sessionId,
String newSessionID) {
CatalinaCluster c = getCluster();
-if (c != null && getManager(request) instanceof DeltaManager) {
+if (c != null && !(getManager(request) instanceof BackupManager)) {
SessionIDMessage msg = new SessionIDMessage();
msg.setOrignalSessionID(sessionId);
msg.setBackupSessionID(newSessionID);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1186631 - /tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
2011/10/21 Mark Thomas :
> On 20/10/2011 08:00, kfuj...@apache.org wrote:
>> Author: kfujino
>> Date: Thu Oct 20 07:00:57 2011
>> New Revision: 1186631
>>
>> URL: http://svn.apache.org/viewvc?rev=1186631&view=rev
>> Log:
>> Avoid an unnecessary session ID change notice.
>
> Given this...
>> Notice of changed session ID by JvmRouteBinderValve is unnecessary to
>> BackupManager.
>
>> + if (c != null && getManager(request) instanceof DeltaManager) {
>
> Might this be better to account for custom Manager implementations?
>
> if (c != null && !(getManager(request) instanceof BackupManager)) {
>
>
> Mark
Thanks for the review.
I committed on r1187149.
--
Keiichi.Fujino
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1187152 - /tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
Author: kfujino
Date: Fri Oct 21 01:26:04 2011
New Revision: 1187152
URL: http://svn.apache.org/viewvc?rev=1187152&view=rev
Log:
Additional fix for r1186632.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java?rev=1187152&r1=1187151&r2=1187152&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
Fri Oct 21 01:26:04 2011
@@ -411,7 +411,7 @@ public class JvmRouteBinderValve extends
protected void sendSessionIDClusterBackup(Request request, String
sessionId,
String newSessionID) {
CatalinaCluster c = getCluster();
-if (c != null && getManager(request) instanceof DeltaManager) {
+if (c != null && !(getManager(request) instanceof BackupManager)) {
SessionIDMessage msg = new SessionIDMessage();
msg.setOrignalSessionID(sessionId);
msg.setBackupSessionID(newSessionID);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1187153 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kfujino Date: Fri Oct 21 01:29:20 2011 New Revision: 1187153 URL: http://svn.apache.org/viewvc?rev=1187153&view=rev Log: Additional fix for r1186632. 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=1187153&r1=1187152&r2=1187153&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Oct 21 01:29:20 2011 @@ -76,6 +76,7 @@ PATCHES PROPOSED TO BACKPORT: Notice of changed session ID by JvmRouteBinderValve is unnecessary to BackupManager. In BackupManager, change of session ID is replicated by the call of a setId() method. http://svn.apache.org/viewvc?view=revision&revision=1186632 + http://svn.apache.org/viewvc?view=revision&revision=1187152 +1: kfujino +0: markt (see http://markmail.org/message/otohu2w3o5v7l732) -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
