DO NOT REPLY [Bug 46792] NullPointerException in org.apache.catalina.connector

2009-03-04 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=46792





--- Comment #3 from Mark Thomas   2009-03-04 00:02:59 PST ---
Again, please provide the full stack trace.

-- 
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 46792] NullPointerException in org.apache.catalina.connector

2009-03-04 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=46792





--- Comment #4 from alex   2009-03-04 00:13:55 PST 
---
java.lang.NullPointerException
 at org.apache.catalina.connector.Request.parseParameters(Request.java:2446)
 at org.apache.catalina.connector.Request.getParameterNames(Request.java:1082)
 at
org.apache.catalina.connector.RequestFacade.getParameterNames(RequestFacade.java:371)
 at
com.sun.faces.context.RequestParameterMap.getEntryIterator(ExternalContextImpl.java:1218)
 at
com.sun.faces.context.BaseContextMap$EntrySet.iterator(ExternalContextImpl.java:582)
 at
com.sun.faces.context.BaseContextMap$BaseSet.size(ExternalContextImpl.java:570)
 at java.util.Collections$UnmodifiableCollection.size(Collections.java:998)
 at java.util.AbstractMap.size(AbstractMap.java:67)
 at java.util.Collections$UnmodifiableMap.size(Collections.java:1278)
 at
de.nrw.lds.gues.web.controll.AbstractControl.getRequestParameterMap(AbstractControl.java:142)
 at de.nrw.lds.gues.web.controll.suche.CSuche.getSelectedTab(CSuche.java:88)
 at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 at
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
 at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
 at java.lang.reflect.Method.invoke(Method.java:589)
 at javax.el.BeanELResolver.getValue(BeanELResolver.java:62)
 at javax.el.CompositeELResolver.getValue(CompositeELResolver.java:53)
 at
com.sun.faces.el.FacesCompositeELResolver.getValue(FacesCompositeELResolver.java:73)
 at org.apache.el.parser.AstValue.getValue(AstValue.java:118)
 at org.apache.el.ValueExpressionImpl.getValue(ValueExpressionImpl.java:186)
 at com.sun.facelets.el.TagValueExpression.getValue(TagValueExpression.java:71)
 at javax.faces.component.UIOutput.getValue(UIOutput.java:184)
 at org.richfaces.component.UITabPanel.getValue(UITabPanel.java:103)
 at org.richfaces.component.UITabPanel.getRenderedValue(UITabPanel.java:129)
 at org.richfaces.component.UITabPanel.restoreState(UITabPanel.java:171)
 at
org.richfaces.component.html.HtmlTabPanel.restoreState(HtmlTabPanel.java:966)
 at
javax.faces.component.UIComponentBase.processRestoreState(UIComponentBase.java:1155)
 at
javax.faces.component.UIComponentBase.processRestoreState(UIComponentBase.java:1171)
 at
javax.faces.component.UIComponentBase.processRestoreState(UIComponentBase.java:1171)
 at
javax.faces.component.UIComponentBase.processRestoreState(UIComponentBase.java:1171)
 at
org.ajax4jsf.application.AjaxStateManager.restoreView(AjaxStateManager.java:414)
 at
com.sun.faces.application.ViewHandlerImpl.restoreView(ViewHandlerImpl.java:318)
 at
com.sun.facelets.FaceletViewHandler.restoreView(FaceletViewHandler.java:316)
 at
com.sun.facelets.FaceletViewHandler.restoreView(FaceletViewHandler.java:316)
 at
org.ajax4jsf.application.ViewHandlerWrapper.restoreView(ViewHandlerWrapper.java:107)
 at com.sun.faces.lifecycle.RestoreViewPhase.execute(RestoreViewPhase.java:176)
 at com.sun.faces.lifecycle.Phase.doPhase(Phase.java:100)
 at com.sun.faces.lifecycle.RestoreViewPhase.doPhase(RestoreViewPhase.java:104)
 at com.sun.faces.lifecycle.LifecycleImpl.execute(LifecycleImpl.java:118)
 at javax.faces.webapp.FacesServlet.service(FacesServlet.java:265)
 at
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290)
 at
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)
 at org.ajax4jsf.webapp.BaseFilter.doFilter(BaseFilter.java:532)
 at
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:235)
 at
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)
 at org.ajax4jsf.webapp.BaseXMLFilter.doXmlFilter(BaseXMLFilter.java:178)
 at org.ajax4jsf.webapp.BaseFilter.handleRequest(BaseFilter.java:290)
 at
org.ajax4jsf.webapp.BaseFilter.processUploadsAndHandleRequest(BaseFilter.java:390)
 at org.ajax4jsf.webapp.BaseFilter.doFilter(BaseFilter.java:517)
 at
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:235)
 at
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)
 at
de.nrw.lds.gues.web.EntityManagerRequestFilter.doFilter(EntityManagerRequestFilter.java:59)
 at
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:235)
 at
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)
 at
org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:233)
 at
org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:191)
 at
org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:525)
 at
org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:128)
 at
org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:102)
 at
org.apache.catalina.core.StandardEngineValve.invoke(Standard

svn commit: r749940 - /tomcat/tc6.0.x/trunk/STATUS.txt

2009-03-04 Thread markt 
Author: markt
Date: Wed Mar  4 08:26:59 2009
New Revision: 749940

URL: http://svn.apache.org/viewvc?rev=749940&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=749940&r1=749939&r2=749940&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Mar  4 08:26:59 2009
@@ -171,5 +171,5 @@
   http://people.apache.org/~fhanik/tomcat/useHttpOnly.patch
   This also allows people to configure it globally in conf/context.xml without 
automatically 
   setting the default manager class
-  +1: fhanik
+  +1: fhanik, markt
   -1: 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r750051 - in /tomcat/connectors/trunk/jk/xdocs: generic_howto/timeouts.xml reference/workers.xml

2009-03-04 Thread rjung 
Author: rjung
Date: Wed Mar  4 15:38:17 2009
New Revision: 750051

URL: http://svn.apache.org/viewvc?rev=750051&view=rev
Log:
Clarify relation between socket_timeout and socket_connect_timeout
in docs, especially since we are using different units
(seconds and milliseconds).

Modified:
tomcat/connectors/trunk/jk/xdocs/generic_howto/timeouts.xml
tomcat/connectors/trunk/jk/xdocs/reference/workers.xml

Modified: tomcat/connectors/trunk/jk/xdocs/generic_howto/timeouts.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/generic_howto/timeouts.xml?rev=750051&r1=750050&r2=750051&view=diff
==
--- tomcat/connectors/trunk/jk/xdocs/generic_howto/timeouts.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/generic_howto/timeouts.xml Wed Mar  4 
15:38:17 2009
@@ -167,7 +167,8 @@
 failure situations failure detection during connection establishment
 can take several minutes due to TCP retransmits. Depending on the quality
 of your network a timeout somewhere between 1000 and 5000 milliseconds
-should be fine.
+should be fine. Note that socket_timeout is in seconds, and
+socket_connect_timeout in milliseconds.
 
 
 

Modified: tomcat/connectors/trunk/jk/xdocs/reference/workers.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/reference/workers.xml?rev=750051&r1=750050&r2=750051&view=diff
==
--- tomcat/connectors/trunk/jk/xdocs/reference/workers.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/reference/workers.xml Wed Mar  4 15:38:17 
2009
@@ -248,11 +248,17 @@
 on all socket operations.
 
 
-
+
 Socket connect timeout in milliseconds used for the communication channel 
between JK and remote host.
 If the remote host does not respond inside the timeout specified, JK will 
generate an error,
 and retry again.
 
+Note that socket_timeout is in seconds, and
+socket_connect_timeout in milliseconds,
+so in absolute terms the default socket_connect_timeout is
+equal to "socket_timeout.
+
+
 This feature has been added in jk 1.2.27.
 
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r750058 - /tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml

2009-03-04 Thread rjung 
Author: rjung
Date: Wed Mar  4 16:01:17 2009
New Revision: 750058

URL: http://svn.apache.org/viewvc?rev=750058&view=rev
Log:
Update changelog.

Modified:
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?rev=750058&r1=750057&r2=750058&view=diff
==
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Wed Mar  4 
16:01:17 2009
@@ -43,6 +43,12 @@
   
   
 
+  
+Docs: Clarify relation between socket_timeout and 
socket_connect_timeout. (rjung)
+  
+  
+SHM: Move locking into the data pull and push methods. (rjung)
+  
   
 Status: Show - Edit - Show always ends in single lb member show,
 even when started from all members lb show.



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r750063 - /tomcat/tc6.0.x/trunk/STATUS.txt

2009-03-04 Thread fhanik 
Author: fhanik
Date: Wed Mar  4 16:19:54 2009
New Revision: 750063

URL: http://svn.apache.org/viewvc?rev=750063&view=rev
Log:
votes

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=750063&r1=750062&r2=750063&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Mar  4 16:19:54 2009
@@ -126,13 +126,13 @@
   Don't include TRACEE in OPTIONS response unless we know it hasn't been
   disabled in the connector
   http://svn.apache.org/viewvc?rev=742714&view=rev
-  +1: markt, mturk
+  +1: markt, mturk, fhanik
   -1: 
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=4
   keepAliveTimeout should be used regardless of setting of disableUploadTimeout
   http://svn.apache.org/viewvc?rev=744160&view=rev
-  +1: markt
+  +1: markt, fhanik
0: billbarker The original was an optimization to not keep setting the 
timeout to the same value
  if we haven't changed it.  Of course it is broken, but a 
better patch would be to
  set the timeout correctly outside the loop, and retain the 
disableUploadTimeout check.
@@ -158,12 +158,12 @@
 * Fix spelling errors reported on users and dev list
   http://svn.apache.org/viewvc?rev=746321&view=rev
   http://svn.apache.org/viewvc?rev=746384&view=rev
-  +1: markt, mturk
+  +1: markt, mturk, fhanik
   -1: 
   
 * Fix error in 2.5 web.xml XSD
   http://svn.apache.org/viewvc?rev=747863&view=rev
-  +1: markt
+  +1: markt, fhanik
   -1: 
 
 * UseHttpOnly is a cookie attribute. Our Manager is cookie agnostic, hence the 
attribute might



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r750067 - in /tomcat/connectors/trunk/jk/native/common: jk_ajp_common.c jk_lb_worker.c

2009-03-04 Thread rjung 
Author: rjung
Date: Wed Mar  4 16:38:20 2009
New Revision: 750067

URL: http://svn.apache.org/viewvc?rev=750067&view=rev
Log:
Move Logging outside of locked block
in pull/push and include sequence counters in
debug log message.

Modified:
tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
tomcat/connectors/trunk/jk/native/common/jk_lb_worker.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?rev=750067&r1=750066&r2=750067&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c Wed Mar  4 
16:38:20 2009
@@ -971,12 +971,12 @@
 struct sockaddr_in inet_addr;
 JK_TRACE_ENTER(l);
 
-if (locked == JK_FALSE)
-jk_shm_lock();
 if (JK_IS_DEBUG_LEVEL(l))
 jk_log(l, JK_LOG_DEBUG,
-   "syncing mem for ajp worker '%s' from shm",
-   aw->name);
+   "syncing mem for ajp worker '%s' from shm (%u -> %u) [%u->%u]",
+   aw->name, aw->sequence, aw->s->h.sequence, aw->addr_sequence, 
aw->s->addr_sequence);
+if (locked == JK_FALSE)
+jk_shm_lock();
 
 aw->cache_timeout = aw->s->cache_timeout;
 aw->connect_timeout = aw->s->connect_timeout;
