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

[mturk]

Author: mturk
Date: Sat Nov 25 00:37:11 2006
New Revision: 479107

URL: http://svn.apache.org/viewvc?view=rev&rev=479107
Log:
The cping/cpong is done inside ajp_connect_to_endpoint.

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=diff&rev=479107&r1=479106&r2=479107
==
--- tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c Sat Nov 25 
00:37:11 2006
@@ -1217,8 +1217,8 @@
 if (err) {
 /* XXX: If err is set, the tomcat is either dead or disconnected */
 jk_log(l, JK_LOG_INFO,
-   "(%s) all endpoints are disconnected or dead",
-   ae->worker->name);
+   "(%s) all endpoints are %s",
+   ae->worker->name, err == 1 ? "disconnected" : "dead");
 jk_log(l, JK_LOG_INFO,
"(%s) increase the backend idle connection timeout or the 
connection_pool_minsize",
ae->worker->name);
@@ -1226,19 +1226,7 @@
 /* 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;
-}
-}
-
+if (ajp_connect_to_endpoint(ae, l) == JK_TRUE) {
 /*
  * 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: r479108 - /tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c

[mturk]

Author: mturk
Date: Sat Nov 25 00:47:47 2006
New Revision: 479108

URL: http://svn.apache.org/viewvc?view=rev&rev=479108
Log:
Add some code comment. No functional change.

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=diff&rev=479108&r1=479107&r2=479108
==
--- tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c Sat Nov 25 
00:47:47 2006
@@ -1179,9 +1179,17 @@
  * If the socket is disconnected no need to handle
  * the cping/cpong
  */
-if (ajp_handle_cping_cpong(ae, ae->worker->prepost_timeout, l) ==
-JK_FALSE)
+if (ajp_handle_cping_cpong(ae,
+ae->worker->prepost_timeout, l) == JK_FALSE) {
+/* XXX: Is there any reason to try other
+ * connections to the node if one of them fails
+ * the cping/cpong heartbeat?
+ * Tomcat can be either too busy or simply dead, so
+ * there is a chance that all oter connections would
+ * fail as well.
+ */
 err = 2;
+}
 }
 
 /* If we got an error or can't send data, then try to get a pooled



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r479112 - in /tomcat/connectors/trunk/jni/native: os/win32/system.c src/ssl.c src/sslcontext.c src/sslinfo.c src/sslnetwork.c src/sslutils.c

[mturk]

Author: mturk
Date: Sat Nov 25 02:22:33 2006
New Revision: 479112

URL: http://svn.apache.org/viewvc?view=rev&rev=479112
Log:
Add empty stubs for without-openssl builds.

Modified:
tomcat/connectors/trunk/jni/native/os/win32/system.c
tomcat/connectors/trunk/jni/native/src/ssl.c
tomcat/connectors/trunk/jni/native/src/sslcontext.c
tomcat/connectors/trunk/jni/native/src/sslinfo.c
tomcat/connectors/trunk/jni/native/src/sslnetwork.c
tomcat/connectors/trunk/jni/native/src/sslutils.c

Modified: tomcat/connectors/trunk/jni/native/os/win32/system.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/native/os/win32/system.c?view=diff&rev=479112&r1=479111&r2=479112
==
--- tomcat/connectors/trunk/jni/native/os/win32/system.c (original)
+++ tomcat/connectors/trunk/jni/native/os/win32/system.c Sat Nov 25 02:22:33 
2006
@@ -34,7 +34,9 @@
 #include "apr_arch_atime.h"  /* for FileTimeToAprTime */
 
 #include "tcn.h"
+#ifdef HAVE_OPENSSL
 #include "ssl_private.h"
+#endif
 
 #pragma warning(push)
 #pragma warning(disable : 4201)
@@ -371,6 +373,8 @@
 return rv;
 }
 
+#ifdef HAVE_OPENSSL
+
 static DWORD WINAPI password_thread(void *data)
 {
 tcn_pass_cb_t *cb = (tcn_pass_cb_t *)data;
@@ -461,4 +465,4 @@
 return (int)strlen(data->password);
 }
 
