DO NOT REPLY [Bug 41008] - POST request ignores command line parameters
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=41008. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=41008 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WORKSFORME -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r478804 - /tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
Author: mturk
Date: Fri Nov 24 00:48:34 2006
New Revision: 478804
URL: http://svn.apache.org/viewvc?view=revrev=478804
Log:
Handle cping/cpong in case of reconnect if the connect_timeout was set. This
makes reconnects to
behave like normal connects.
Modified:
tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
Modified: tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c?view=diffrev=478804r1=478803r2=478804
==
--- tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c Fri Nov 24
00:48:34 2006
@@ -1172,7 +1172,7 @@
ae-worker-name, ae-sd, errno);
jk_close_socket(ae-sd);
ae-sd = JK_INVALID_SOCKET;
-err=1;
+err = 1;
}
if (ae-worker-prepost_timeout 0 !err) {
/* handle cping/cpong if prepost_timeout is set
@@ -1181,7 +1181,7 @@
*/
if (ajp_handle_cping_cpong(ae, ae-worker-prepost_timeout, l) ==
JK_FALSE)
-err=1;
+err = 2;
}
/* If we got an error or can't send data, then try to get a pooled
@@ -1220,12 +1220,25 @@
(%s) all endpoints are disconnected or dead,
ae-worker-name);
jk_log(l, JK_LOG_INFO,
- Increase the backend idle connection timeout or the
connection_pool_minsize);
+ (%s) increase the backend idle connection timeout or the
connection_pool_minsize,
+ ae-worker-name);
}
/* Connect to the backend.
* This can be either uninitalized connection or a reconnect.
*/
if (ajp_connect_to_endpoint(ae, l) == JK_TRUE) {
+/* should we send a CPING to validate connection ? */
+if (ae-worker-connect_timeout 0) {
+if (ajp_handle_cping_cpong(ae,
+ae-worker-connect_timeout, l) == JK_FALSE) {
+/* Close the socket if unable to cping/cpong */
+jk_close_socket(ae-sd);
+ae-sd = JK_INVALID_SOCKET;
+JK_TRACE_EXIT(l);
+return JK_FALSE;
+}
+}
+
/*
* After we are connected, each error that we are going to
* have is probably unrecoverable
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r478809 - /tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c
Author: mturk
Date: Fri Nov 24 01:00:12 2006
New Revision: 478809
URL: http://svn.apache.org/viewvc?view=revrev=478809
Log:
Setup domain name from route name if the route name
contains dot ('.'). The first part before dot will
be used as domain name. This eases the domain sticky
session configuration.
worker.xxx.route=domain1.nonde1 is equivalent to
worker.xxx.route=domain1.nonde1
worker.xxx.domain=domain1
Modified:
tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c
Modified: tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c?view=diffrev=478809r1=478808r2=478809
==
--- tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c Fri Nov 24 01:00:12
2006
@@ -1199,6 +1199,17 @@
close_workers(p, i, l);
}
else {
+/* Update domain names if jvm_route contains period '.' */
+for (i = 0; i num_of_workers; i++) {
+if (!p-lb_workers[i].s-domain[0]) {
+char * id_domain =
strchr(p-lb_workers[i].s-jvm_route, '.');
+if (id_domain) {
+*id_domain = '\0';
+strcpy(p-lb_workers[i].s-domain,
p-lb_workers[i].s-jvm_route);
+*id_domain = '.';
+}
+}
+}
for (i = 0; i num_of_workers; i++) {
if (JK_IS_DEBUG_LEVEL(l)) {
jk_log(l, JK_LOG_DEBUG,
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r478810 - /tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c
Author: mturk
Date: Fri Nov 24 01:04:06 2006
New Revision: 478810
URL: http://svn.apache.org/viewvc?view=revrev=478810
Log:
remove extra debug loop
Modified:
tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c
Modified: tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c?view=diffrev=478810r1=478809r2=478810
==
--- tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c Fri Nov 24 01:04:06
2006
@@ -1209,8 +1209,6 @@
*id_domain = '.';
}
}
-}
-for (i = 0; i num_of_workers; i++) {
if (JK_IS_DEBUG_LEVEL(l)) {
jk_log(l, JK_LOG_DEBUG,
Balanced worker %i has name %s and jvm_route
%s in domain %s,
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 41008] - POST request ignores command line parameters
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=41008. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=41008 [EMAIL PROTECTED] changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|WORKSFORME | --- Additional Comments From [EMAIL PROTECTED] 2006-11-24 01:19 --- (In reply to comment #1) Created an attachment (id=19164) -- (http://issues.apache.org/bugzilla/attachment.cgi?id=19164action=view) [edit] Patch to include POST query method when determining if the query string should be converted to CGI command line params Attached patch updates CGIServlet so that POSTs will be included when determining whether the query string should be converted to CGI command line arguments. It also cleans up the logic a bit.This behavior mirrors the behavior of the Apache httpd. Patch works fine, thank you! -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 41034] New: - Classloader leak caused by request recycle
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=41034. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=41034 Summary: Classloader leak caused by request recycle Product: Tomcat 5 Version: 5.5.17 Platform: Other OS/Version: other Status: NEW Severity: normal Priority: P2 Component: Catalina AssignedTo: tomcat-dev@jakarta.apache.org ReportedBy: [EMAIL PROTECTED] It seems that a classloader leak is caused by the re-use of a request object when connecting to tomcat. Just after a connection attempt to my servlet and a undeploy/redeploy procedure, my classloader won't go because of the reference displayed below (collected with hat): -- [EMAIL PROTECTED] (field filterChain:) -- [EMAIL PROTECTED] (field filters:) -- [EMAIL PROTECTED] -- [EMAIL PROTECTED] (field context:) -- [EMAIL PROTECTED] (field loader:) -- [EMAIL PROTECTED] (field parentClassLoader:) -- [EMAIL PROTECTED] (field parent:) -- [EMAIL PROTECTED] Then I modified the recycle method of org.apache.catalina.connector.Request while adding filterChain=null (which was missing) and my classloader was correctly garbaged. I guess the filterChain variable must be nullified. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 41034] - Classloader leak caused by request recycle
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=41034. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=41034 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WONTFIX --- Additional Comments From [EMAIL PROTECTED] 2006-11-24 03:33 --- Cool workaround (-1 for it). The field will go away sooner or later, so it does not really matter. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 40719] - Tomcat 5.5.20 Internal error/crash
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=40719. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=40719 --- Additional Comments From [EMAIL PROTECTED] 2006-11-24 07:25 --- I am seeing the same behaviour on Tomcat 5.0.28 running on SuSE Linux 10.1. I have a web application using Spring MVC. I have a form where I submit some data, a controller picks this up, does some stuff in the database and returns a view to the browser. This worked fine. However, as soon as I changed the view to a Spring RedirectView I get this exception in the log and the redirect does not take place. If instead I do a manual redirect in my controller then it works fine, no stack trace. I can reproduce this 100%, it happens every time with Spring's RedirectView, it is not random for me at all. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: svn commit: r478809 - /tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c
Hi Mladen,
very nice idea making things easier for users. I like it. But dots are
standard separation characters in host names and host names might not be
totally uncommon as jvm routes. I know, that they can be symbolic, but
we might break configs or deny using such a simple way of matching routes.
Since the feature jvm_route is not very old, not many people will use
it, but still: do you think another character could be better, by not
conflicting with fully qualified host names. E.g. what about the pipe
symbol, an at sign, a slash or a colon. Maybe the colon or the at sign
would be also easy to remember.
Regards,
Rainer
[EMAIL PROTECTED] schrieb:
Author: mturk
Date: Fri Nov 24 01:00:12 2006
New Revision: 478809
URL: http://svn.apache.org/viewvc?view=revrev=478809
Log:
Setup domain name from route name if the route name
contains dot ('.'). The first part before dot will
be used as domain name. This eases the domain sticky
session configuration.
worker.xxx.route=domain1.nonde1 is equivalent to
worker.xxx.route=domain1.nonde1
worker.xxx.domain=domain1
Modified:
tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c
Modified: tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c?view=diffrev=478809r1=478808r2=478809
==
--- tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c Fri Nov 24
01:00:12 2006
@@ -1199,6 +1199,17 @@
close_workers(p, i, l);
}
else {
+/* Update domain names if jvm_route contains period '.' */
+for (i = 0; i num_of_workers; i++) {
+if (!p-lb_workers[i].s-domain[0]) {
+char * id_domain =
strchr(p-lb_workers[i].s-jvm_route, '.');
+if (id_domain) {
+*id_domain = '\0';
+strcpy(p-lb_workers[i].s-domain,
p-lb_workers[i].s-jvm_route);
+*id_domain = '.';
+}
+}
+}
for (i = 0; i num_of_workers; i++) {
if (JK_IS_DEBUG_LEVEL(l)) {
jk_log(l, JK_LOG_DEBUG,
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: State of affairs for mod_jk 1.2.20
Hi Mladen, Mladen Turk schrieb: Rainer Jung wrote: For those who want to test: I committed far the most part of what I planned to improve. Thanks Rainer, the patches you made are really great! I think we'll have a best ever mod_jk. Thanks for the credits, I hope they work. However I still have doubts about you patch: @@ -1219,8 +1219,8 @@ jk_log(l, JK_LOG_INFO, (%s) all endpoints are disconnected or dead, ae-worker-name); -JK_TRACE_EXIT(l); -return JK_FALSE; +jk_log(l, JK_LOG_INFO, + Increase the backend idle connection timeout or the connection_pool_minsize); The patch you made is IMHO dubious. I agree it works for standard sittuations when backend Tomcat closes the connection, but it fails when the backend is dead or (the major problem) when the firewall closes the connection between them. With your patch we loose the option to have a session-free nodes. There is simply no chance to have a lb that will go to another node if the existing one fails. OK, I'll think about that in the next hour and then comment. Four eyes are much better than 2 ... Regards, Mladen. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: svn commit: r478809 - /tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c
Rainer Jung wrote: Hi Mladen, very nice idea making things easier for users. I like it. But dots are standard separation characters in host names and host names might not be totally uncommon as jvm routes. I know, that they can be symbolic, but we might break configs or deny using such a simple way of matching routes. The dot is fine because standard jvm route comes from worker name, and they simply cannot have a dot inside, because its a worker config separator. Regards, Mladen. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: State of affairs for mod_jk 1.2.20
Hi Mladen, I read our code as follows: in any case where a function in the while loop does produce an error, we close the connection afterwards: - if jk_is_socket_connected() fails, we do it explicitely via jk_close_socket() - if ajp_handle_cping_cpong() fails, we don't go into ajp_connection_tcp_send_message() and call ajp_next_connection(), which as a side effect closes the old connection via jk_close_socket() - if ajp_connection_tcp_send_message() fails, and we don't get a JK_FATAL_ERROR, again the conn is closed in ajp_next_connection() - if it returns with JK_FATAL_ERROR, we close explicitely with jk_close_socket() So a hanging tomcat, cut off connections by a firewall, or closed conns by the remote side all behave the same (I assume the extreme case, that all conns are concerned): we end the loop, and all conns have beend closed and replaced by JK_INVALID_SOCKET. No the question is: how to proceed? If we had known before, that no connections are established we would have passed the wile loop and directly tried to establish a new connection. The difference in our situation is, that we know we had to close conns, but we don't know the reason. If we return directly, then the first try has been burned by invalidating all established connections, and the second (re)try will start from a clean, no connection state, by trying to connect. Both tries will be handled inside the ajp code, no load balancer will know about that. After the failure of the second try we go up the stack, and if there's a load balancer it will try another worker. The load balancer counts it's own retries totally independant of the ones from the ajp workers. In my opinion the only change is: - old code: retries=2 means first try to close all conns and second try with new connection - new code: retries=2 means first try to close all conns and immediate new conn, second try a real retry. My concern is: if a user thinks he does not want a retry in the ajp worker (especially if he uses a load balancer), then I find it a little too fast to not connect once, if all established conns are broken. Concerning load balancing: the patch does not really change the interaction with an lb. It's only a question, after how man retries we break out of the service method of the ajp worker. That's internal to the ajp worker. It's code decides how early it fails and then the lb decides how to proceed. The lb retries are counted totally independently of the ajp retries. Session free node: I expect maintenance will close the conns, if the min size is 0. Concerning the code here: if the new connection also fails, then it would have also failed during in the old code during the second try. So I don't see a big difference. But maybe I overlooked something. I find this discussion helpful! Regards, Rainer Mladen Turk schrieb: Rainer Jung wrote: For those who want to test: I committed far the most part of what I planned to improve. Thanks Rainer, the patches you made are really great! I think we'll have a best ever mod_jk. However I still have doubts about you patch: @@ -1219,8 +1219,8 @@ jk_log(l, JK_LOG_INFO, (%s) all endpoints are disconnected or dead, ae-worker-name); -JK_TRACE_EXIT(l); -return JK_FALSE; +jk_log(l, JK_LOG_INFO, + Increase the backend idle connection timeout or the connection_pool_minsize); The patch you made is IMHO dubious. I agree it works for standard sittuations when backend Tomcat closes the connection, but it fails when the backend is dead or (the major problem) when the firewall closes the connection between them. With your patch we loose the option to have a session-free nodes. There is simply no chance to have a lb that will go to another node if the existing one fails. Regards, Mladen. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: svn commit: r478809 - /tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c
Gotcha. OK. Mladen Turk schrieb: Rainer Jung wrote: Hi Mladen, very nice idea making things easier for users. I like it. But dots are standard separation characters in host names and host names might not be totally uncommon as jvm routes. I know, that they can be symbolic, but we might break configs or deny using such a simple way of matching routes. The dot is fine because standard jvm route comes from worker name, and they simply cannot have a dot inside, because its a worker config separator. Regards, Mladen. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: State of affairs for mod_jk 1.2.20
Rainer Jung wrote: In my opinion the only change is: - old code: retries=2 means first try to close all conns and second try with new connection - new code: retries=2 means first try to close all conns and immediate new conn, second try a real retry. Right, and that is the problem. With retries=1 the old code would in case of connect failure go to the next worker in the lb, while in the new code it would first try to reconnect. Now, this is OK for sticky session, but if you have session replication there is simply no need to try to reconnect, because it will connect on the next election. What I'm saying is that right now we would always reconnect, and the user has no influence in that, while with default retries=2 he can set retries=1 and have that option. Of course there will be extra [info] lines in the log in that case. Regards, Mladen. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r479010 - /tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/
Author: markt
Date: Fri Nov 24 13:46:09 2006
New Revision: 479010
URL: http://svn.apache.org/viewvc?view=revrev=479010
Log:
Code clean up.
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/AccessLogValveForm.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/AddValveAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/DeleteValveAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/DeleteValvesAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/EditValveAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/RemoteAddrValveForm.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/RemoteHostValveForm.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/RequestDumperValveForm.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveAccessLogValveAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRemoteAddrValveAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRemoteHostValveAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRequestDumperValveAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveSingleSignOnValveAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SingleSignOnValveForm.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/ValveForm.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/ValveUtil.java
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/AccessLogValveForm.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/AccessLogValveForm.java?view=diffrev=479010r1=479009r2=479010
==
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/AccessLogValveForm.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/AccessLogValveForm.java
Fri Nov 24 13:46:09 2006
@@ -18,10 +18,10 @@
package org.apache.webapp.admin.valve;
import javax.servlet.http.HttpServletRequest;
-import org.apache.struts.action.ActionError;
import org.apache.struts.action.ActionErrors;
-import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessage;
+
import java.util.List;
/**
@@ -309,34 +309,28 @@
ActionErrors errors = new ActionErrors();
-String submit = request.getParameter(submit);
-
-// front end validation when save is clicked.
- //if (submit != null) {
+// if not specified, default is access_log.
+// to specify no prefix, specify a 0 length string...
+if ((prefix == null) || (prefix.length() == 0)){
+prefix = access_log.;
+}
- // if not specified, default is access_log.
- // to specify no prefix, specify a 0 length string...
-if ((prefix == null) || (prefix.length() == 0)){
-prefix = access_log.;
-}
-
-// default is a 0 length string
-if ((suffix == null) || (suffix.length() 1)) {
-suffix = ;
-}
+// default is a 0 length string
+if ((suffix == null) || (suffix.length() 1)) {
+suffix = ;
+}
-// If no directory attribute is specified, the default
-// value is logs.
-if ((directory == null) || (directory.length() 1)) {
-directory = logs;
-}
+// If no directory attribute is specified, the default
+// value is logs.
+if ((directory == null) || (directory.length() 1)) {
+directory = logs;
+}
+
+if ((pattern == null) || (pattern.length() 1)) {
+errors.add(pattern,
+new ActionMessage(error.pattern.required));
+}
-if ((pattern == null) || (pattern.length() 1)) {
-errors.add(pattern,
-new ActionError(error.pattern.required));
-}
-//}
-
return errors;
}
}
Modified:
AJP Connector enableLookups
I have a question about the behavior of the Tomcat AJP Connector. When my mod_jk equivalent sends the remote host name in AJP, the servlet's call to getRemoteHost() returns the IP address if enableLookups is set false in the connector, and returns the remote host supplied by the front-end server if enableLookups is true. I am using snoop.jsp to test this. Does this make sense? If the front-end server is sending the hostname, shouldn't the connector use the hostname whether enableLookups is set or not? By mod_jk equivalent I mean that we have our own web server extension that performs the AJP 1.3 protocol to Tomcat 5.5.20 running on Windows. My tracing shows that the hostname is being sent in each case. Mitchell Fisher | Unisys Corp. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: State of affairs for mod_jk 1.2.20
OK, convinced. I'll change that tomorrow and add a respective note to the docs fpr ajp retries in relation to lb. Mladen Turk schrieb: Rainer Jung wrote: In my opinion the only change is: - old code: retries=2 means first try to close all conns and second try with new connection - new code: retries=2 means first try to close all conns and immediate new conn, second try a real retry. Right, and that is the problem. With retries=1 the old code would in case of connect failure go to the next worker in the lb, while in the new code it would first try to reconnect. Now, this is OK for sticky session, but if you have session replication there is simply no need to try to reconnect, because it will connect on the next election. What I'm saying is that right now we would always reconnect, and the user has no influence in that, while with default retries=2 he can set retries=1 and have that option. Of course there will be extra [info] lines in the log in that case. Regards, Mladen. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r479033 - in /tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context: AddContextAction.java ContextForm.java DeleteContextAction.java DeleteContextsAction.j
Author: markt
Date: Fri Nov 24 15:00:06 2006
New Revision: 479033
URL: http://svn.apache.org/viewvc?view=revrev=479033
Log:
Code clean-up thanks to Eclipse for o.a.webapp.admin.context
- remove unused code
- removed unused imports
- don't use deprecated methods
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/AddContextAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/ContextForm.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/DeleteContextAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/DeleteContextsAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/SaveContextAction.java
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/AddContextAction.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/AddContextAction.java?view=diffrev=479033r1=479032r2=479033
==
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/AddContextAction.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/AddContextAction.java
Fri Nov 24 15:00:06 2006
@@ -18,7 +18,6 @@
package org.apache.webapp.admin.context;
import java.io.IOException;
-import java.util.Locale;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -27,9 +26,9 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.apache.struts.util.MessageResources;
import org.apache.webapp.admin.Lists;
import org.apache.webapp.admin.TomcatTreeBuilder;
+
/**
* The codeAction/code that sets up emAdd Context/em transactions.
*
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/ContextForm.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/ContextForm.java?view=diffrev=479033r1=479032r2=479033
==
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/ContextForm.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/ContextForm.java
Fri Nov 24 15:00:06 2006
@@ -19,10 +19,11 @@
package org.apache.webapp.admin.context;
import javax.servlet.http.HttpServletRequest;
-import org.apache.struts.action.ActionError;
import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessage;
+
import java.util.List;
/**
@@ -705,38 +706,26 @@
errors = new ActionErrors();
-String submit = request.getParameter(submit);
-
// front end validation when save is clicked.
-//if (submit != null) {
-// docBase cannot be null
-if ((docBase == null) || (docBase.length() 1)) {
-errors.add(docBase, new
ActionError(error.docBase.required));
-}
-
-// if path is empty, it's root context
-// validate context starting with / only at the time of context
creation.
-if (Create.equalsIgnoreCase(adminAction)
!path.startsWith(/)) {
-errors.add(path, new ActionError(error.path.prefix));
-}
+// docBase cannot be null
+if ((docBase == null) || (docBase.length() 1)) {
+errors.add(docBase, new ActionMessage(error.docBase.required));
+}
+
+// if path is empty, it's root context
+// validate context starting with / only at the time of context
creation.
+if (Create.equalsIgnoreCase(adminAction) !path.startsWith(/)) {
+errors.add(path, new ActionMessage(error.path.prefix));
+}
-//if ((workDir == null) || (workDir.length() 1)) {
-//errors.add(workDir, new
ActionError(error.workDir.required));
-//}
-
-// loader properties
-// FIXME-- verify if these ranges are ok.
-numberCheck(ldrCheckInterval, ldrCheckInterval , true, 0,
1);
-
-// session manager properties
-numberCheck(mgrCheckInterval, mgrCheckInterval, true, 0, 1);
-numberCheck(mgrMaxSessions, mgrMaxSessions, false, -1,
svn commit: r479035 - /tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/
Author: markt Date: Fri Nov 24 15:00:53 2006 New Revision: 479035 URL: http://svn.apache.org/viewvc?view=revrev=479035 Log: Code clean-up thanks to Eclipse for o.a.webapp.admin.host - remove unused code - removed unused imports - don't use deprecated methods No functional change Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AddAliasAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AddHostAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AliasForm.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteAliasAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteAliasForm.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteAliasesAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteHostAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteHostsAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/EditHostAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/HostForm.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/SaveAliasAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/SaveHostAction.java Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AddAliasAction.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AddAliasAction.java?view=diffrev=479035r1=479034r2=479035 == --- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AddAliasAction.java (original) +++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AddAliasAction.java Fri Nov 24 15:00:53 2006 @@ -27,14 +27,11 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import org.apache.struts.action.Action; -import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; import org.apache.struts.util.MessageResources; import org.apache.webapp.admin.ApplicationServlet; -import org.apache.webapp.admin.LabelValueBean; -import org.apache.webapp.admin.Lists; import javax.management.ObjectName; /** Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AddHostAction.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AddHostAction.java?view=diffrev=479035r1=479034r2=479035 == --- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AddHostAction.java (original) +++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AddHostAction.java Fri Nov 24 15:00:53 2006 @@ -18,19 +18,14 @@ package org.apache.webapp.admin.host; import java.io.IOException; -import java.util.Locale; -import java.util.ArrayList; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import org.apache.struts.action.Action; -import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; -import org.apache.struts.util.MessageResources; -import org.apache.webapp.admin.LabelValueBean; import org.apache.webapp.admin.Lists; /** @@ -67,8 +62,6 @@ // Acquire the resources that we need HttpSession session = request.getSession(); -Locale locale = getLocale(request); -MessageResources resources = getResources(request); // the service Name is needed to retrieve the engine mBean to // which the new host mBean will be added. Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AliasForm.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AliasForm.java?view=diffrev=479035r1=479034r2=479035 == --- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AliasForm.java (original) +++
svn commit: r479037 - /tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/
Author: markt Date: Fri Nov 24 15:01:05 2006 New Revision: 479037 URL: http://svn.apache.org/viewvc?view=revrev=479037 Log: Code clean-up thanks to Eclipse for o.a.webapp.admin.realm - remove unused code - removed unused imports - don't use deprecated methods No functional change Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/AddRealmAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/DataSourceRealmForm.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/DeleteRealmAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/DeleteRealmsAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/EditRealmAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/JDBCRealmForm.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/JNDIRealmForm.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/MemoryRealmForm.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/RealmForm.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveDataSourceRealmAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJDBCRealmAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJNDIRealmAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveMemoryRealmAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveUserDatabaseRealmAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/UserDatabaseRealmForm.java Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/AddRealmAction.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/AddRealmAction.java?view=diffrev=479037r1=479036r2=479037 == --- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/AddRealmAction.java (original) +++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/AddRealmAction.java Fri Nov 24 15:01:05 2006 @@ -19,18 +19,15 @@ import java.io.IOException; import java.net.URLEncoder; -import java.util.Locale; import java.util.ArrayList; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import org.apache.struts.action.Action; -import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; -import org.apache.struts.util.MessageResources; import org.apache.webapp.admin.TomcatTreeBuilder; import org.apache.webapp.admin.LabelValueBean; import org.apache.webapp.admin.Lists; @@ -72,10 +69,8 @@ // Acquire the resources that we need HttpSession session = request.getSession(); -Locale locale = getLocale(request); -MessageResources resources = getResources(request); -// Fill in the form values for display and editing +// Fill in the form values for display and editing String realmTypes[] = new String[5]; realmTypes[0] = UserDatabaseRealm; realmTypes[1] = JNDIRealm; Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/DataSourceRealmForm.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/DataSourceRealmForm.java?view=diffrev=479037r1=479036r2=479037 == --- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/DataSourceRealmForm.java (original) +++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/DataSourceRealmForm.java Fri Nov 24 15:01:05 2006 @@ -18,15 +18,11 @@ package org.apache.webapp.admin.realm; import javax.servlet.http.HttpServletRequest; -import org.apache.struts.action.ActionError; import org.apache.struts.action.ActionErrors; -import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionMapping; -import java.net.InetAddress; -import java.util.List; +import org.apache.struts.action.ActionMessage; -import org.apache.webapp.admin.ApplicationServlet; -import org.apache.webapp.admin.LabelValueBean; +import
svn commit: r479039 - in /tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service: AddServiceAction.java DeleteServiceAction.java DeleteServicesAction.java EditServiceAc
Author: markt Date: Fri Nov 24 15:01:49 2006 New Revision: 479039 URL: http://svn.apache.org/viewvc?view=revrev=479039 Log: Code clean-up thanks to Eclipse for o.a.webapp.admin.service - remove unused code - removed unused imports - don't use deprecated methods No functional change Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/AddServiceAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/DeleteServiceAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/DeleteServicesAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/EditServiceAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/SaveServiceAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/ServiceForm.java Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/AddServiceAction.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/AddServiceAction.java?view=diffrev=479039r1=479038r2=479039 == --- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/AddServiceAction.java (original) +++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/AddServiceAction.java Fri Nov 24 15:01:49 2006 @@ -25,13 +25,11 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import org.apache.struts.action.Action; -import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; import org.apache.struts.util.MessageResources; import org.apache.webapp.admin.LabelValueBean; -import org.apache.webapp.admin.Lists; /** * The codeAction/code that sets up emAdd Service/em transactions. Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/DeleteServiceAction.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/DeleteServiceAction.java?view=diffrev=479039r1=479038r2=479039 == --- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/DeleteServiceAction.java (original) +++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/DeleteServiceAction.java Fri Nov 24 15:01:49 2006 @@ -21,28 +21,18 @@ import java.io.IOException; import java.util.Collections; import java.util.Iterator; -import java.util.List; import java.util.Locale; -import java.util.TreeSet; -import java.util.Set; import java.util.ArrayList; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; import org.apache.struts.action.Action; -import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; import javax.management.MBeanServer; -import javax.management.MBeanServerFactory; -import javax.management.QueryExp; -import javax.management.Query; -import javax.management.ObjectInstance; import javax.management.ObjectName; -import javax.management.JMException; import org.apache.struts.util.MessageResources; import org.apache.webapp.admin.ApplicationServlet; @@ -90,7 +80,6 @@ // Acquire the resources that we need -HttpSession session = request.getSession(); Locale locale = getLocale(request); MessageResources resources = getResources(request); Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/DeleteServicesAction.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/DeleteServicesAction.java?view=diffrev=479039r1=479038r2=479039 == --- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/DeleteServicesAction.java (original) +++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/DeleteServicesAction.java Fri Nov 24 15:01:49 2006 @@ -19,15 +19,9 @@ package org.apache.webapp.admin.service; import java.io.IOException; -import java.util.ArrayList; -import java.util.Iterator; import java.util.Locale; -import java.util.Set; -import java.util.TreeSet; import
svn commit: r479041 - /tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/
Author: markt Date: Fri Nov 24 15:02:20 2006 New Revision: 479041 URL: http://svn.apache.org/viewvc?view=revrev=479041 Log: Code clean-up thanks to Eclipse for o.a.webapp.admin.users - remove unused code - removed unused imports - don't use deprecated methods No functional change Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/BaseForm.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/DeleteGroupsAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/DeleteRolesAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/DeleteUsersAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/GroupForm.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/GroupsForm.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/ListGroupsAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/ListRolesAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/ListUsersAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/RoleForm.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/RolesForm.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/SaveGroupAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/SaveRoleAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/SetUpGroupAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/SetUpRoleAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/SetUpUserAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/UserForm.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/UsersForm.java Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/BaseForm.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/BaseForm.java?view=diffrev=479041r1=479040r2=479041 == --- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/BaseForm.java (original) +++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/BaseForm.java Fri Nov 24 15:02:20 2006 @@ -20,8 +20,6 @@ import javax.management.ObjectName; import javax.servlet.http.HttpServletRequest; -import org.apache.struts.action.ActionError; -import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionMapping; Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/DeleteGroupsAction.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/DeleteGroupsAction.java?view=diffrev=479041r1=479040r2=479041 == --- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/DeleteGroupsAction.java (original) +++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/DeleteGroupsAction.java Fri Nov 24 15:02:20 2006 @@ -20,29 +20,16 @@ import java.io.IOException; -import java.util.ArrayList; -import java.util.Iterator; import java.util.Locale; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; import org.apache.struts.action.Action; -import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; -import javax.management.Attribute; import javax.management.MBeanServer; -import javax.management.MBeanServerFactory; -import javax.management.QueryExp; -import javax.management.Query; -import javax.management.ObjectInstance; import javax.management.ObjectName; -import javax.management.JMException; -import javax.management.MBeanAttributeInfo; -import javax.management.MBeanOperationInfo; -import javax.management.MBeanInfo; import org.apache.struts.util.MessageResources; import org.apache.webapp.admin.ApplicationServlet; @@ -97,7 +84,6 @@ mserver = ((ApplicationServlet) getServlet()).getServer(); }
svn commit: r479042 - in /tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/server: EditServerAction.java SaveServerAction.java ServerForm.java
Author: markt
Date: Fri Nov 24 15:02:41 2006
New Revision: 479042
URL: http://svn.apache.org/viewvc?view=revrev=479042
Log:
Code clean-up thanks to Eclipse for o.a.webapp.admin.server
- remove unused code
- removed unused imports
- don't use deprecated methods
No functional change
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/server/EditServerAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/server/SaveServerAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/server/ServerForm.java
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/server/EditServerAction.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/server/EditServerAction.java?view=diffrev=479042r1=479041r2=479042
==
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/server/EditServerAction.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/server/EditServerAction.java
Fri Nov 24 15:02:41 2006
@@ -19,34 +19,19 @@
package org.apache.webapp.admin.server;
import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
import java.util.Locale;
-import java.util.ArrayList;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import org.apache.struts.action.Action;
-import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import javax.management.MBeanServer;
-import javax.management.MBeanServerFactory;
-import javax.management.QueryExp;
-import javax.management.Query;
-import javax.management.ObjectInstance;
import javax.management.ObjectName;
-import javax.management.JMException;
-
-import javax.management.modelmbean.ModelMBean;
-import javax.management.modelmbean.ModelMBeanInfo;
import org.apache.struts.util.MessageResources;
-import org.apache.webapp.admin.LabelValueBean;
-import org.apache.webapp.admin.Lists;
-import org.apache.webapp.admin.TomcatTreeBuilder;
import org.apache.webapp.admin.ApplicationServlet;
/**
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/server/SaveServerAction.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/server/SaveServerAction.java?view=diffrev=479042r1=479041r2=479042
==
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/server/SaveServerAction.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/server/SaveServerAction.java
Fri Nov 24 15:02:41 2006
@@ -18,7 +18,6 @@
package org.apache.webapp.admin.server;
-import java.util.Iterator;
import java.util.Locale;
import java.io.IOException;
import javax.servlet.ServletException;
@@ -26,19 +25,15 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import org.apache.struts.action.Action;
-import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessages;
+
import javax.management.Attribute;
import javax.management.MBeanServer;
-import javax.management.MBeanServerFactory;
-import javax.management.QueryExp;
-import javax.management.Query;
-import javax.management.ObjectInstance;
import javax.management.ObjectName;
import org.apache.webapp.admin.ApplicationServlet;
-import org.apache.webapp.admin.TomcatTreeBuilder;
import org.apache.struts.util.MessageResources;
/**
@@ -93,7 +88,7 @@
(Cannot acquire MBeanServer reference, t);
}
-ActionErrors errors = new ActionErrors();
+ActionMessages errors = new ActionMessages();
// Report any errors we have discovered back to the original form
if (!errors.isEmpty()) {
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/server/ServerForm.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/server/ServerForm.java?view=diffrev=479042r1=479041r2=479042
==
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/server/ServerForm.java
(original)
+++
svn commit: r479043 - /tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/
Author: markt Date: Fri Nov 24 15:03:05 2006 New Revision: 479043 URL: http://svn.apache.org/viewvc?view=revrev=479043 Log: Code clean-up thanks to Eclipse for o.a.webapp.admin - remove unused code - removed unused imports - don't use deprecated methods No functional change Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ActionTag.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ActionsTag.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationServlet.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/CommitChangesAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/DataTag.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/DumpRegistryAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/DumpServerAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/LabelTag.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/LogOutAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/RowTag.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetLocaleAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetUpTreeAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TableTag.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TreeControlTestAction.java Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ActionTag.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ActionTag.java?view=diffrev=479043r1=479042r2=479043 == --- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ActionTag.java (original) +++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ActionTag.java Fri Nov 24 15:03:05 2006 @@ -19,14 +19,9 @@ package org.apache.webapp.admin; -import java.io.IOException; -import java.net.URLEncoder; -import java.util.ArrayList; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.PageContext; import javax.servlet.jsp.tagext.BodyTagSupport; import javax.servlet.jsp.tagext.Tag; @@ -121,7 +116,7 @@ this.label = null; // Do no further processing for now -return (EVAL_BODY_TAG); +return (EVAL_BODY_BUFFERED); } Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ActionsTag.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ActionsTag.java?view=diffrev=479043r1=479042r2=479043 == --- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ActionsTag.java (original) +++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ActionsTag.java Fri Nov 24 15:03:05 2006 @@ -20,11 +20,9 @@ import java.io.IOException; -import java.net.URLEncoder; import java.util.ArrayList; import javax.servlet.jsp.JspException; import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.PageContext; import javax.servlet.jsp.tagext.BodyTagSupport; @@ -141,7 +139,7 @@ this.selecteds.clear(); this.urls.clear(); -return (EVAL_BODY_TAG); +return (EVAL_BODY_BUFFERED); } Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationServlet.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationServlet.java?view=diffrev=479043r1=479042r2=479043 == --- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationServlet.java (original) +++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationServlet.java Fri Nov 24 15:03:05 2006 @@ -18,16 +18,11 @@ package org.apache.webapp.admin; -import java.text.DateFormat; -import java.util.HashSet; -import java.util.Locale; -import java.util.ResourceBundle; import javax.management.MBeanServer; import javax.servlet.ServletException; import
Re: svn commit: r478804 - /tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
Hi Mladen,
[EMAIL PROTECTED] schrieb:
@@ -1220,12 +1220,25 @@
...
/* Connect to the backend.
* This can be either uninitalized connection or a reconnect.
*/
if (ajp_connect_to_endpoint(ae, l) == JK_TRUE) {
+/* should we send a CPING to validate connection ? */
+if (ae-worker-connect_timeout 0) {
+if (ajp_handle_cping_cpong(ae,
+ae-worker-connect_timeout, l) == JK_FALSE) {
+/* Close the socket if unable to cping/cpong */
+jk_close_socket(ae-sd);
+ae-sd = JK_INVALID_SOCKET;
+JK_TRACE_EXIT(l);
+return JK_FALSE;
+}
+}
+
Cping/Cpong is already done inside ajp_connect_to_endpoint(), if it
fails we take the else part, that does the jk_close_socket. So I think
this would lead to a double cping/cpong after connect.
Regards,
Rainer
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r479045 - /tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Validator.java
Author: markt
Date: Fri Nov 24 15:11:19 2006
New Revision: 479045
URL: http://svn.apache.org/viewvc?view=revrev=479045
Log:
Code clean up. No functional change.
Modified:
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Validator.java
Modified:
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Validator.java
URL:
http://svn.apache.org/viewvc/tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Validator.java?view=diffrev=479045r1=479044r2=479045
==
--- tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Validator.java
(original)
+++ tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Validator.java
Fri Nov 24 15:11:19 2006
@@ -36,7 +36,6 @@
import org.apache.jasper.Constants;
import org.apache.jasper.JasperException;
-import org.apache.jasper.JspCompilationContext;
import org.xml.sax.Attributes;
/**
@@ -84,7 +83,6 @@
DirectiveVisitor(Compiler compiler) throws JasperException {
this.pageInfo = compiler.getPageInfo();
this.err = compiler.getErrorDispatcher();
- JspCompilationContext ctxt = compiler.getCompilationContext();
}
public void visit(Node.IncludeDirective n) throws JasperException {
@@ -311,7 +309,6 @@
private PageInfo pageInfo;
private ErrorDispatcher err;
- private TagInfo tagInfo;
private ClassLoader loader;
private static final JspUtil.ValidAttribute[] jspRootAttrs = {
@@ -396,7 +393,6 @@
ValidateVisitor(Compiler compiler) {
this.pageInfo = compiler.getPageInfo();
this.err = compiler.getErrorDispatcher();
- this.tagInfo = compiler.getCompilationContext().getTagInfo();
this.loader = compiler.getCompilationContext().getClassLoader();
}
@@ -478,7 +474,6 @@
public void visit(Node.SetProperty n) throws JasperException {
JspUtil.checkAttributes(SetProperty, n,
setPropertyAttrs, err);
- String name = n.getTextAttribute(name);
String property = n.getTextAttribute(property);
String param = n.getTextAttribute(param);
String value = n.getAttributeValue(value);
@@ -1122,7 +1117,7 @@
value, false, el,
dynamic);
} else {
- value = value.replace(Constants.ESC, '$');
+ value = value.replace(Constants.HACK_CHAR, '$');
result = new Node.JspAttribute(qName, uri, localName,
value, false, null,
dynamic);
@@ -1402,14 +1397,12 @@
*/
static class TagExtraInfoVisitor extends Node.Visitor {
- private PageInfo pageInfo;
private ErrorDispatcher err;
/*
* Constructor
*/
TagExtraInfoVisitor(Compiler compiler) {
- this.pageInfo = compiler.getPageInfo();
this.err = compiler.getErrorDispatcher();
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r479047 [1/2] - /tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Validator.java
Author: markt Date: Fri Nov 24 15:14:50 2006 New Revision: 479047 URL: http://svn.apache.org/viewvc?view=revrev=479047 Log: tabs - 8 spaces Modified: tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Validator.java - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: recovery_option 4 not fully implemented
Tim Whittington schrieb: The JK docs state: If the value 4 is added to the recovery options, the connection between the webserver and tomcat will be closed if the client connection to the webserver is terminated during the request/response cycle. This allows to inform the servlet engine about broken client connections during lengthy operations. This seems to imply that recovery_options=0 will reuse the connection if the only errors were client read/writes, which is not the case. The connection between the webserver and Tomcat is always closed on an error writing to a client though, and I'm fairly certain if there are client read errors. Since the only place that socket reuse is set to true is in the AJP end response, which is always after the client reads and writes are done in ajp_send_request or ajp_get_reply, and the end_response is never reached if there is a read/write error, there is no recovery of AJP connections. It's a little late in the evening, but I think I agree with you. The flag reuse is set to false at the beginning of service and is only set to true during the JK_AJP13_END_RESPONSE callback, but in any case we get a client read or write error we abort earlier. Mladen, do you agree? It appears that recovery_options=4 is redundant - am I missing something? If the AJP protocol handlers were coded to reset the protocol stream on one of these errors to allow it to be reused, then this flag would come into play and would work as documented. tim - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r479051 - in /tomcat/container/tc5.5.x: catalina/src/share/org/apache/catalina/servlets/CGIServlet.java webapps/docs/changelog.xml
Author: markt
Date: Fri Nov 24 15:52:35 2006
New Revision: 479051
URL: http://svn.apache.org/viewvc?view=revrev=479051
Log:
Fix bug 41008. Enable POST to be used with indexed queries. Patch provided by
Chris Halstead.
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java?view=diffrev=479051r1=479050r2=479051
==
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java
Fri Nov 24 15:52:35 2006
@@ -807,30 +807,22 @@
this.pathInfo = this.servletPath;
}
-// If request is HEAD or GET and Query String does not contain
-// an unencoded = this is an indexed query. Parsed Query String
-// forms command line parameters for cgi command.
-if (!GET.equals(req.getMethod())
-!HEAD.equals(req.getMethod()))
-return;
-
-String qs = req.getQueryString();
-
-if (qs == null || qs.indexOf(=)0)
-return;
-
-int delimIndex = 0;
-int lastDelimIndex = 0;
-delimIndex = qs.indexOf(+);
-
-while (delimIndex 0) {
-cmdLineParameters.add(URLDecoder.decode(qs.substring(
-lastDelimIndex,delimIndex),parameterEncoding));
-lastDelimIndex = delimIndex + 1;
-delimIndex = qs.indexOf(+,lastDelimIndex);
+// If the request method is GET, POST or HEAD and the query string
+// does not contain an unencoded = this is an indexed query.
+// The parsed query string becomes the command line parameters
+// for the cgi command.
+if (req.getMethod().equals(GET)
+|| req.getMethod().equals(POST)
+|| req.getMethod().equals(HEAD)) {
+String qs = req.getQueryString();
+if (qs != null qs.indexOf(=) == -1) {
+StringTokenizer qsTokens = new StringTokenizer(qs, +);
+while ( qsTokens.hasMoreTokens() ) {
+
cmdLineParameters.add(URLDecoder.decode(qsTokens.nextToken(),
+ parameterEncoding));
+}
+}
}
-cmdLineParameters.add(URLDecoder.decode(qs.substring(
-lastDelimIndex),parameterEncoding));
}
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diffrev=479051r1=479050r2=479051
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Fri Nov 24 15:52:35 2006
@@ -128,6 +128,10 @@
bug40929/bug: Correct JavaDoc for StandardCalssLoader. (markt)
/fix
fix
+bug41008/bug: Allow POST to be used for indexed queries with CGI
+Servlet. Patch provided by Chris Halstead. (markt)
+ /fix
+ fix
bug41020/bug: Improve error message when custom error report Valve
fails to load. Also remove requirement that custom error report Valves
extend ValveBase. (markt)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r479052 - in /tomcat/tc6.0.x/trunk: java/org/apache/catalina/servlets/CGIServlet.java webapps/docs/changelog.xml
Author: markt
Date: Fri Nov 24 15:58:18 2006
New Revision: 479052
URL: http://svn.apache.org/viewvc?view=revrev=479052
Log:
Port fix bug 41008. Enable POST to be used with indexed queries. Patch provided
by Chris Halstead.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java?view=diffrev=479052r1=479051r2=479052
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java Fri
Nov 24 15:58:18 2006
@@ -794,30 +794,22 @@
this.pathInfo = this.servletPath;
}
-// If request is HEAD or GET and Query String does not contain
-// an unencoded = this is an indexed query. Parsed Query String
-// forms command line parameters for cgi command.
-if (!GET.equals(req.getMethod())
-!HEAD.equals(req.getMethod()))
-return;
-
-String qs = req.getQueryString();
-
-if (qs == null || qs.indexOf(=)0)
-return;
-
-int delimIndex = 0;
-int lastDelimIndex = 0;
-delimIndex = qs.indexOf(+);
-
-while (delimIndex 0) {
-cmdLineParameters.add(URLDecoder.decode(qs.substring(
-lastDelimIndex,delimIndex),parameterEncoding));
-lastDelimIndex = delimIndex + 1;
-delimIndex = qs.indexOf(+,lastDelimIndex);
+// If the request method is GET, POST or HEAD and the query string
+// does not contain an unencoded = this is an indexed query.
+// The parsed query string becomes the command line parameters
+// for the cgi command.
+if (req.getMethod().equals(GET)
+|| req.getMethod().equals(POST)
+|| req.getMethod().equals(HEAD)) {
+String qs = req.getQueryString();
+if (qs != null qs.indexOf(=) == -1) {
+StringTokenizer qsTokens = new StringTokenizer(qs, +);
+while ( qsTokens.hasMoreTokens() ) {
+
cmdLineParameters.add(URLDecoder.decode(qsTokens.nextToken(),
+ parameterEncoding));
+}
+}
}
-cmdLineParameters.add(URLDecoder.decode(qs.substring(
-lastDelimIndex),parameterEncoding));
}
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?view=diffrev=479052r1=479051r2=479052
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Nov 24 15:58:18 2006
@@ -41,6 +41,10 @@
bug40929/bug: Correct JavaDoc for StandardClassLoader. (markt)
/fix
fix
+bug41008/bug: Allow POST to be used for indexed queries with CGI
+Servlet. Patch provided by Chris Halstead. (markt)
+ /fix
+ fix
Fix usage of print on the servlet output stream if the processor never
used
a writer (fhanik)
/fix
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 41008] - POST request ignores command line parameters
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=41008. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=41008 [EMAIL PROTECTED] changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2006-11-24 15:59 --- Thanks for the patch. It has been applied to SVN and will be in 5.5.21 and 6.0.3 onwards. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 40719] - Tomcat 5.5.20 Internal error/crash
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=40719. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=40719 --- Additional Comments From [EMAIL PROTECTED] 2006-11-24 16:17 --- Please can you provide the simplest possible WAR that exhibits this issue? -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r479057 - in /tomcat/container/tc5.5.x/webapps/docs: changelog.xml ssl-howto.xml
Author: markt Date: Fri Nov 24 16:25:46 2006 New Revision: 479057 URL: http://svn.apache.org/viewvc?view=revrev=479057 Log: Update SSL docs to include PKCS11 that users have successfully used. Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml tomcat/container/tc5.5.x/webapps/docs/ssl-howto.xml Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diffrev=479057r1=479056r2=479057 == --- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Fri Nov 24 16:25:46 2006 @@ -185,6 +185,10 @@ documentation. (markt) /fix fix +bug40677/bug: Update SSL documentation to indicate that PKCS11 +keystores may be used. (markt) + /fix + fix bug40714/bug: Admin webapp no longer requires a username for a DataSource since it is not required in all cases. (markt) /fix Modified: tomcat/container/tc5.5.x/webapps/docs/ssl-howto.xml URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/ssl-howto.xml?view=diffrev=479057r1=479056r2=479057 == --- tomcat/container/tc5.5.x/webapps/docs/ssl-howto.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/ssl-howto.xml Fri Nov 24 16:25:46 2006 @@ -203,8 +203,8 @@ subsection name=Prepare the Certificate Keystore -pTomcat currently operates only on codeJKS/code or codePKCS12/code -format keystores. The codeJKS/code format +pTomcat currently operates with codeJKS/code, codePKCS11/code or +codePKCS12/code format keystores. The codeJKS/code format is Java's standard Java KeyStore format, and is the format created by the codekeytool/code command-line utility. This tool is included in the JDK. The codePKCS12/code format is an internet standard, and can be manipulated - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r479059 - in /tomcat/tc6.0.x/trunk/webapps/docs: changelog.xml ssl-howto.xml
Author: markt Date: Fri Nov 24 16:29:25 2006 New Revision: 479059 URL: http://svn.apache.org/viewvc?view=revrev=479059 Log: Port update to SSL docs to include PKCS11 that users have successfully used. Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml tomcat/tc6.0.x/trunk/webapps/docs/ssl-howto.xml Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?view=diffrev=479059r1=479058r2=479059 == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Nov 24 16:29:25 2006 @@ -70,7 +70,15 @@ MessageBytes.setString(null) will remove the String value. (remm) /fix /changelog - /subsection + /subsection + subsection name=Webapps +changelog + fix +bug40677/bug: Update SSL documentation to indicate that PKCS11 +keystores may be used. (markt) + /fix +/changelog + /subsection /section section name=Tomcat 6.0.2 (remm) subsection name=General Modified: tomcat/tc6.0.x/trunk/webapps/docs/ssl-howto.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/ssl-howto.xml?view=diffrev=479059r1=479058r2=479059 == --- tomcat/tc6.0.x/trunk/webapps/docs/ssl-howto.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/ssl-howto.xml Fri Nov 24 16:29:25 2006 @@ -175,8 +175,8 @@ subsection name=Prepare the Certificate Keystore -pTomcat currently operates only on codeJKS/code or codePKCS12/code -format keystores. The codeJKS/code format +pTomcat currently operates only on codeJKS/code, codePKCS11/code or +codePKCS12/code format keystores. The codeJKS/code format is Java's standard Java KeyStore format, and is the format created by the codekeytool/code command-line utility. This tool is included in the JDK. The codePKCS12/code format is an internet standard, and can be manipulated - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 40677] - PKCS11 keystore instead of JKS or PKCS12 keystore
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=40677. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=40677 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2006-11-24 16:30 --- Thanks for the information. The docs have been updated in SVN and will be included in 5.5.21 onwards and 6.0.3 onwards. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