@@ -1018,12 +1018,12 @@
 {
 JK_TRACE_ENTER(l);
 
-if (locked == JK_FALSE)
-jk_shm_lock();
 if (JK_IS_DEBUG_LEVEL(l))
 jk_log(l, JK_LOG_DEBUG,
-   "syncing shm for ajp worker '%s' from mem",
-   aw->name);
+   "syncing shm for ajp worker '%s' from mem (%u -> %u) [%u->%u]",
+   aw->name, aw->s->h.sequence, aw->sequence, 
aw->s->addr_sequence, aw->addr_sequence);
+if (locked == JK_FALSE)
+jk_shm_lock();
 
 aw->s->cache_timeout = aw->cache_timeout;
 aw->s->connect_timeout = aw->connect_timeout;

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?rev=750067&r1=750066&r2=750067&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c Wed Mar  4 16:38:20 
2009
@@ -288,12 +288,12 @@
 
 JK_TRACE_ENTER(l);
 
-if (locked == JK_FALSE)
-jk_shm_lock();
 if (JK_IS_DEBUG_LEVEL(l))
 jk_log(l, JK_LOG_DEBUG,
-   "syncing mem for lb '%s' from shm",
-   p->name);
+   "syncing mem for lb '%s' from shm (%u->%u)",
+   p->name, p->sequence, p->s->h.sequence);
+if (locked == JK_FALSE)
+jk_shm_lock();
 p->sticky_session = p->s->sticky_session;
 p->sticky_session_force = p->s->sticky_session_force;
 p->recover_wait_time = p->s->recover_wait_time;
@@ -342,12 +342,12 @@
 
 JK_TRACE_ENTER(l);
 
-if (locked == JK_FALSE)
-jk_shm_lock();
 if (JK_IS_DEBUG_LEVEL(l))
 jk_log(l, JK_LOG_DEBUG,
-   "syncing shm for lb '%s' from mem",
-   p->name);
+   "syncing shm for lb '%s' from mem (%u->%u)",
+   p->name, p->s->h.sequence, p->sequence);
+if (locked == JK_FALSE)
+jk_shm_lock();
 p->s->sticky_session = p->sticky_session;
 p->s->sticky_session_force = p->sticky_session_force;
 p->s->recover_wait_time = p->recover_wait_time;



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r750069 - /tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c

2009-03-04 Thread rjung 
Author: rjung
Date: Wed Mar  4 16:39:19 2009
New Revision: 750069

URL: http://svn.apache.org/viewvc?rev=750069&view=rev
Log:
Use port == 0 as a disable indicator instead
of addr_sequence. That makes it more consistent.

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?rev=750069&r1=750068&r2=750069&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c Wed Mar  4 16:39:19 
2009
@@ -1560,7 +1560,7 @@
 if (p->lb_workers[i].worker->type == JK_AJP13_WORKER_TYPE ||
 p->lb_workers[i].worker->type == JK_AJP14_WORKER_TYPE) {
 ajp_worker_t *aw = (ajp_worker_t 
*)p->lb_workers[i].worker->worker_private;
-if (!aw->addr_sequence) {
+if (aw->port == 0) {
 p->lb_workers[i].activation = JK_LB_ACTIVATION_STOPPED;
 }
 }



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r750070 - /tomcat/connectors/trunk/jk/native/common/jk_status.c

2009-03-04 Thread rjung 
Author: rjung
Date: Wed Mar  4 16:40:38 2009
New Revision: 750070

URL: http://svn.apache.org/viewvc?rev=750070&view=rev
Log:
Initialize side_effect indicator properly.
Handle dynamic address changes and error returns
correctly in the non lb case.

Modified:
tomcat/connectors/trunk/jk/native/common/jk_status.c

Modified: tomcat/connectors/trunk/jk/native/common/jk_status.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_status.c?rev=750070&r1=750069&r2=750070&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_status.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_status.c Wed Mar  4 16:40:38 
2009
@@ -4019,6 +4019,7 @@
"Status worker '%s' %s lb worker '%s' sub worker '%s'",
w->name, "updating", lb->name, wr->name);
 aw = (ajp_worker_t *)wr->worker->worker_private;
+rv = 0;
 rc = commit_member(s, p, lb, wr, aw, &rv, l);
 if (rv & JK_STATUS_NEEDS_ADDR_PUSH) {
 aw->addr_sequence++;
@@ -4068,11 +4069,26 @@
w->name, "updating", aw->name);
 if (aw->sequence != aw->s->h.sequence)
 jk_ajp_pull(aw, JK_TRUE, l);
+rv = 0;
 rc = commit_member(s, p, NULL, NULL, aw, &rv, l);
-if (rv & JK_STATUS_NEEDS_PUSH) {
+if (rv & JK_STATUS_NEEDS_ADDR_PUSH) {
+aw->addr_sequence++;
+}
+if (rv & (JK_STATUS_NEEDS_PUSH | JK_STATUS_NEEDS_ADDR_PUSH)) {
 aw->sequence++;
 jk_ajp_push(aw, JK_TRUE, l);
 }
+if (rc == JK_FALSE) {
+jk_log(l, JK_LOG_ERROR,
+   "Status worker '%s' failed updating worker '%s' (at 
least partially).",
+   w->name, aw->name);
+if (!strncmp("OK", p->msg, 3)) {
+const char *msg = "Update failed (at least partially) for 
worker '%s'";
+size_t size = strlen(msg) + strlen(aw->name) + 1;
+p->msg = jk_pool_alloc(s->pool, size);
+snprintf(p->msg, size, msg, aw->name);
+}
+}
 JK_TRACE_EXIT(l);
 return rc;
 }



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r750075 - in /tomcat/connectors/trunk/jk: native/common/jk_status.c xdocs/miscellaneous/changelog.xml

2009-03-04 Thread rjung 
Author: rjung
Date: Wed Mar  4 17:01:41 2009
New Revision: 750075

URL: http://svn.apache.org/viewvc?rev=750075&view=rev
Log:
Remove redundant port information form ajp worker display
of status worker. Rename address column and remove
its explanation from the legend.

Modified:
tomcat/connectors/trunk/jk/native/common/jk_status.c
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/connectors/trunk/jk/native/common/jk_status.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_status.c?rev=750075&r1=750074&r2=750075&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_status.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_status.c Wed Mar  4 17:01:41 
2009
@@ -118,7 +118,7 @@
 #define JK_STATUS_ARG_AJP_MAX_PK_SZ"vamps"
 #define JK_STATUS_ARG_AJP_CPING_INT"vacpi"
 #define JK_STATUS_ARG_AJP_HOST_STR "vaddr"
-#define JK_STATUS_ARG_AJP_PORT_INT "vaprt"
+#define JK_STATUS_ARG_AJP_PORT "vaprt"
 
 #define JK_STATUS_ARG_AJP_TEXT_CACHE_TO"Connection Pool Timeout"
 #define JK_STATUS_ARG_AJP_TEXT_PING_TO "Ping Timeout"
@@ -131,7 +131,8 @@
 #define JK_STATUS_ARG_AJP_TEXT_MAX_PK_SZ   "Max Packet Size"
 #define JK_STATUS_ARG_AJP_TEXT_CPING_INT   "Connection Ping Interval"
 #define JK_STATUS_ARG_AJP_TEXT_HOST_STR"Hostname"