-
+#endif

Modified: tomcat/connectors/trunk/jni/native/src/ssl.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/native/src/ssl.c?view=diff&rev=479112&r1=479111&r2=479112
==
--- tomcat/connectors/trunk/jni/native/src/ssl.c (original)
+++ tomcat/connectors/trunk/jni/native/src/ssl.c Sat Nov 25 02:22:33 2006
@@ -802,9 +802,101 @@
 }
 
 #else
-/* OpenSSL is not supported
- * If someday we make OpenSSL optional
- * APR_ENOTIMPL will go here
+/* OpenSSL is not supported.
+ * Create empty stubs.
  */
-#error "No OpenSSL Toolkit defined."
+
+TCN_IMPLEMENT_CALL(jint, SSL, version)(TCN_STDARGS)
+{
+UNREFERENCED_STDARGS;
+return 0;
+}
+
+TCN_IMPLEMENT_CALL(jstring, SSL, versionString)(TCN_STDARGS)
+{
+UNREFERENCED_STDARGS;
+return NULL;
+}
+
+TCN_IMPLEMENT_CALL(jint, SSL, initialize)(TCN_STDARGS, jstring engine)
+{
+UNREFERENCED_STDARGS;
+UNREFERENCED(engine);
+return (jint)APR_ENOTIMPL;
+}
+
+TCN_IMPLEMENT_CALL(jboolean, SSL, randLoad)(TCN_STDARGS, jstring file)
+{
+UNREFERENCED_STDARGS;
+UNREFERENCED(file);
+return JNI_FALSE;
+}
+
+TCN_IMPLEMENT_CALL(jboolean, SSL, randSave)(TCN_STDARGS, jstring file)
+{
+UNREFERENCED_STDARGS;
+return JNI_FALSE;
+}
+
+TCN_IMPLEMENT_CALL(jboolean, SSL, randMake)(TCN_STDARGS, jstring file,
+jint length, jboolean base64)
+{
+UNREFERENCED_STDARGS;
+UNREFERENCED(file);
+UNREFERENCED(length);
+UNREFERENCED(base64);
+return JNI_FALSE;
+}
+
+TCN_IMPLEMENT_CALL(jlong, SSL, newBIO)(TCN_STDARGS, jlong pool,
+   jobject callback)
+{
+UNREFERENCED_STDARGS;
+UNREFERENCED(pool);
+UNREFERENCED(callback);
+return 0;
+}
+
+TCN_IMPLEMENT_CALL(jint, SSL, closeBIO)(TCN_STDARGS, jlong bio)
+{
+UNREFERENCED_STDARGS;
+UNREFERENCED(bio);
+return (jint)APR_ENOTIMPL;
+}
+
+TCN_IMPLEMENT_CALL(void, SSL, setPasswordCallback)(TCN_STDARGS,
+   jobject callback)
+{
+UNREFERENCED_STDARGS;
+UNREFERENCED(callback);
+}
+
+TCN_IMPLEMENT_CALL(void, SSL, setPassword)(TCN_STDARGS, jstring password)
+{
+UNREFERENCED_STDARGS;
+UNREFERENCED(password);
+}
+
+TCN_IMPLEMENT_CALL(jboolean, SSL, generateRSATempKey)(TCN_STDARGS, jint idx)
+{
+UNREFERENCED_STDARGS;
+UNREFERENCED(idx);
+return JNI_FALSE;
+}
+
+TCN_IMPLEMENT_CALL(jboolean, SSL, loadDSATempKey)(TCN_STDARGS, jint idx,
+  jstring file)
+{
+UNREFERENCED_STDARGS;
+UNREFERENCED(idx);
+UNREFERENCED(file);
+return JNI_FALSE;
+}
+
+TCN_IMPLEMENT_CALL(jstring, SSL, getLastError)(TCN_STDARGS)
+{
+UNREFERENCED_STDARGS;
+return NULL;
+}
+
 #endif

Modified: tomcat/connectors/trunk/jni/native/src/sslcontext.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/native/src/sslcontext.c?view=diff&rev=479112&r1=479111&r2=479112
==
--- tomcat/connectors/trunk/jni/native/src/sslcontext.c (original)
+++ tomcat/connectors/trunk/jni/native/src/sslcontext.c Sat Nov 25 02:22:33 2006
@@ -564,9 +564,138 @@
 }
 
 #else
-/* OpenSSL is not supported
- * If someday we make OpenSSL optional
- * APR_ENOTIMPL will go here
+/* OpenSSL is not supported.
+ * Create empty stubs.
  */
-#error "No OpenSSL Toolkit defined."
+
+TCN_IMPLEMENT_CALL(jlong, SSLContext, make)(TCN_STDARGS, jlong pool,
+jint protocol, jint mode)
+{
+  

svn commit: r479123 - /tomcat/connectors/trunk/jni/native/configure.in

[mturk]

Author: mturk
Date: Sat Nov 25 04:58:45 2006
New Revision: 479123

URL: http://svn.apache.org/viewvc?view=rev&rev=479123
Log:
Add --disable-openssl cmdline param to the configure.

Modified:
tomcat/connectors/trunk/jni/native/configure.in

Modified: tomcat/connectors/trunk/jni/native/configure.in
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/native/configure.in?view=diff&rev=479123&r1=479122&r2=479123
==
--- tomcat/connectors/trunk/jni/native/configure.in (original)
+++ tomcat/connectors/trunk/jni/native/configure.in Sat Nov 25 04:58:45 2006
@@ -101,8 +101,7 @@
 APR_ADDTO(TCNATIVE_PRIV_INCLUDES,[-I$JAVA_HOME/$JAVA_INC])
 
 dnl sableVM does not have/need $JAVA_OS/jni_md.h
-if test "$SABLEVM" = "NONE"
-then
+if test "$SABLEVM" = "NONE"; then
   TCN_FIND_JDK_OS
   if test -z "${JAVA_OS}"; then
 AC_MSG_RESULT([jni_md.h found in $JAVA_HOME/$JAVA_INC])
@@ -119,7 +118,18 @@
 dnl
 dnl Detect openssl toolkit installation
 dnl
-TCN_CHECK_SSL_TOOLKIT
+
+use_openssl=yes
+AC_ARG_ENABLE(openssl, 
+[ --disable-openssl   avoid using OpenSSL toolkit],
+[
+  use_openssl=no
+  AC_MSG_RESULT([...Disabling SSL support])
+])
+
+if test "x$use_openssl" = "xyes"; then
+  TCN_CHECK_SSL_TOOLKIT
+fi
 
 so_ext=$APR_SO_EXT
 lib_target=$APR_LIB_TARGET



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r479124 - /tomcat/connectors/trunk/jni/native/configure.in

[mturk]

Author: mturk
Date: Sat Nov 25 05:17:52 2006
New Revision: 479124

URL: http://svn.apache.org/viewvc?view=rev&rev=479124
Log:
Use true/false instead string compare

Modified:
tomcat/connectors/trunk/jni/native/configure.in

Modified: tomcat/connectors/trunk/jni/native/configure.in
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/native/configure.in?view=diff&rev=479124&r1=479123&r2=479124
==
--- tomcat/connectors/trunk/jni/native/configure.in (original)
+++ tomcat/connectors/trunk/jni/native/configure.in Sat Nov 25 05:17:52 2006
@@ -119,15 +119,16 @@
 dnl Detect openssl toolkit installation
 dnl
 
-use_openssl=yes
+use_openssl=true;
+
 AC_ARG_ENABLE(openssl, 
 [ --disable-openssl   avoid using OpenSSL toolkit],
 [
-  use_openssl=no
-  AC_MSG_RESULT([...Disabling SSL support])
+  use_openssl=false;
+  AC_MSG_RESULT([Disabling SSL support...])
 ])
 
-if test "x$use_openssl" = "xyes"; then
+if test $use_openssl ; then
   TCN_CHECK_SSL_TOOLKIT
 fi
 



-
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

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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-25 05:35 ---
And enable the security manager with all permissions, and see if it still 
happens.

-- 
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: r479128 - /tomcat/connectors/trunk/jni/native/configure.in

[mturk]

Author: mturk
Date: Sat Nov 25 06:21:08 2006
New Revision: 479128

URL: http://svn.apache.org/viewvc?view=rev&rev=479128
Log:
Non need for test if we have boolean vars

Modified:
tomcat/connectors/trunk/jni/native/configure.in

Modified: tomcat/connectors/trunk/jni/native/configure.in
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/native/configure.in?view=diff&rev=479128&r1=479127&r2=479128
==
--- tomcat/connectors/trunk/jni/native/configure.in (original)
+++ tomcat/connectors/trunk/jni/native/configure.in Sat Nov 25 06:21:08 2006
@@ -128,7 +128,7 @@
   AC_MSG_RESULT([Disabling SSL support...])
 ])
 