-#define JK_STATUS_ARG_AJP_TEXT_PORT_INT"Port"
+#define JK_STATUS_ARG_AJP_TEXT_PORT"Port"
+#define JK_STATUS_ARG_AJP_TEXT_ADDR_STR"Address:Port"
 
 #define JK_STATUS_CMD_UNKNOWN  (0)
 #define JK_STATUS_CMD_LIST (1)
@@ -234,7 +235,8 @@
 #define JK_STATUS_URI_MAP_TABLE_ROW2   
"%s%s%s%s%d%s%s%s%s\n"
 #define JK_STATUS_SHOW_AJP_CONF_HEAD   "" \
"Type" \
-   "" 
JK_STATUS_ARG_AJP_TEXT_HOST_STR "Addr" \
+   "" 
JK_STATUS_ARG_AJP_TEXT_HOST_STR "" \
+   "" 
JK_STATUS_ARG_AJP_TEXT_ADDR_STR "" \
"" 
JK_STATUS_ARG_AJP_TEXT_CACHE_TO "" \
"" 
JK_STATUS_ARG_AJP_TEXT_CONNECT_TO "" \
"" 
JK_STATUS_ARG_AJP_TEXT_PREPOST_TO "" \
@@ -245,7 +247,7 @@
"\n"
 #define JK_STATUS_SHOW_AJP_CONF_ROW"" \
"%s" \
-   "%s:%d" \
+   "%s" \
"%s" \
"%d" \
"%d" \
@@ -327,7 +329,8 @@
"\n"
 #define JK_STATUS_SHOW_MEMBER_CONF_HEAD"" \
"NameType" \
-   "" 
JK_STATUS_ARG_AJP_TEXT_HOST_STR "Addr" \
+   "" 
JK_STATUS_ARG_AJP_TEXT_HOST_STR "" \
+   "" 
JK_STATUS_ARG_AJP_TEXT_ADDR_STR "" \
"" 
JK_STATUS_ARG_AJP_TEXT_CACHE_TO "" \
"" 
JK_STATUS_ARG_AJP_TEXT_CONNECT_TO "" \
"" 
JK_STATUS_ARG_AJP_TEXT_PREPOST_TO "" \
@@ -339,7 +342,7 @@
 #define JK_STATUS_SHOW_MEMBER_CONF_ROW "" \