-if test $use_openssl ; then
+if $use_openssl ; then
   TCN_CHECK_SSL_TOOLKIT
 fi
 



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 41018] - Linking global resources using ResourceLink broken

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=41018





--- Additional Comments From [EMAIL PROTECTED]  2006-11-25 06:43 ---
(In reply to comment #5)
> ResourceLink works for me. If you have a test case (simplest possible jsp /
> servlet / war + source where appropriate) that demonstrates this issue please
> re-open this report and attach your test case.

I found the problem: since Tomcat 5.5 you can use the Transaction-element
instead of the Resource-element, however this is unsupported/broken when used
inside GlobalNamingResources-element. Hence I got null as result of the lookup.
Should I file a new bug for this problem? The problem goes away when using the
old-school Resource.

You are right about the patch, it does not solve this problem, I think I changed
two things at once (applying the patch and using Resource instead of 
Transaction).

-- 
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 41018] - Linking global resources using ResourceLink broken

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=41018





--- Additional Comments From [EMAIL PROTECTED]  2006-11-25 06:56 ---
I suggest you post to the users list to confirm that what you are trying to do
is valid and that you have indeed found a bug. If the discussion on the users
lists suggest that a bug does exist then please open a new 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]

DO NOT REPLY [Bug 40593] - HttpSessionListener#sessionDestroyed is not called though the manager's pathname is emply.

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=40593


[EMAIL PROTECTED] changed:

   What|Removed |Added

   Severity|normal  |enhancement
Version|5.5.17  |Nightly Build




--- Additional Comments From [EMAIL PROTECTED]  2006-11-25 08:32 ---
The code you quoted is not the root cause of this behaviour. The root cause can
be found at line 483 of
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/session/StandardManager.java?revision=466608&view=markup

As far as I can see, the spec is silent on what should happen in this case. I am
going to mark this as an enhancement request and start a discussion on the dev
list as to what, if anything, Tomcat should do in this case.

-- 
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]

StandardManager behaviour when webapp stopped

[Mark Thomas]

Bug 40593 [1] has raised the following question:

When a web app with valid sessions is stopped and the StandardManager
is configured not to serialize the sessions what, if anything, should
the container do in this case?

As far as I can tell from the spec, the container behaviour in these
circumstances is undefined. Is there a good reason not to invalidate
the active sessions in this case?

Thoughts?

Mark

[1] http://issues.apache.org/bugzilla/show_bug.cgi?id=40593

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 41016] - tomcat 5.5 multiple contexts using same realm bug

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=41016





--- Additional Comments From [EMAIL PROTECTED]  2006-11-25 09:18 ---
Hi
 Not so sure, when we spotted the "issues". I told elliot to add the
"localDatasource" attribute to "true" in the *realm* (
http://mail-archives.apache.org/mod_mbox/tomcat-users/200611.mbox/[EMAIL 
PROTECTED]
)
Perhaps it a bug in the bugreport :-)

-- 
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: r479159 - in /tomcat: connectors/trunk/juli/src/java/org/apache/juli/FileHandler.java container/tc5.5.x/webapps/docs/changelog.xml

[markt]

Author: markt
Date: Sat Nov 25 10:26:58 2006
New Revision: 479159

URL: http://svn.apache.org/viewvc?view=rev&rev=479159
Log:
Fix bug 40585. Fix parametrised constructor so parameters have an effect

Modified:
tomcat/connectors/trunk/juli/src/java/org/apache/juli/FileHandler.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml

Modified: tomcat/connectors/trunk/juli/src/java/org/apache/juli/FileHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/juli/src/java/org/apache/juli/FileHandler.java?view=diff&rev=479159&r1=479158&r2=479159
==
--- tomcat/connectors/trunk/juli/src/java/org/apache/juli/FileHandler.java 
(original)
+++ tomcat/connectors/trunk/juli/src/java/org/apache/juli/FileHandler.java Sat 
Nov 25 10:26:58 2006
@@ -47,16 +47,16 @@
 
 
 public FileHandler() {
-configure();
-open();
+this(null, null, null);
 }
 
 
 public FileHandler(String directory, String prefix, String suffix) {
-this();
 this.directory = directory;
 this.prefix = prefix;
 this.suffix = suffix;
+configure();
+open();
 }
 
 
@@ -189,15 +189,17 @@
 String tsString = ts.toString().substring(0, 19);
 date = tsString.substring(0, 10);
 
-LogManager manager = LogManager.getLogManager();
 String className = FileHandler.class.getName();
 
 ClassLoader cl = Thread.currentThread().getContextClassLoader();
 
 // Retrieve configuration of logging file name
-directory = getProperty(className + ".directory", "logs");
-prefix = getProperty(className + ".prefix", "juli.");
-suffix = getProperty(className + ".suffix", ".log");
+if (directory == null)
+directory = getProperty(className + ".directory", "logs");
+if (prefix == null)
+prefix = getProperty(className + ".prefix", "juli.");
+if (suffix == null)
+suffix = getProperty(className + ".suffix", ".log");
 
 // Get logging level for the handler
 setLevel(Level.parse(getProperty(className + ".level", "" + 
Level.ALL)));

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=diff&rev=479159&r1=479158&r2=479159
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sat Nov 25 10:26:58 2006
@@ -86,6 +86,10 @@
 Ben Clifford. (markt)
   
   
+40585: Fix parameterised constructor for 
o.a.juli.FileHandler
+so parameters have an effect. (markt)
+  
+  
 40625: Stop CGIServlet swallowing the root cause of an
 exception. Patch provided by Takayoshi Kimura. (markt)
   



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 40585] - org.apache.juli.FileHandler does not allow programmatic creation using parametrized constructor

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=40585


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2006-11-25 10:27 ---
This has been fixed in SVN and will be included in 5.5.21 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]

svn commit: r479161 - in /tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/mbeans: MBeanFactory.java MBeanUtils.java StandardEngineMBean.java StandardServerMBean.java StandardServiceMBe

[markt]

Author: markt
Date: Sat Nov 25 10:37:02 2006
New Revision: 479161

URL: http://svn.apache.org/viewvc?view=rev&rev=479161
Log:
Code clean up in o.a.c.mbeans
 - Removed unused code and imports
 - Corrected use of deprecated code

Modified:

tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java

tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java

tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/mbeans/StandardEngineMBean.java

tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/mbeans/StandardServerMBean.java

tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/mbeans/StandardServiceMBean.java

Modified: 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java?view=diff&rev=479161&r1=479160&r2=479161
==
--- 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
 (original)
+++ 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
 Sat Nov 25 10:37:02 2006
@@ -55,7 +55,6 @@
 import org.apache.catalina.valves.RequestDumperValve;
 import org.apache.catalina.valves.ValveBase;
 import org.apache.commons.modeler.BaseModelMBean;
-import org.apache.commons.modeler.Registry;
 
 
 /**
@@ -76,12 +75,6 @@
  */
 private static MBeanServer mserver = MBeanUtils.createServer();
 
-/**
- * The configuration information registry for our managed beans.
- */
-private static Registry registry = MBeanUtils.createRegistry();
-
-
 // --- Constructors
 
 