"%s" \
"%s" \
-   "%s:%d" \
+   "%s" \
"%s" \
"%d" \
"%d" \
@@ -1667,7 +1670,7 @@
 jk_printf(s, JK_STATUS_SHOW_MEMBER_CONF_ROW,
   aw->name,
   status_worker_type(type),
-  aw->host, aw->port,
+  aw->host,
   dump_ajp_addr(aw, buf),
   aw->cache_timeout,
   aw->connect_timeout,
@@ -1679,7 +1682,7 @@
 else
 jk_printf(s, JK_STATUS_SHOW_AJP_CONF_ROW,
   status_worker_type(type),
-  aw->host, aw->port,
+  aw->host,
   dump_ajp_addr(aw, buf),
   aw->cache_timeout,
   aw->connect_timeout,
@@ -2708,9 +2711,9 @@
 ":\n", aw->host);
-jk_putv(s, "", JK_STATUS_ARG_AJP_TEXT_PORT_INT,
+jk_putv(s, "", JK_STATUS_ARG_AJP_TEXT_PORT,
 ":\n", aw->port);
 
 jk_putv(s, "", JK_STATUS_ARG_AJP_TEXT_CACHE_TO,
@@ -3220,7 +3223,7 @@
 }
 }
 port = aw->port;
-if (set_int_if_changed(p, aw->name, "port", JK_STATUS_ARG_AJP_PORT_INT,
+

svn commit: r750079 - /tomcat/connectors/trunk/jk/native/common/jk_status.c

2009-03-04 Thread rjung 
Author: rjung
Date: Wed Mar  4 17:17:54 2009
New Revision: 750079

URL: http://svn.apache.org/viewvc?rev=750079&view=rev
Log:
Rename URL parameter for host name from vaddr to
vahst in status worker. The "a" is reserved for "AJP".

Modified:
tomcat/connectors/trunk/jk/native/common/jk_status.c

Modified: tomcat/connectors/trunk/jk/native/common/jk_status.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_status.c?rev=750079&r1=750078&r2=750079&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_status.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_status.c Wed Mar  4 17:17:54 
2009
@@ -117,7 +117,7 @@
 #define JK_STATUS_ARG_AJP_REC_OPTS "varo"
 #define JK_STATUS_ARG_AJP_MAX_PK_SZ"vamps"
 #define JK_STATUS_ARG_AJP_CPING_INT"vacpi"
-#define JK_STATUS_ARG_AJP_HOST_STR "vaddr"
+#define JK_STATUS_ARG_AJP_HOST_STR "vahst"
 #define JK_STATUS_ARG_AJP_PORT "vaprt"
 
 #define JK_STATUS_ARG_AJP_TEXT_CACHE_TO"Connection Pool Timeout"



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r750080 - /tomcat/connectors/trunk/jk/xdocs/reference/status.xml

2009-03-04 Thread rjung 
Author: rjung
Date: Wed Mar  4 17:19:20 2009
New Revision: 750080

URL: http://svn.apache.org/viewvc?rev=750080&view=rev
Log:
Add dynamic adress change feature to status
worker docs page.

Hope my explanation makes sense.

Modified:
tomcat/connectors/trunk/jk/xdocs/reference/status.xml

Modified: tomcat/connectors/trunk/jk/xdocs/reference/status.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/reference/status.xml?rev=750080&r1=750079&r2=750080&view=diff
==
--- tomcat/connectors/trunk/jk/xdocs/reference/status.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/reference/status.xml Wed Mar  4 17:19:20 
2009
@@ -391,7 +391,7 @@
 
 
 The action is determined by the parameter cmd. It can have the values 
"list", "show",
-"edit", "update", "reset", "recover", "version" and "dump". If you omit the 
"cmd" parameter,
+"edit", "update", "reset", "recover", "version" and "dump". If you omit the 
cmd parameter,
 the default "list" will be used.
 All actions except for "list", "refresh", "version" and "dump" need additional 
parameters.
 
@@ -403,7 +403,7 @@
 
 
 The format is determined by the parameter mime. It can have the values 
"html", "xml",
-"txt" and "prop". If you omit the "mime" parameter, the default "html"
+"txt" and "prop". If you omit the mime parameter, the default "html"
 will be used. The action "edit" (the edit form) does only make sense for 
"mime=html".
 
 
@@ -412,7 +412,7 @@
 
 Actions that operate on a single worker need one or two additional parameters 
to select
 this worker. The parameter w contains the name of the worker from the 
worker list.
-If an action operates on a member (sub worker) of a load balancer, the 
parameter "w"
+If an action operates on a member (sub worker) of a load balancer, the 
parameter w
 contains the name of the load balancer worker, and the additional parameter 
sw contains the
 name of the sub worker.
 
@@ -514,6 +514,12 @@
 Finally the list of parameters you can use to change settings for ajp workers 
and ajp load balancer members:
 
 
+vahst: host (string)
+
+
+vaprt: port (number)
+
+
 vacpt: connection_pool_timeout (number)
 
 
@@ -535,6 +541,14 @@
 vamps: max_packet_size (number)
 
 
+Note that changing the host name or port will only take effect for new 
connections.
+Already established connections to the old address will still be used.
+Nevertheless this feature is interesting, because you can provision load 
balancer
+members with port "0", which will automatically be stopped during startup. 
Later
+when you know the final names and ports, you can set them and they will be
+automatically activated.
+
+
 The leading character "v" has been added to the parameters in version 1.2.27.
 Changing settings for ajp workers has also been introduced in version 1.2.27.
 
@@ -549,10 +563,11 @@
 member of a load balancer respectively on one page. If you want to edit one
 configuration aspect for all members of a load balancer simultaneously, this
 will be triggered by the parameter att. The value of the parameter 
indicates,
-which aspect you want to edit. The list is the same as in the previous section:
+which aspect you want to edit. The list is the same as in the previous section,
+except for "vahst" and "vaprt":
 "vwa", "vwf", "vwn", "vwr", "vwc", "vwd", "vacpt", "vact", "vapt", "vart", 
"var",
 "varo" and "vamps". But here you
-need to put the name into the parameter "att", instead of using it as a request
+need to put the name into the parameter att, instead of using it as a 
request
 parameter name.
 
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r750082 - /tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c

2009-03-04 Thread rjung 
Author: rjung
Date: Wed Mar  4 17:23:49 2009
New Revision: 750082

URL: http://svn.apache.org/viewvc?rev=750082&view=rev
Log:
I think we can initialize addr_sequence in any
case, because we use the port to decide, whether
this worker is enabled or not.

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?rev=750082&r1=750081&r2=750082&view=diff
==
--- tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c Wed Mar  4 
17:23:49 2009
@@ -2508,11 +2508,11 @@
 /* Copy the contact to shm */
 strncpy(p->s->host, p->host, JK_SHM_STR_SIZ);
 p->s->port = p->port;
+p->s->addr_sequence = p->addr_sequence = 0;
 /* Resolve if port > 0.
  */
 if (p->port > 0) {
 if (jk_resolve(p->host, p->port, &p->worker_inet_addr, we->pool, 
l)) {
-p->s->addr_sequence = p->addr_sequence = 1;
 JK_TRACE_EXIT(l);
 return JK_TRUE;
 }



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r750254 - in /tomcat/connectors/trunk/jk/xdocs: miscellaneous/changelog.xml reference/iis.xml

2009-03-04 Thread rjung 
Author: rjung
Date: Thu Mar  5 00:24:59 2009
New Revision: 750254

URL: http://svn.apache.org/viewvc?rev=750254&view=rev
Log:
Clarify IIS URL rewrite feature in documentation.

Modified:
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
tomcat/connectors/trunk/jk/xdocs/reference/iis.xml

Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?rev=750254&r1=750253&r2=750254&view=diff
==
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Thu Mar  5 
00:24:59 2009
@@ -44,6 +44,9 @@
   
 
   
+Docs: Clarify IIS URL rewrite feature. (rjung)
+  
+  
 Status: Remove redundant port information form worker display.
 Rename address column and remove its explanation from the legend. 
(rjung)
   

Modified: tomcat/connectors/trunk/jk/xdocs/reference/iis.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/reference/iis.xml?rev=750254&r1=750253&r2=750254&view=diff
==
--- tomcat/connectors/trunk/jk/xdocs/reference/iis.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/reference/iis.xml Thu Mar  5 00:24:59 2009
@@ -284,10 +284,8 @@
 
 
 
-
 # Use the logs in the installation path of ISAPI Redirector
 log_file=$(ISAPI_PATH)\$(ISAPI_NAME).log
-
 
 
 
@@ -297,22 +295,24 @@
 as powerful as Apache Httpd's mod_rewrite, it allows a simple exchange of 
request URIs
 
 
-The rule is in the form rewritten=real-url.
+The rule is in the form original-url-prefix=forward-url-prefix. For example:
 
-
-The rules must be simple strings. For example:
-
-
 
-# Simple rewrite rules
-
+# Simple rewrite rules, making /jsp-examples
+# and /servlets-examples available under shorter URLs
 /jsp/=/jsp-examples/
 /servlets/=/servlets-examples/
-
 
+
+You can also use regular expressions, if you prefix the rule with a tilde 
~:
 
+
+# Complex rewrite rule, adding "-examples"
+# to the first path component of all requests
+~/([^/]*)=/$1-examples
+
 
-Note that the uriworkermap or mount point must point to that new rule.
+Note that uriworkermap.properties must use the URLs before rewriting.
 
 
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r750257 - in /tomcat/trunk: java/org/apache/catalina/ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/apache/catalina/session/ webapps/docs/config/

2009-03-04 Thread fhanik 
Author: fhanik
Date: Thu Mar  5 00:34:29 2009
New Revision: 750257

URL: http://svn.apache.org/viewvc?rev=750257&view=rev
Log:
Make the useHttpOnly a Context attribute

Modified:
tomcat/trunk/java/org/apache/catalina/Context.java
tomcat/trunk/java/org/apache/catalina/Manager.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
tomcat/trunk/webapps/docs/config/context.xml
tomcat/trunk/webapps/docs/config/manager.xml

Modified: tomcat/trunk/java/org/apache/catalina/Context.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Context.java?rev=750257&r1=750256&r2=750257&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Context.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Context.java Thu Mar  5 00:34:29 2009
@@ -181,8 +181,24 @@
  */
 public void setCookies(boolean cookies);
 
+/**
+ * Gets the value of the use HttpOnly cookies for session cookies flag.
+ * 
+ * @return true if the HttpOnly flag should be set on session
+ * cookies
+ */
+public boolean getUseHttpOnly();
+
 
 /**
+ * Sets the use HttpOnly cookies for session cookies flag.
+ * 
+ * @param useHttpOnly   Set to true to use HttpOnly cookies
+ *  for session cookies
+ */
+public void setUseHttpOnly(boolean useHttpOnly);
+
+/**
  * Return the "allow crossing servlet contexts" flag.
  */
 public boolean getCrossContext();

Modified: tomcat/trunk/java/org/apache/catalina/Manager.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Manager.java?rev=750257&r1=750256&r2=750257&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Manager.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Manager.java Thu Mar  5 00:34:29 2009
@@ -240,24 +240,6 @@
 public void setSessionAverageAliveTime(int sessionAverageAliveTime);
 
 
-/**
- * Gets the value of the use HttpOnly cookies for session cookies flag.
- * 
- * @return true if the HttpOnly flag should be set on session
- * cookies
- */
-public boolean getUseHttpOnly();
-
-
-/**
- * Sets the use HttpOnly cookies for session cookies flag.
- * 
- * @param useHttpOnly   Set to true to use HttpOnly cookies
- *  for session cookies
- */
-public void setUseHttpOnly(boolean useHttpOnly);
-
-
 // - Public Methods
 
 

Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=750257&r1=750256&r2=750257&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Thu Mar  5 
00:34:29 2009
@@ -2455,7 +2455,7 @@
 }
 
 if ((scc != null && scc.isHttpOnly()) ||
-context.getManager().getUseHttpOnly()) {
+context.getUseHttpOnly()) {
 cookie.setHttpOnly(true);
 }
 

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=750257&r1=750256&r2=750257&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Thu Mar  5 
00:34:29 2009
@@ -700,6 +700,13 @@
  */
 private boolean saveConfig = true;
 
+/**
+ * The flag that indicates that session cookies should use HttpOnly
+ */
+private boolean useHttpOnly = true;
+
+
+
 
 // - Context Properties
 
@@ -1114,6 +1121,33 @@
new Boolean(this.cookies));
 
 }
+
+/**
+ * Gets the value of the use HttpOnly cookies for session cookies flag.
+ * 
+ * @return true if the HttpOnly flag should be set on session
+ * cookies
+ */
+public boolean getUseHttpOnly() {
+return useHttpOnly;
+}
+
+
+/**
+ * Sets the use HttpOnly cookies for session cookies flag.
+ * 
+ * @param useHttpOnly   Set to true to use HttpOnly cookies
+ *  for session cookies
+ */
+public void setUseHttpOnly(boolean useHttpOnly) {
+boolean oldUseHttpOnly = this.useHttpOnly;
+this.useHttpOnly = useHttpOnly

svn commit: r750258 - in /tomcat/trunk/bin: catalina.bat catalina.sh

2009-03-04 Thread fhanik 
Author: fhanik
Date: Thu Mar  5 00:35:23 2009
New Revision: 750258

URL: http://svn.apache.org/viewvc?rev=750258&view=rev
Log:
Make LOGGING_CONFIG a variable that you can set, just like all the other script 
variables

Modified:
tomcat/trunk/bin/catalina.bat
tomcat/trunk/bin/catalina.sh

Modified: tomcat/trunk/bin/catalina.bat
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.bat?rev=750258&r1=750257&r2=750258&view=diff
==
--- tomcat/trunk/bin/catalina.bat (original)
+++ tomcat/trunk/bin/catalina.bat Thu Mar  5 00:35:23 2009
@@ -64,6 +64,13 @@
 rem   -agentlib:jdwp=transport=%JPDA_TRANSPORT%,
 rem   
address=%JPDA_ADDRESS%,server=y,suspend=%JPDA_SUSPEND%
 rem
+rem   LOGGING_CONFIG  (Optional) Override Tomcat's logging manager and logging 
config file
+rem   Example (all one line)
+rem   set 
LOGGING_CONFIG=-Djava.util.logging.manager=com.foo.MyLogManager 
+rem   
-Djava.util.logging.config.file=$CATALINA_BASE/conf/logging.properties
+rem
+rem
+rem
 rem $Id$
 rem ---
 
@@ -114,9 +121,12 @@
 set CATALINA_TMPDIR=%CATALINA_BASE%\temp
 :gotTmpdir
 
+if not "%LOGGING_CONFIG%" == "" goto noJuli
+set LOGGING_CONFIG=-Dnop
 if not exist "%CATALINA_BASE%\conf\logging.properties" goto noJuli
-set JAVA_OPTS=%JAVA_OPTS% 
-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager 
-Djava.util.logging.config.file="%CATALINA_BASE%\conf\logging.properties"
+set 
LOGGING_CONFIG=-Djava.util.logging.config.file="%CATALINA_BASE%\conf\logging.properties"
 -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager
 :noJuli
+set JAVA_OPTS=%JAVA_OPTS% %LOGGING_CONFIG%
 
 rem - Execute The Requested Command ---
 

Modified: tomcat/trunk/bin/catalina.sh
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.sh?rev=750258&r1=750257&r2=750258&view=diff
==
--- tomcat/trunk/bin/catalina.sh (original)
+++ tomcat/trunk/bin/catalina.sh Thu Mar  5 00:35:23 2009
@@ -67,6 +67,11 @@
 #   CATALINA_PID(Optional) Path of the file which should contains the pid
 #   of catalina startup java process, when start (fork) is used
 #
+#   LOGGING_CONFIG  (Optional) Override Tomcat's logging manager and logging 
config file
+#   Example (all one line)
+#   
LOGGING_CONFIG="-Djava.util.logging.manager=com.foo.MyLogManager \
+#   
-Djava.util.logging.config.file=$CATALINA_BASE/conf/logging.properties"
+#
 # $Id$
 # -
 
@@ -179,15 +184,16 @@
   JAVA_ENDORSED_DIRS=`cygpath --path --windows "$JAVA_ENDORSED_DIRS"`
 fi
 
-# Set juli LogManager if it is present
-if [ -r "$CATALINA_BASE"/conf/logging.properties ]; then
-  JAVA_OPTS="$JAVA_OPTS 
-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager"
-  
LOGGING_CONFIG="-Djava.util.logging.config.file=$CATALINA_BASE/conf/logging.properties"
-else
-  # Bugzilla 45585
-  LOGGING_CONFIG="-Dnop"
+# Set juli LogManager if it is present and an override has not been issued
+if [ -z "$LOGGING_CONFIG" ]; then
+  if [ -r "$CATALINA_BASE"/conf/logging.properties ]; then
+JAVA_OPTS="$JAVA_OPTS 
-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager"
+
LOGGING_CONFIG="-Djava.util.logging.config.file=$CATALINA_BASE/conf/logging.properties"
+  else
+# Bugzilla 45585
+LOGGING_CONFIG="-Dnop"
+  fi
 fi
-
 # - Execute The Requested Command -
 
 # Bugzilla 37848: only output this if we have a TTY



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r750266 - /tomcat/tc6.0.x/trunk/STATUS.txt

2009-03-04 Thread fhanik 
Author: fhanik
Date: Thu Mar  5 01:07:00 2009
New Revision: 750266

URL: http://svn.apache.org/viewvc?rev=750266&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=750266&r1=750265&r2=750266&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Mar  5 01:07:00 2009
@@ -173,3 +173,11 @@
   setting the default manager class
   +1: fhanik, markt
   -1: 
+
+* Make the LOGGING_CONFIG variable a variable that one can set outside or in 
setenv.sh to override the default tomcat logging mechanism
+  with a custom extension or a different location of the logging.properties 
file or both
+  http://svn.apache.org/viewvc?rev=750258&view=rev
+  +1: fhanik
+  -1: 
+
+



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r750274 - in /tomcat/connectors/trunk/jk: native/apache-1.3/mod_jk.c native/apache-2.0/mod_jk.c xdocs/reference/apache.xml

2009-03-04 Thread rjung 
Author: rjung
Date: Thu Mar  5 01:29:00 2009
New Revision: 750274

URL: http://svn.apache.org/viewvc?rev=750274&view=rev
Log:
Rename two of the new environment variables, after
checking what they really do.
local name and port are set from those AJP
attributes, server name and port are parsed
from the host header.

Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
tomcat/connectors/trunk/jk/xdocs/reference/apache.xml

Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c?rev=750274&r1=750273&r2=750274&view=diff
==
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Thu Mar  5 01:29:00 
2009
@@ -68,8 +68,8 @@
 #define JK_ENV_REMOTE_HOST  ("JK_REMOTE_HOST")
 #define JK_ENV_REMOTE_USER  ("JK_REMOTE_USER")
 #define JK_ENV_AUTH_TYPE("JK_AUTH_TYPE")
-#define JK_ENV_SERVER_NAME  ("JK_SERVER_NAME")
-#define JK_ENV_SERVER_PORT  ("JK_SERVER_PORT")
+#define JK_ENV_LOCAL_NAME   ("JK_LOCAL_NAME")
+#define JK_ENV_LOCAL_PORT   ("JK_LOCAL_PORT")
 #define JK_ENV_HTTPS("HTTPS")
 #define JK_ENV_CERTS("SSL_CLIENT_CERT")
 #define JK_ENV_CIPHER   ("SSL_CIPHER")
@@ -174,8 +174,8 @@
 char *remote_host_indicator;
 char *remote_user_indicator;
 char *auth_type_indicator;
-char *server_name_indicator;
-char *server_port_indicator;
+char *local_name_indicator;
+char *local_port_indicator;
 
 /*
  * SSL Support
@@ -713,13 +713,13 @@
 /* s->server_name  = (char *)(r->hostname ? r->hostname : 
r->server->server_hostname); */
 /* XXX : a la jk2 */
 s->server_name = get_env_string(r, (char *)ap_get_server_name(r),
-conf->server_name_indicator, 0);
+conf->local_name_indicator, 0);
 
 /* get the real port (otherwise redirect failed) */
 /* s->server_port = htons( r->connection->local_addr.sin_port ); */
 /* XXX : a la jk2 */
 s->server_port = get_env_int(r, ap_get_server_port(r),
- conf->server_port_indicator);
+ conf->local_port_indicator);
 
 s->server_software = (char *)ap_get_server_version();
 