@@ -448,7 +441,6 @@
 
  // Create a new JAASRealm instance
 JAASRealm realm = new JAASRealm();
-realm.setAppName(appName);
 realm.setUserClassNames(userClassNames);
 realm.setRoleClassNames(roleClassNames);
 if("true".equals(useContextClassLoader) ||
@@ -918,7 +910,6 @@
 
 // Acquire a reference to the component to be removed
 ObjectName oname = new ObjectName(name);
-Server server = ServerFactory.getServer();
 Service service = getService(oname);
 String port = oname.getKeyProperty("port");
 //String address = oname.getKeyProperty("address");
@@ -1108,7 +1099,6 @@
 // Acquire a reference to the component to be removed
 ObjectName oname = new ObjectName(name);
 ContainerBase container = getParentContainerFromChild(oname);
-String sequence = oname.getKeyProperty("seq");
 Valve[] valves = (Valve[])container.getValves();
 for (int i = 0; i < valves.length; i++) {
 ObjectName voname = ((ValveBase) valves[i]).getObjectName();

Modified: 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java?view=diff&rev=479161&r1=479160&r2=479161
==
--- 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
 (original)
+++ 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
 Sat Nov 25 10:37:02 2006
@@ -740,10 +740,6 @@
 IntrospectionUtils.getProperty(connector, "address");
 Integer port = (Integer)
 IntrospectionUtils.getProperty(connector, "port");
-Service service = connector.getService();
-String serviceName = null;
-if (service != null)
-serviceName = service.getName();
 StringBuffer sb = new StringBuffer(domain);
 sb.append(":type=Connector");
 sb.append(",port=" + port);
@@ -779,7 +775,6 @@
 
 ObjectName name = null;
 Host host = (Host)context.getParent();
-Service service = ((Engine)host.getParent()).getService();
 String path = context.getPath();
 if (path.length() < 1)
 path = "/";
@@ -817,8 +812,6 @@
 if (path.length() < 1)
 path = "/";
 Host host = (Host) ((Context)container).getParent();
-Engine engine = (Engine) host.getParent();
-Service service = engine.getService();
 name = new ObjectName(domain + ":type=Environment" + 
 ",resourcetype=Context,path=" + path + 
 ",host=" + host.getName() +
@@ -855,8 +848,6 @@
 if (path.length() < 1)
 path = "/";
 Host host = (Host) ((Context)container).getParent();
-Engine engine = (Engine) host.getParent()

svn commit: r479199 - in /tomcat/container/tc5.5.x/webapps/docs: changelog.xml config/context.xml

[markt]

Author: markt
Date: Sat Nov 25 13:20:49 2006
New Revision: 479199

URL: http://svn.apache.org/viewvc?view=rev&rev=479199
Log:
Fix bug 40581. Add text on use of symbloic links for docBase

Modified:
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/container/tc5.5.x/webapps/docs/config/context.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=diff&rev=479199&r1=479198&r2=479199
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sat Nov 25 13:20:49 2006
@@ -185,6 +185,10 @@
 language in JSPs. Patch provided by Taras Tielkes. (markt)
   
   
+40581: Add information on the use of a symbloic link as the
+docBase for a Context to the Context documentation. (markt)
+  
+  
 40633: Remove references to the DefaultContext from the
 documentation. (markt)
   

Modified: tomcat/container/tc5.5.x/webapps/docs/config/context.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/config/context.xml?view=diff&rev=479199&r1=479198&r2=479199
==
--- tomcat/container/tc5.5.x/webapps/docs/config/context.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/config/context.xml Sat Nov 25 
13:20:49 2006
@@ -146,6 +146,10 @@
 an absolute pathname for this directory or WAR file, or a pathname
 that is relative to the appBase directory of the
 owning Host.
+If a symbolic link is used for docBase then changes to the
+symbolic link will only be effective after a Tomcat restart or
+by undeploying and redeploying the conext. A context reload is not
+sufficient.
   
 
   



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 40581] - Symbolic links not (re)followed when application is reloaded

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=40581


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2006-11-25 13:23 ---
This behaviour is by design. You need to undeploy and redeploy your application
for the changes to take effect. I have updated the docs in SVN to make this
clear. The updated documentation will in included in 5.5.21 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 38768] - URL encoded unicode characters in GET request parameters cause the parameter not to present in the request object

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=38768


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||INVALID




--- Additional Comments From [EMAIL PROTECTED]  2006-11-25 13:50 ---
I am closing this as invalid since the original issue is not a valid one.

It should be noted that invalid parameters are no longer silently ignored. As a
result of fixing bug 40860, errors during parameter processing are now logged.

-- 
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: StandardManager behaviour when webapp stopped

[Remy Maucherat]

Mark Thomas wrote:

Bug 40593 [1] has raised the following question:

When a web app with valid sessions is stopped and the StandardManager
is configured not to serialize the sessions what, if anything, should
the container do in this case?

As far as I can tell from the spec, the container behaviour in these
circumstances is undefined. Is there a good reason not to invalidate
the active sessions in this case?

Thoughts?


I think it would be ok.

Rémy

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

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

[rjung]

Author: rjung
Date: Sat Nov 25 15:44:40 2006
New Revision: 479235

URL: http://svn.apache.org/viewvc?view=rev&rev=479235
Log:
- partially undo r476817: if there exist connections,
  but all of them are broken, reconnect only during the
  next retry. If retries=1 in configuration, this allows
  immediate failover in the lb.
- remove a tab

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=diff&rev=479235&r1=479234&r2=479235
==
--- tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c Sat Nov 25 
15:44:40 2006
@@ -1230,11 +1230,13 @@
 jk_log(l, JK_LOG_INFO,
"(%s) increase the backend idle connection timeout or the 
connection_pool_minsize",
ae->worker->name);
+JK_TRACE_EXIT(l);
+return JK_FALSE;
 }
 /* Connect to the backend.
  * This can be either uninitalized connection or a reconnect.
  */
-if (ajp_connect_to_endpoint(ae, l) == JK_TRUE) {
+if (ajp_connect_to_endpoint(ae, l) == JK_TRUE) {
 /*
  * 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]

Re: StandardManager behaviour when webapp stopped

[Filip Hanik - Dev Lists]

it will cause problems for clustered stuff, not sure that container 
shutdown means session invalidation.
for example, if you invalidate the session, such a change would trickle 
through the cluster, and that might not be intentional.
I suggest we leave the behavior as is, or at least configurable if we 
mean to change it


Filip

Remy Maucherat wrote:

Mark Thomas wrote:

Bug 40593 [1] has raised the following question:

When a web app with valid sessions is stopped and the StandardManager
is configured not to serialize the sessions what, if anything, should
the container do in this case?

As far as I can tell from the spec, the container behaviour in these
circumstances is undefined. Is there a good reason not to invalidate
the active sessions in this case?

Thoughts?


I think it would be ok.

Rémy

-
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: StandardManager behaviour when webapp stopped

[Remy Maucherat]

Filip Hanik - Dev Lists wrote:
it will cause problems for clustered stuff, not sure that container 
shutdown means session invalidation.
for example, if you invalidate the session, such a change would trickle 
through the cluster, and that might not be intentional.
I suggest we leave the behavior as is, or at least configurable if we 
mean to change it


The clustered manager most likely would have the opportunity to override 
the code which would do the expiration, I think.


Rémy

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: StandardManager behaviour when webapp stopped

[Filip Hanik - Dev Lists]

You can still cluster just using AOP without ever involving the manager, 
hence such solutions would be affected by this new behavior.
at most, when a webapp is shutdown, you can call passivate, but not 
invalidate the sessions.

Filip

Remy Maucherat wrote:

Filip Hanik - Dev Lists wrote:
it will cause problems for clustered stuff, not sure that container 
shutdown means session invalidation.
for example, if you invalidate the session, such a change would 
trickle through the cluster, and that might not be intentional.
I suggest we leave the behavior as is, or at least configurable if we 
mean to change it


The clustered manager most likely would have the opportunity to 
override the code which would do the expiration, I think.


Rémy

-
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]