@@ -1747,23 +1747,23 @@
 return NULL;
 }
 
-static const char *jk_set_server_name_indicator(cmd_parms * cmd,
-void *dummy, char *indicator)
+static const char *jk_set_local_name_indicator(cmd_parms * cmd,
+   void *dummy, char *indicator)
 {
 server_rec *s = cmd->server;
 jk_server_conf_t *conf =
 (jk_server_conf_t *) ap_get_module_config(s->module_config, 
&jk_module);
-conf->server_name_indicator = ap_pstrdup(cmd->pool, indicator);
+conf->local_name_indicator = ap_pstrdup(cmd->pool, indicator);
 return NULL;
 }
 
-static const char *jk_set_server_port_indicator(cmd_parms * cmd,
-void *dummy, char *indicator)
+static const char *jk_set_local_port_indicator(cmd_parms * cmd,
+   void *dummy, char *indicator)
 {
 server_rec *s = cmd->server;
 jk_server_conf_t *conf =
 (jk_server_conf_t *) ap_get_module_config(s->module_config, 
&jk_module);
-conf->server_port_indicator = ap_pstrdup(cmd->pool, indicator);
+conf->local_port_indicator = ap_pstrdup(cmd->pool, indicator);
 return NULL;
 }
 
@@ -2161,10 +2161,10 @@
  "Name of the Apache environment that contains the remote user name"},
 {"JkAuthTypeIndicator", jk_set_auth_type_indicator, NULL, RSRC_CONF, TAKE1,
  "Name of the Apache environment that contains the type of 
authentication"},
-{"JkServerNameIndicator", jk_set_server_name_indicator, NULL, RSRC_CONF, 
TAKE1,
- "Name of the Apache environment that contains the server name"},
-{"JkServerPortIndicator", jk_set_server_port_indicator, NULL, RSRC_CONF, 
TAKE1,
- "Name of the Apache environment that contains the server port"},
+{"JkLocalNameIndicator", jk_set_local_name_indicator, NULL, RSRC_CONF, 
TAKE1,
+ "Name of the Apache environment that contains the local name"},
+{"JkLocalPortIndicator", jk_set_local_port_indicator, NULL, RSRC_CONF, 
TAKE1,
+ "Name of the Apache environment that contains the local port"},
 
 /*
  * Apache has multiple SSL modules (for example apache_ssl, stronghold
@@ -2480,8 +2480,8 @@
 c->remote_host_indicator = JK_ENV_REMOTE_HOST;
 c->remote_user_indicator = JK_ENV_REMOTE_USER;
 c->auth_type_indicator = JK_ENV_AUTH_TYPE;
-c->server_name_indicator = JK_ENV_SERVER_NAME;
-

svn commit: r750276 - /tomcat/connectors/trunk/jk/xdocs/generic_howto/proxy.xml

2009-03-04 Thread rjung 
Author: rjung
Date: Thu Mar  5 01:33:59 2009
New Revision: 750276

URL: http://svn.apache.org/viewvc?rev=750276&view=rev
Log:
Adding a new documentation page about the special
situation of a reverse proxy.
Needs some checking and proof reading.

Added:
tomcat/connectors/trunk/jk/xdocs/generic_howto/proxy.xml   (with props)

Added: tomcat/connectors/trunk/jk/xdocs/generic_howto/proxy.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/generic_howto/proxy.xml?rev=750276&view=auto
==
--- tomcat/connectors/trunk/jk/xdocs/generic_howto/proxy.xml (added)
+++ tomcat/connectors/trunk/jk/xdocs/generic_howto/proxy.xml Thu Mar  5 
01:33:59 2009
@@ -0,0 +1,303 @@
+
+
+]>
+
+
+  &project;
+
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   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.
+
+
+Reverse Proxy HowTo
+Rainer Jung
+$Date$
+
+
+ 
+
+The Apache module mod_jk and its ISAPI and NSAPI variants connect
+a web server to a backend (typically Tomcat) using the AJP protocol.
+The web server receives an HTTP(S) request and the module forwards
+the request to the back end. This situation is usually called a gateway
+or a proxy, in the context of HTTP it is called a reverse proxy.
+
+
+
+
+A reverse proxy is not totally transparent to the application on
+the backend. For instance the host name and port the original client
+(e.g. browser) needs to talk to belong to the web server and not to the
+backend, so the reverse proxy talks to a different host name and port.
+When the application on the backend returns content including
+self-referencing URLs using its own backend address and port, the
+client will usually not be able to use these URLs.
+
+
+Another example is the client IP address, which for the web server is the
+source IP of the incoming connection, whereas for the backend the
+connection always comes from the web server. This can be a problem, when
+th client IP is checked by the backend application e.g. for security reasons.
+
+
+
+
+Most of these problems are automatically handled by the AJP protocol
+and the AJP connectors of the backend. The AJP protocol transports
+this communication metadata and the backend connector presents this
+metadata whenever the appliaction asks for it using Servlet API methods.
+
+The following list contains the communication metadata handled by AJP
+and the HttpServletRequest API calls which can be used to retrieve them:
+
+local name: getLocalName() and getLocalAddr.
+This is also equal to getServerName(), unless a Host header
+is contained in the request. in this case server name is taken from that 
header.
+
+local port: getLocalPort()
+This is also equal to getServerPort(), unless a Host header
+is contained in the request. in this case server port is taken from that header
+if it contains an explicit port, or is equal to the default port of the scheme 
used.
+
+client address: getRemoteAddr()
+
+client host: getRemoteHost()
+
+authentication type: getAuthType()
+
+remote user: getRemoteUser(),
+if tomcatAuthentication="false"
+
+protocol: getProtocol()
+
+HTTP method: getMethod()
+
+URI: getRequestURI()
+
+HTTPS used: isSecure(), getScheme()
+
+query string: getQueryString()
+
+SSL cipher: getAttribute(javax.servlet.request.cipher_suite)
+
+SSL key size: getAttribute(javax.servlet.request.key_size)
+
+SSL client certificate: 
getAttribute(javax.servlet.request.X509Certificate)
+
+SSL session ID: 
getAttribute(javax.servlet.request.ssl_session).
+This is for Tomcat, it has not yet been standardized.
+
+
+
+
+
+
+In some situations this is not enough though. Assume there is another
+less clever reverse proxy in front of your web server, for instance an
+HTTP load balancer or similar device which also serves as an SSL accelerator.
+
+Then you are sure, all your clients use HTTPS, but your web server doesn't
+know about that. All it can see is requests coming from the accelerator using
+plain HTTP.
+
+Another example would be a simple reverse proxy in front of your web server,
+so that the client IP address your web server detects is always the IP address
+of this reverse proxy, and not of the original client. Often such reverse 
proxies
+generate an additional HTTP header, like X-Forw

svn commit: r750282 - in /tomcat/connectors/trunk/jk/xdocs: ajp/project.xml generic_howto/project.xml miscellaneous/changelog.xml miscellaneous/project.xml news/project.xml project.xml reference/proje

2009-03-04 Thread rjung 
Author: rjung
Date: Thu Mar  5 01:49:08 2009
New Revision: 750282

URL: http://svn.apache.org/viewvc?rev=750282&view=rev
Log:
Add new docs page to menues and the changelog.

Modified:
tomcat/connectors/trunk/jk/xdocs/ajp/project.xml
tomcat/connectors/trunk/jk/xdocs/generic_howto/project.xml
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
tomcat/connectors/trunk/jk/xdocs/miscellaneous/project.xml
tomcat/connectors/trunk/jk/xdocs/news/project.xml
tomcat/connectors/trunk/jk/xdocs/project.xml
tomcat/connectors/trunk/jk/xdocs/reference/project.xml
tomcat/connectors/trunk/jk/xdocs/webserver_howto/project.xml

Modified: tomcat/connectors/trunk/jk/xdocs/ajp/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/ajp/project.xml?rev=750282&r1=750281&r2=750282&view=diff
==
--- tomcat/connectors/trunk/jk/xdocs/ajp/project.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/ajp/project.xml Thu Mar  5 01:49:08 2009
@@ -42,6 +42,7 @@
 
 
 
+
 
 
 

Modified: tomcat/connectors/trunk/jk/xdocs/generic_howto/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/generic_howto/project.xml?rev=750282&r1=750281&r2=750282&view=diff
==
--- tomcat/connectors/trunk/jk/xdocs/generic_howto/project.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/generic_howto/project.xml Thu Mar  5 
01:49:08 2009
@@ -42,6 +42,7 @@
 
 
 
+
 
 
 

Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?rev=750282&r1=750281&r2=750282&view=diff
==
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Thu Mar  5 
01:49:08 2009
@@ -44,6 +44,9 @@
   
 
   
+Docs: Add a new HowTo page about reverse proxies. (rjung)
+  
+  
 Docs: Clarify IIS URL rewrite feature. (rjung)
   
   

Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/project.xml?rev=750282&r1=750281&r2=750282&view=diff
==
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/project.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/project.xml Thu Mar  5 
01:49:08 2009
@@ -42,6 +42,7 @@
 
 
 
+
 
 
 

Modified: tomcat/connectors/trunk/jk/xdocs/news/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/news/project.xml?rev=750282&r1=750281&r2=750282&view=diff
==
--- tomcat/connectors/trunk/jk/xdocs/news/project.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/news/project.xml Thu Mar  5 01:49:08 2009
@@ -42,6 +42,7 @@
 
 
 
+
 
 
 

Modified: tomcat/connectors/trunk/jk/xdocs/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/project.xml?rev=750282&r1=750281&r2=750282&view=diff
==
--- tomcat/connectors/trunk/jk/xdocs/project.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/project.xml Thu Mar  5 01:49:08 2009
@@ -42,6 +42,7 @@
 
 
 
+
 
 
 

Modified: tomcat/connectors/trunk/jk/xdocs/reference/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/reference/project.xml?rev=750282&r1=750281&r2=750282&view=diff
==
--- tomcat/connectors/trunk/jk/xdocs/reference/project.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/reference/project.xml Thu Mar  5 01:49:08 
2009
@@ -42,6 +42,7 @@
 
 
 
+
 
 
 

Modified: tomcat/connectors/trunk/jk/xdocs/webserver_howto/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/webserver_howto/project.xml?rev=750282&r1=750281&r2=750282&view=diff
==
--- tomcat/connectors/trunk/jk/xdocs/webserver_howto/project.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/webserver_howto/project.xml Thu Mar  5 
01:49:08 2009
@@ -42,6 +42,7 @@
 
 
 
+
 
 
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r750283 - /tomcat/connectors/trunk/jk/xdocs/generic_howto/proxy.xml

2009-03-04 Thread rjung 
Author: rjung
Date: Thu Mar  5 01:49:33 2009
New Revision: 750283

URL: http://svn.apache.org/viewvc?rev=750283&view=rev
Log:
Fix some typos in new page.

Modified:
tomcat/connectors/trunk/jk/xdocs/generic_howto/proxy.xml

Modified: tomcat/connectors/trunk/jk/xdocs/generic_howto/proxy.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/generic_howto/proxy.xml?rev=750283&r1=750282&r2=750283&view=diff
==
--- tomcat/connectors/trunk/jk/xdocs/generic_howto/proxy.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/generic_howto/proxy.xml Thu Mar  5 
01:49:33 2009
@@ -32,11 +32,11 @@
 The Apache module mod_jk and its ISAPI and NSAPI variants connect
 a web server to a backend (typically Tomcat) using the AJP protocol.
 The web server receives an HTTP(S) request and the module forwards
-the request to the back end. This situation is usually called a gateway
+the request to the backend. This function is usually called a gateway
 or a proxy, in the context of HTTP it is called a reverse proxy.
 
 
-
+
 
 A reverse proxy is not totally transparent to the application on
 the backend. For instance the host name and port the original client
@@ -50,26 +50,26 @@
 Another example is the client IP address, which for the web server is the
 source IP of the incoming connection, whereas for the backend the
 connection always comes from the web server. This can be a problem, when
-th client IP is checked by the backend application e.g. for security reasons.
+the client IP is used by the backend application e.g. for security reasons.
 
 
-
+
 
 Most of these problems are automatically handled by the AJP protocol
 and the AJP connectors of the backend. The AJP protocol transports
 this communication metadata and the backend connector presents this
-metadata whenever the appliaction asks for it using Servlet API methods.
+metadata whenever the application asks for it using Servlet API methods.
 
 The following list contains the communication metadata handled by AJP
 and the HttpServletRequest API calls which can be used to retrieve them:
 
 local name: getLocalName() and getLocalAddr.
 This is also equal to getServerName(), unless a Host header
-is contained in the request. in this case server name is taken from that 
header.
+is contained in the request. In this case the server name is taken from that 
header.
 
 local port: getLocalPort()
 This is also equal to getServerPort(), unless a Host header
-is contained in the request. in this case server port is taken from that header
+is contained in the request. In this case the server port is taken from that 
header
 if it contains an explicit port, or is equal to the default port of the scheme 
used.
 
 client address: getRemoteAddr()
@@ -103,7 +103,7 @@
 
 
 
-
+
 
 In some situations this is not enough though. Assume there is another
 less clever reverse proxy in front of your web server, for instance an
@@ -114,18 +114,18 @@
 plain HTTP.
 
 Another example would be a simple reverse proxy in front of your web server,
-so that the client IP address your web server detects is always the IP address
+so that the client IP address that your web server sees is always the IP 
address
 of this reverse proxy, and not of the original client. Often such reverse 
proxies
 generate an additional HTTP header, like X-Forwareded-for which
 contains the original client IP address (or a list of IP addresses, if there 
are
 more cascading reverse proxies in front). It would be nice, if we could use the
-content of such a header as the client IP adrress to pass to the backend.
+content of such a header as the client IP address to pass to the backend.
 
 So we might need to manipulate some of the data that AJP sends to the 
backend.
 When using mod_jk inside Apache httpd you can use several httpd environment
-variables to let mod_jk know, which data it should forward. These environment
-be set by the httpd directives SetEnv or SetEnvIf, but also in very flexible
-was using mod_rewrite (since httpd 2.x it can not only test against environment
+variables to let mod_jk know, which data it should forward. These environment 
variables
+can be set by the httpd directives SetEnv or SetEnvIf, but also in very 
flexible
+way using mod_rewrite (since httpd 2.x it can not only test against environment
 variables, but also set them).
 
 The following list contains all environment variables mod_jk checks, before
@@ -135,7 +135,7 @@
 
 JK_LOCAL_PORT: the local port
 
-JK_REMOTE_HOST: the client host XXX ??
+JK_REMOTE_HOST: the client host
 
 JK_REMOTE_ADDR: the client address
 
@@ -165,21 +165,21 @@
 Some of these variables might also be used by other web server modules. All
 variables whose name does not begin with "JK" are set directly by Apache httpd.
 If you want to change the data, but do not want to negatively influence the 
behaviour
-of other modules, you can change the names of all variables mod_jk uses. F

svn commit: r750286 - /tomcat/connectors/trunk/jk/xdocs/generic_howto/proxy.xml

2009-03-04 Thread rjung 
Author: rjung
Date: Thu Mar  5 01:55:34 2009
New Revision: 750286

URL: http://svn.apache.org/viewvc?rev=750286&view=rev
Log:
Fix some formatting issues on new page.

Modified:
tomcat/connectors/trunk/jk/xdocs/generic_howto/proxy.xml

Modified: tomcat/connectors/trunk/jk/xdocs/generic_howto/proxy.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/generic_howto/proxy.xml?rev=750286&r1=750285&r2=750286&view=diff
==
--- tomcat/connectors/trunk/jk/xdocs/generic_howto/proxy.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/generic_howto/proxy.xml Thu Mar  5 
01:55:34 2009
@@ -46,7 +46,6 @@
 self-referencing URLs using its own backend address and port, the
 client will usually not be able to use these URLs.
 
-
 Another example is the client IP address, which for the web server is the
 source IP of the incoming connection, whereas for the backend the
 connection always comes from the web server. This can be a problem, when
@@ -64,11 +63,11 @@
 and the HttpServletRequest API calls which can be used to retrieve them:
 
 local name: getLocalName() and getLocalAddr.
-This is also equal to getServerName(), unless a Host header
+This is also equal to getServerName(), unless a Host 
header
 is contained in the request. In this case the server name is taken from that 
header.
 
 local port: getLocalPort()
-This is also equal to getServerPort(), unless a Host header
+This is also equal to getServerPort(), unless a Host 
header
 is contained in the request. In this case the server port is taken from that 
header
 if it contains an explicit port, or is equal to the default port of the scheme 
used.
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r750288 - /tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml

2009-03-04 Thread rjung 
Author: rjung
Date: Thu Mar  5 02:05:12 2009
New Revision: 750288

URL: http://svn.apache.org/viewvc?rev=750288&view=rev
Log:
Fix typos in changelog.

Modified:
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?rev=750288&r1=750287&r2=750288&view=diff
==
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Thu Mar  5 
02:05:12 2009
@@ -91,9 +91,9 @@
 46734: Documentation: Fix broken links. (markt)
   
   
-  IIS: Update uriworkermap.properies file on
+  IIS: Update uriworkermap.properties file on
   a regular interval. This requires both worker_mount_reload
-  and watchog_interval to be defined. (mturk)
+  and watchdog_interval to be defined. (mturk)
   
   
   Status: Optimize forced uriworkermap.properties reload. (mturk)



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r750290 - /tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml

2009-03-04 Thread rjung 
Author: rjung
Date: Thu Mar  5 02:06:53 2009
New Revision: 750290

URL: http://svn.apache.org/viewvc?rev=750290&view=rev
Log:
More typos.

Modified:
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?rev=750290&r1=750289&r2=750290&view=diff
==
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Thu Mar  5 
02:06:53 2009
@@ -50,7 +50,7 @@
 Docs: Clarify IIS URL rewrite feature. (rjung)
   
   
-Status: Remove redundant port information form worker display.
+Status: Remove redundant port information from worker display.
 Rename address column and remove its explanation from the legend. 
(rjung)
   
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r750291 - in /tomcat/trunk/bin: catalina.bat catalina.sh

2009-03-04 Thread fhanik 
Author: fhanik
Date: Thu Mar  5 02:13:46 2009
New Revision: 750291

URL: http://svn.apache.org/viewvc?rev=750291&view=rev
Log:
Split LOGGING_CONFIG into two options, LOGGING_CONFIG which points to the file, 
LOGGING_MANAGER which sets the log manager
This makes it much easier to handle directories with spaces


Modified:
tomcat/trunk/bin/catalina.bat
tomcat/trunk/bin/catalina.sh

Modified: tomcat/trunk/bin/catalina.bat
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.bat?rev=750291&r1=750290&r2=750291&view=diff
==
--- tomcat/trunk/bin/catalina.bat (original)
+++ tomcat/trunk/bin/catalina.bat Thu Mar  5 02:13:46 2009
@@ -64,10 +64,13 @@
 rem   -agentlib:jdwp=transport=%JPDA_TRANSPORT%,
 rem   
address=%JPDA_ADDRESS%,server=y,suspend=%JPDA_SUSPEND%
 rem
-rem   LOGGING_CONFIG  (Optional) Override Tomcat's logging manager and logging 
config file
+rem   LOGGING_CONFIG  (Optional) Override Tomcat's logging config file
 rem   Example (all one line)
-rem   set 
LOGGING_CONFIG=-Djava.util.logging.manager=com.foo.MyLogManager 
-rem   
-Djava.util.logging.config.file=$CATALINA_BASE/conf/logging.properties
+rem   set 
LOGGING_CONFIG="-Djava.util.logging.config.file=%CATALINA_BASE%\conf\logging.properties"
+rem
+rem   LOGGING_MANAGER (Optional) Override Tomcat's logging manager 
+rem   Example (all one line)
+rem   set 
LOGGING_CONFIG="-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager"
 rem
 rem
 rem
@@ -121,13 +124,18 @@
 set CATALINA_TMPDIR=%CATALINA_BASE%\temp
 :gotTmpdir
 
-if not "%LOGGING_CONFIG%" == "" goto noJuli
+if not "%LOGGING_CONFIG%" == "" goto noJuliConfig
 set LOGGING_CONFIG=-Dnop
-if not exist "%CATALINA_BASE%\conf\logging.properties" goto noJuli
-set 
LOGGING_CONFIG=-Djava.util.logging.config.file="%CATALINA_BASE%\conf\logging.properties"
 -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager
-:noJuli
+if not exist "%CATALINA_BASE%\conf\logging.properties" goto noJuliConfig
+set 
LOGGING_CONFIG=-Djava.util.logging.config.file="%CATALINA_BASE%\conf\logging.properties"
+:noJuliConfig
 set JAVA_OPTS=%JAVA_OPTS% %LOGGING_CONFIG%
 
+if not "%LOGGING_MANAGER%" == "" goto noJuliManager
+set 
LOGGING_MANAGER=-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager
+:noJuliManager
+set JAVA_OPTS=%JAVA_OPTS% %LOGGING_MANAGER%
+
 rem - Execute The Requested Command ---
 
 echo Using CATALINA_BASE:   %CATALINA_BASE%

Modified: tomcat/trunk/bin/catalina.sh
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.sh?rev=750291&r1=750290&r2=750291&view=diff
==
--- tomcat/trunk/bin/catalina.sh (original)
+++ tomcat/trunk/bin/catalina.sh Thu Mar  5 02:13:46 2009
@@ -67,10 +67,13 @@
 #   CATALINA_PID(Optional) Path of the file which should contains the pid
 #   of catalina startup java process, when start (fork) is used
 #
-#   LOGGING_CONFIG  (Optional) Override Tomcat's logging manager and logging 
config file
+#   LOGGING_CONFIG  (Optional) Override Tomcat's logging config file
 #   Example (all one line)
-#   
LOGGING_CONFIG="-Djava.util.logging.manager=com.foo.MyLogManager \
-#   
-Djava.util.logging.config.file=$CATALINA_BASE/conf/logging.properties"
+#   
LOGGING_CONFIG="-Djava.util.logging.config.file=$CATALINA_BASE/conf/logging.properties"
+#
+#   LOGGING_MANAGER (Optional) Override Tomcat's logging manager 
+#   Example (all one line)
+#   
LOGGING_CONFIG="-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager"
 #
 # $Id$
 # -
@@ -184,16 +187,22 @@
   JAVA_ENDORSED_DIRS=`cygpath --path --windows "$JAVA_ENDORSED_DIRS"`
 fi
 
-# Set juli LogManager if it is present and an override has not been issued
+# Set juli LogManager config file if it is present and an override has not 
been issued
 if [ -z "$LOGGING_CONFIG" ]; then
   if [ -r "$CATALINA_BASE"/conf/logging.properties ]; then
-JAVA_OPTS="$JAVA_OPTS 
-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager"
 
LOGGING_CONFIG="-Djava.util.logging.config.file=$CATALINA_BASE/conf/logging.properties"
   else
 # Bugzilla 45585
 LOGGING_CONFIG="-Dnop"
   fi
 fi
+
+if [ -z "$LOGGING_MANAGER" ]; then
+  JAVA_OPTS="$JAVA_OPTS 
-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager"
+else 
+  JAVA_OPTS="$JAVA_OPTS $LOGGING_MANAGER"
+fi
+
 # - Execute The Requested Command -
 
 # Bugzilla 37848: only output this if we have a TTY



--

svn commit: r750292 - /tomcat/tc6.0.x/trunk/STATUS.txt

2009-03-04 Thread fhanik 
Author: fhanik
Date: Thu Mar  5 02:14:30 2009
New Revision: 750292

URL: http://svn.apache.org/viewvc?rev=750292&view=rev
Log:
update

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=750292&r1=750291&r2=750292&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Mar  5 02:14:30 2009
@@ -177,6 +177,7 @@
 * Make the LOGGING_CONFIG variable a variable that one can set outside or in 
setenv.sh to override the default tomcat logging mechanism
   with a custom extension or a different location of the logging.properties 
file or both
   http://svn.apache.org/viewvc?rev=750258&view=rev
+  http://svn.apache.org/viewvc?rev=750291&view=rev
   +1: fhanik
   -1: 
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r750293 - in /tomcat/connectors/trunk/jk/xdocs: ajp/project.xml generic_howto/project.xml miscellaneous/project.xml news/20090301.xml news/project.xml project.xml reference/project.xml web

2009-03-04 Thread rjung 
Author: rjung
Date: Thu Mar  5 02:17:45 2009
New Revision: 750293

URL: http://svn.apache.org/viewvc?rev=750293&view=rev
Log:
Add a preliminary version of the 2009 news page for
the next release.

Added:
tomcat/connectors/trunk/jk/xdocs/news/20090301.xml   (with props)
Modified:
tomcat/connectors/trunk/jk/xdocs/ajp/project.xml
tomcat/connectors/trunk/jk/xdocs/generic_howto/project.xml
tomcat/connectors/trunk/jk/xdocs/miscellaneous/project.xml
tomcat/connectors/trunk/jk/xdocs/news/project.xml
tomcat/connectors/trunk/jk/xdocs/project.xml
tomcat/connectors/trunk/jk/xdocs/reference/project.xml
tomcat/connectors/trunk/jk/xdocs/webserver_howto/project.xml

Modified: tomcat/connectors/trunk/jk/xdocs/ajp/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/ajp/project.xml?rev=750293&r1=750292&r2=750293&view=diff
==
--- tomcat/connectors/trunk/jk/xdocs/ajp/project.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/ajp/project.xml Thu Mar  5 02:17:45 2009
@@ -67,6 +67,7 @@
 
 
 
+
 
 
 

Modified: tomcat/connectors/trunk/jk/xdocs/generic_howto/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/generic_howto/project.xml?rev=750293&r1=750292&r2=750293&view=diff
==
--- tomcat/connectors/trunk/jk/xdocs/generic_howto/project.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/generic_howto/project.xml Thu Mar  5 
02:17:45 2009
@@ -67,6 +67,7 @@
 
 
 
+
 
 
 

Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/project.xml?rev=750293&r1=750292&r2=750293&view=diff
==
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/project.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/project.xml Thu Mar  5 
02:17:45 2009
@@ -67,6 +67,7 @@
 
 
 
+
 
 
 

Added: tomcat/connectors/trunk/jk/xdocs/news/20090301.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/news/20090301.xml?rev=750293&view=auto
==
--- tomcat/connectors/trunk/jk/xdocs/news/20090301.xml (added)
+++ tomcat/connectors/trunk/jk/xdocs/news/20090301.xml Thu Mar  5 02:17:45 2009
@@ -0,0 +1,77 @@
+
+
+
+]>
+
+
+  &project;
+
+  
+Apache Tomcat Connectors 
Project
+2009 News and Status
+  
+
+
+
+
+
+
+
+
+The Apache Tomcat team is proud to announce the immediate availability
+of Tomcat Connectors 1.2.28. This is a stable release concentrating mainly on
+some bug fixes.
+
+ Please see the ChangeLog for a 
full list of changes.
+
+If you find any bugs while using this release, please fill in the
+https://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%20Connectors";>Bugzilla
+Bug Report.
+
+
+The most important new features in this version are:
+
+Dynamic Address and Port Change Using the Status Worker
+
+The status worker now allows you to change the address and the port
+of an AJP13 worker on the fly. You can e.g. provision dummy workers with a port
+equal to "0", which will be automatically put into stopped mode during startup.
+Later, when you want to actually use thse workers, you set their address and
+port to the final values.
+
+
+Note that already existing connections will go on using the old
+address and port. This will be improved in future versions.
+
+Improved Proxy Flexibility
+
+You can now overwrite more request metadata before the request gets send to 
the backend.
+This is helpful in case there are other reverse proxies in front of your web 
server.
+A new documentation page explains 
this in detail.
+
+Improved IIS support
+
+IIS support has been improved especially when using mutltiple application 
pools.
+Furthermore you can now configure the ISAPI plugin to update the 
uriworkermap.properies
+file on a regular interval using the watchdog thread.
+
+
+
+
+

Propchange: tomcat/connectors/trunk/jk/xdocs/news/20090301.xml
--
svn:eol-style = native

Propchange: tomcat/connectors/trunk/jk/xdocs/news/20090301.xml
--
svn:keywords = Author Date Id Revision

Modified: tomcat/connectors/trunk/jk/xdocs/news/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/news/project.xml?rev=750293&r1=750292&r2=750293&view=diff
==
--- tomcat/connectors/trunk/jk/xdocs/news/project.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/news/project.xml Thu Mar  5 02:17:45 2

Re: Going for jk 1.2.28

2009-03-04 Thread Rainer Jung 

On 19.02.2009 16:39, Mladen Turk wrote:

Hi,

We have a bug in 1.2.27 that cause core in some configuration
scenarios (#46352). The fix is in the SVN for more then a month.
Beyond that there are two additional bug fixes
one preventing Netware build, and other fixing IIS
advanced configuration (#46579)

There are also few valuable updates like dynamic
contact address change for workers.

Given all that I plan to go for a new release.
I'll use our standard release system with
pre-release build and then call for a vote
giving 72 hours between each step.

Comments, objections?


Do you have more changes you want in 1.2.28, or are we done?
I think there's enough, and more makes breaking more likely. It would be 
good to have a smaller release after the big 1.2.27.


So I think we are now in a position for a dev testing tarball?

Do you want to do the next steps, or should I?

Regards,

Rainer


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r750300 - /tomcat/connectors/trunk/jk/xdocs/generic_howto/proxy.xml

2009-03-04 Thread rjung 
Author: rjung
Date: Thu Mar  5 02:49:57 2009
New Revision: 750300

URL: http://svn.apache.org/viewvc?rev=750300&view=rev
Log:
Add Tomcat connector proxy settings to new
proxy documentation page.

Modified:
tomcat/connectors/trunk/jk/xdocs/generic_howto/proxy.xml

Modified: tomcat/connectors/trunk/jk/xdocs/generic_howto/proxy.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/generic_howto/proxy.xml?rev=750300&r1=750299&r2=750300&view=diff
==
--- tomcat/connectors/trunk/jk/xdocs/generic_howto/proxy.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/generic_howto/proxy.xml Thu Mar  5 
02:49:57 2009
@@ -170,6 +170,26 @@
 All variables, that are not SSL-related have only been introduced in 
version 1.2.27.
 
 
+
+
+As an alternative to using the environment variables described in the 
previous section
+(which do only exist when using Apache httpd), you can also configure Tomcat 
to overwrite
+some of the communications data forwarded by mod_jk. The AJP connector in 
Tomcat's server.xml
+allows to set the http://tomcat.apache.org/tomcat-6.0-doc/config/ajp.html#Attributes";>following
 properties:
+
+proxyName: server name as returned by getServerName()
+
+proxyPort: server port as returned by getServerPort()
+
+scheme: protocol scheme as returned by getScheme()
+
+secure: set to "true", if you wish isSecure() to return 
"true".
+
+
+Remember: in general you don't need to set those. AJP handles all cases 
automatically,
+where the web server running mod_jk knows the right data.
+
+
 
 
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 46802] New: Unable to locate mod_jk for 64-bit machine

2009-03-04 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=46802

   Summary: Unable to locate mod_jk for 64-bit machine
   Product: Tomcat Connectors
   Version: 1.2.27
  Platform: PC
OS/Version: Windows Server 2003
Status: NEW
  Severity: normal
  Priority: P2
 Component: mod_jk
AssignedTo: dev@tomcat.apache.org
ReportedBy: rajat@gmail.com


Hi,

I was not able to locate mod_jk-1.2.27-httpd-2.2.10.so for 64-bit Inetl or AMD
machine.

I could only see the dll's for IIS 5 web server.

http://www.apache.org/dist/tomcat/tomcat-connectors/jk/binaries/win64/jk-1.2.27/ia64/

Do you have any plans to release this in future.

Regards
Rajat

-- 
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: Going for jk 1.2.28

2009-03-04 Thread Mladen Turk 

Rainer Jung wrote:

On 19.02.2009 16:39, Mladen Turk wrote:

Hi,

We have a bug in 1.2.27 that cause core in some configuration
scenarios (#46352). The fix is in the SVN for more then a month.
Beyond that there are two additional bug fixes
one preventing Netware build, and other fixing IIS
advanced configuration (#46579)

There are also few valuable updates like dynamic
contact address change for workers.

Given all that I plan to go for a new release.
I'll use our standard release system with
pre-release build and then call for a vote
giving 72 hours between each step.

Comments, objections?


Do you have more changes you want in 1.2.28, or are we done?


Nope, that's it.
Well, workers.properties auto reload for IIS,
but that's too much for now thought.

I think there's enough, and more makes breaking more likely. It would be 
good to have a smaller release after the big 1.2.27.




Agreed.


So I think we are now in a position for a dev testing tarball?
Do you want to do the next steps, or should I?



Feel free to roll, I'll create the bins as needed.

Regards
--
^(TM)

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Going for jk 1.2.28

2009-03-04 Thread Mladen Turk 

Rainer Jung wrote:


Do you want to do the next steps, or should I?



BTW, I'd like that we this time use the common
httpd 2.0 and 2.2 versions for producing the
binaries. For 2.0 I'd suggest 2.0.52 (or 2.0.49)
and for 2.2 version 2.2.3.
For 1.3, 1.3.23 should be fine.

All later versions have the same ABI so this
would fit into the majority of httpd deployments.


Regards
--
^(TM)

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org