cvs commit: jakarta-tomcat-connectors/jk/native/common jk_connect.c

2005-02-25 Thread mturk
mturk   2005/02/25 00:26:03

  Modified:jk/native configure.in
   jk/native/common jk_connect.c
  Log:
  Add SO_RCVTIMEO for unixes.
  
  Revision  ChangesPath
  1.39  +40 -3 jakarta-tomcat-connectors/jk/native/configure.in
  
  Index: configure.in
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/configure.in,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- configure.in  13 Feb 2005 13:05:15 -  1.38
  +++ configure.in  25 Feb 2005 08:26:03 -  1.39
  @@ -52,11 +52,48 @@
   
   dnl check for snprintf and vsnprintf.
   AC_CHECK_FUNC(snprintf, AC_DEFINE(HAVE_SNPRINTF,1,[Have snprintf()]))
  -
   AC_CHECK_FUNC(vsnprintf, AC_DEFINE(HAVE_VSNPRINTF,1,[Have vsnprintf()]))
  -
  +dnl check for flock function.
   AC_CHECK_FUNC(flock, AC_DEFINE(HAVE_FLOCK,1,[Have flock()]))
   
  +AC_DEFUN(JK_CHECK_SETSOCKOPT, [
  +AC_MSG_CHECKING(whether to use $1 with setsockopt())
  +AC_TRY_RUN([
  +#include sys/types.h
  +#include sys/socket.h
  +#include sys/time.h
  +
  +int main(void)
  +{
  +int s;
  +struct timeval tv;
  +tv.tv_sec  = 3;
  +tv.tv_usec = 0;
  +
  +#ifndef $1
  +exit(3);
  +#else
  +if ((s = socket(AF_INET, SOCK_STREAM, 0)) == -1)
  +exit(2);
  +
  +/* fails on Solaris 2.6,8,9,10 and some Linuxes because
  +   SO_RCVTIMEO|SO_SNDTIMEO are defined but not implemented */
  +if (setsockopt(s, SOL_SOCKET, $1, (const void *)tv, sizeof(tv)) == -1)
  +exit(1);
  +
  +exit(0);
  +#endif
  +}
  +]
  +, [ AC_MSG_RESULT([yes]) AC_DEFINE(USE_$1, 1, [Define to use $1 with 
setsockopt()]) ]
  +, [ AC_MSG_RESULT([no]) ]
  +)
  +])dnl
  +
  +dnl check for SO_RCVTIMEO and SO_SNDTIMEO
  +JK_CHECK_SETSOCKOPT(SO_RCVTIMEO)
  +JK_CHECK_SETSOCKOPT(SO_SNDTIMEO)
  +
   APACHE_CONFIG_VARS=`pwd`/scripts/build/config_vars.mk
   WEBSERVER=
   apache_dir=
  
  
  
  1.46  +19 -9 jakarta-tomcat-connectors/jk/native/common/jk_connect.c
  
  Index: jk_connect.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_connect.c,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- jk_connect.c  21 Feb 2005 11:18:48 -  1.45
  +++ jk_connect.c  25 Feb 2005 08:26:03 -  1.46
  @@ -198,14 +198,20 @@
   }
   
   if (timeout  0) {
  -#ifdef WIN32
  +#if defined(WIN32)
   timeout = timeout * 1000;
   setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO,
  -   (char *) timeout, sizeof(int));
  +   (const char *) timeout, sizeof(int));
   setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO,
  -   (char *) timeout, sizeof(int));
  -#else
  -/* TODO: How to set the timeout for other platforms? */
  +   (const char *) timeout, sizeof(int));
  +#elif defined(SO_RCVTIMEO)  defined(USE_SO_RCVTIMEO)  
defined(SO_SNDTIMEO)  defined(USE_SO_SNDTIMEO) 
  +struct timeval tv;
  +tv.tv_sec  = timeout;
  +tv.tv_usec = 0;
  +setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO,
  +   (const void *) tv, sizeof(tv));
  +setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO,
  +   (const void *) tv, sizeof(tv));
   #endif
   if (JK_IS_DEBUG_LEVEL(l))
   jk_log(l, JK_LOG_DEBUG,
  @@ -446,7 +452,8 @@
   {
   fd_set fd;
   struct timeval tv;
  - 
  +int rc;
  +
   FD_ZERO(fd);
   FD_SET(sd, fd);
   
  @@ -455,11 +462,14 @@
   tv.tv_usec = 1;
   
   /* If we get a timeout, then we are still connected */
  -if (select(1, fd, NULL, NULL, tv) == 0)
  +if ((rc = select(1, fd, NULL, NULL, tv)) == 0)
   return 1;
   else {
   #if defined(WIN32) || (defined(NETWARE)  defined(__NOVELL_LIBC__))
  -errno = WSAGetLastError() - WSABASEERR;
  +if (rc == SOCKET_ERROR)
  +errno = WSAGetLastError() - WSABASEERR;
  +else
  +errno = 0;
   #endif
   return 0;
   }
  
  
  

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



cvs commit: jakarta-tomcat-connectors/jk/native/iis/installer/conf uriworkermap.properties

2005-02-25 Thread mturk
mturk   2005/02/25 01:28:59

  Modified:jk/native/iis/installer isapi-redirector-win32-msi.ism
   jk/native/iis/installer/conf uriworkermap.properties
  Log:
  Update installer data to 1.2.9
  
  Revision  ChangesPath
  1.4   +7 -6  
jakarta-tomcat-connectors/jk/native/iis/installer/isapi-redirector-win32-msi.ism
  
  Index: isapi-redirector-win32-msi.ism
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native/iis/installer/isapi-redirector-win32-msi.ism,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- isapi-redirector-win32-msi.ism15 Dec 2004 13:30:46 -  1.3
  +++ isapi-redirector-win32-msi.ism25 Feb 2005 09:28:59 -  1.4
  @@ -345,6 +345,7 @@

rowtdAllOtherFiles1/tdtd{918FECBF-6B1D-4648-A0C9-BAE694AB1DF3}/tdtdCONF/tdtd8/tdtd/td/td17/tdtd/td/td/td/LogFile=/tdtd/LogFile=/tdtd/LogFile=/tdtd/LogFile=/td/row


rowtdAllOtherFiles10/tdtd{E461BDCC-5045-469B-96DF-CDB381D7413E}/tdtdBIN/tdtd8/tdtd/td/td17/tdtd/td/td/td/LogFile=/tdtd/LogFile=/tdtd/LogFile=/tdtd/LogFile=/td/row


rowtdAllOtherFiles11/tdtd{BE301E37-3373-4655-B6E0-B39ACCEC85DB}/tdtdBIN/tdtd8/tdtd/td/td17/tdtd/td/td/td/LogFile=/tdtd/LogFile=/tdtd/LogFile=/tdtd/LogFile=/td/row

  + 
rowtdAllOtherFiles12/tdtd{CEBD938A-39BA-4ACD-94F4-E87FF5D65383}/tdtdLOG/tdtd8/tdtd/td/td17/tdtd/td/td/td/LogFile=/tdtd/LogFile=/tdtd/LogFile=/tdtd/LogFile=/td/row


rowtdAllOtherFiles2/tdtd{BC4C5E05-7E81-40D6-A477-29D1658190F8}/tdtdLOG/tdtd8/tdtd/td/td17/tdtd/td/td/td/LogFile=/tdtd/LogFile=/tdtd/LogFile=/tdtd/LogFile=/td/row


rowtdAllOtherFiles3/tdtd{66FFA73A-17D7-46D7-911F-3E515C813FFC}/tdtdINSTALLDIR/tdtd8/tdtd/td/td17/tdtd/td/td/td/LogFile=/tdtd/LogFile=/tdtd/LogFile=/tdtd/LogFile=/td/row


rowtdAllOtherFiles4/tdtd{F7546761-05DF-4ED7-9F6D-854F42CE2333}/tdtdINSTALLDIR/tdtd8/tdtd/td/td145/tdtd/td/td/td/LogFile=/tdtd/LogFile=/tdtd/LogFile=/tdtd/LogFile=/td/row

  @@ -1023,6 +1024,7 @@
rowtdINSTALLDIR/tdtdISRegistryComponent/td/row

rowtdINSTALLDIR/tdtdISRegistryComponent1/td/row

rowtdINSTALLDIR/tdtdVirtualDirComponent/td/row

  + rowtdLOG/tdtdAllOtherFiles12/td/row

/table

   

table name=CustomAction

  @@ -1038,7 +1040,7 @@

rowtdISSelfRegisterFiles/tdtd1025/tdtdISSELFREG.DLL/tdtdISSelfRegisterFiles/tdtd//row


rowtdISSelfRegisterFinalize/tdtd1/tdtdISSELFREG.DLL/tdtdISSelfRegisterFinalize/tdtd//row


rowtdISUnSelfRegisterFiles/tdtd1025/tdtdISSELFREG.DLL/tdtdISUnSelfRegisterFiles/tdtd//row

  - 
rowtdInstallFilter/tdtd70/tdtdNewBinary19/tdtd/td//row

  + 
rowtdInstallFilter/tdtd326/tdtdNewBinary19/tdtd/td//row


rowtdSetARPINSTALLLOCATION/tdtd51/tdtdARPINSTALLLOCATION/tdtd[INSTALLDIR]/tdtd//row


rowtdSetAllUsersProfileNT/tdtd51/tdtdALLUSERSPROFILE/tdtd[%SystemRoot]\Profiles\All
 Users/tdtd//row


rowtdcaCreateVRoots/tdtd1025/tdtdbinIISHelper/tdtdCreateIISVRoots/tdtd//row

  @@ -1610,6 +1612,7 @@

rowtdAllOtherFiles1/tdtd/td/td_7B0061CE_6436_4507_9459_93572D569FC1_FILTER/tdtd/td/td/td//row


rowtdAllOtherFiles10/tdtd/td/td_E157B509_E34A_4875_AB50_BA85BE3F5DD2_FILTER/tdtd/td/td/td//row


rowtdAllOtherFiles11/tdtd/td/td_3B6FD6F4_F250_47A8_834C_D7EFD14C3BEF_FILTER/tdtd/td/td/td//row

  + 
rowtdAllOtherFiles12/tdtd/td/td_D98A783F_15B1_4E2D_B444_2AFE9178F6F0_FILTER/tdtd/td/td/td//row


rowtdAllOtherFiles2/tdtd/td/td_7322BDD9_A833_41E8_B75C_D99037B19E78_FILTER/tdtd/td/td/td//row


rowtdAllOtherFiles3/tdtd/td/td_C7E1E3F1_ABC8_4A0D_929F_A385EDF1E1F7_FILTER/tdtd/td/td/td//row


rowtdAllOtherFiles4/tdtd/td/td_D740564E_80EF_41ED_958F_95C1F4062224_FILTER/tdtd/td/td/td//row

  @@ -2971,8 +2974,8 @@
rowtdcaCreateVRoots/tdtd/td4002/tdtd/td//row


rowtdcaExtractIISSuppFiles/tdtd/td1500/tdtd/td//row

rowtdcaIISCleanup/tdtd/td6602/tdtd/td//row

  - rowtdcaRemoveVRoots/tdtd/td3502/tdtd/td//row

  - rowtdcaRlbackVRoots/tdtd/td3501/tdtd/td//row

  + rowtdcaRemoveVRoots/tdtd/td3503/tdtd/td//row

  + rowtdcaRlbackVRoots/tdtd/td3502/tdtd/td//row

/table

   

table name=InstallShield

  @@ -3255,8 +3258,6 @@
rowtdINSTALLLEVEL/tdtd100/tdtd//row

rowtdISCHECKFORPRODUCTUPDATES/tdtd1/tdtd//row

rowtdISENABLEDWUSFINISHDIALOG/tdtd/td//row

  - 
rowtdISSCRIPT_VERSION_MISSING/tdtd##IDS_ISSCRIPT_VERSION_MISSING##/tdtd//row

  - 
rowtdISSCRIPT_VERSION_OLD/tdtd##IDS_ISSCRIPT_VERSION_OLD##/tdtd//row

rowtdISVROOT_PORT_NO/tdtd0/tdtd//row

   

DO NOT REPLY [Bug 32569] - ServletContextListener will not die

2005-02-25 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=32569.
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=32569





--- Additional Comments From [EMAIL PROTECTED]  2005-02-25 10:37 ---

Sorry for late answer

applicationListeners[] contains all Listeners className as string, right?

At moment we null out all instance arrays, but where do we clear this
array? 

  Instance Arrays:
 applicationLifecycleListenersObjects
 applicationEventListenersObjects

Look at source, we do:
  addApplicationListener() 
- Add element to applicationListeners 
  removeApplicationListener() 
- Remove element from appliCationListeners
  findApplicationListener()
- Return whole array
  destroy()
- reassign empty array


HostConfig start/stops same context instance:
   context.stop: stop all listeners know in ListenersObjects arrays
 null arrays ListenersObjects.
   context.start: instantiate all listeners from applicationListeners array
  store in specific array

Where is applicationListeners array cleared at moment? 
Haven't found anything that does this.


   

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



cvs commit: jakarta-tomcat-connectors/jk/native/iis jk_isapi_plugin.c

2005-02-25 Thread mturk
mturk   2005/02/25 01:40:05

  Modified:jk/native/iis jk_isapi_plugin.c
  Log:
  Add default cache size for IIS.
  
  Revision  ChangesPath
  1.42  +17 -14jakarta-tomcat-connectors/jk/native/iis/jk_isapi_plugin.c
  
  Index: jk_isapi_plugin.c
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native/iis/jk_isapi_plugin.c,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- jk_isapi_plugin.c 21 Feb 2005 09:29:34 -  1.41
  +++ jk_isapi_plugin.c 25 Feb 2005 09:40:05 -  1.42
  @@ -362,20 +362,20 @@
*/
   static char *stristr(const char *s, const char *find)
   {
  - char c, sc;
  - size_t len;
  +char c, sc;
  +size_t len;
   
  - if ((c = tolower((unsigned char)(*find++))) != 0) {
  - len = strlen(find);
  - do {
  - do {
  - if ((sc = tolower((unsigned char)(*s++))) == 0)
  - return (NULL);
  - } while (sc != c);
  - } while (strnicmp(s, find, len) != 0);
  - s--;
  - }
  - return ((char *)s);
  +if ((c = tolower((unsigned char)(*find++))) != 0) {
  +len = strlen(find);
  +do {
  +do {
  +if ((sc = tolower((unsigned char)(*s++))) == 0)
  +return (NULL);
  +} while (sc != c);
  +} while (strnicmp(s, find, len) != 0);
  +s--;
  +}
  +return ((char *)s);
   }
   
   static int uri_is_web_inf(const char *uri)
  @@ -1037,6 +1037,9 @@
 */
jk_shm_open(NULL, JK_SHM_DEF_SIZE, logger);
   
  + /* 10 is minimum supported on WINXP */
  + jk_set_worker_def_cache_size(10);
  + 
   /* Logging the initialization type: registry or properties file in 
virtual dir
*/
   if (JK_IS_DEBUG_LEVEL(logger)) {
  
  
  

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



DO NOT REPLY [Bug 31659] - [PATCH] Page context not fully populated for Exception if using app-wide error page

2005-02-25 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=31659.
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=31659


[EMAIL PROTECTED] changed:

   What|Removed |Added

Summary|Page context not fully  |[PATCH] Page context not
   |populated for Exception if  |fully populated for
   |using app-wide error page   |Exception if using app-wide
   ||error page
Version|Unknown |5.5.7




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



[GUMP@brutus]: Project jakarta-tomcat-jk-native (in module jakarta-tomcat-connectors) failed

2005-02-25 Thread Bill Barker
To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at [EMAIL PROTECTED]

Project jakarta-tomcat-jk-native has an issue affecting its community 
integration.
This issue affects 1 projects,
 and has been outstanding for 37 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- jakarta-tomcat-jk-native :  Connectors to various web servers


Full details are available at:

http://brutus.apache.org/gump/public/jakarta-tomcat-connectors/jakarta-tomcat-jk-native/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -INFO- Failed with reason build failed



The following work was performed:
http://brutus.apache.org/gump/public/jakarta-tomcat-connectors/jakarta-tomcat-jk-native/gump_work/build_jakarta-tomcat-connectors_jakarta-tomcat-jk-native.html
Work Name: build_jakarta-tomcat-connectors_jakarta-tomcat-jk-native (Type: 
Build)
Work ended in a state of : Failed
Elapsed: 
Command Line: make 
[Working Directory: 
/usr/local/gump/public/workspace/jakarta-tomcat-connectors/jk/native]
-
Making all in common
make[1]: Entering directory 
`/home/gump/workspaces2/public/workspace/jakarta-tomcat-connectors/jk/native/common'
/bin/sh 
/usr/local/gump/public/workspace/apache-httpd/dest-25022005/build/libtool 
--silent --mode=compile gcc 
-I/usr/local/gump/public/workspace/apache-httpd/dest-25022005/include -g -O2 -g 
-O2 -pthread -DHAVE_APR 
-I/usr/local/gump/public/workspace/apr/dest-25022005/include/apr-1 -g -O2 
-DLINUX=2 -D_REENTRANT -D_GNU_SOURCE -D_LARGEFILE64_SOURCE 
-I/home/gump/workspaces2/public/workspace/apache-httpd/srclib/pcre -I 
/opt/jdk1.4/include -I /opt/jdk1.4/include/ -c jk_ajp12_worker.c 
/usr/local/gump/public/workspace/apache-httpd/dest-25022005/build/libtool: 
/usr/local/gump/public/workspace/apache-httpd/dest-25022005/build/libtool: No 
such file or directory
make[1]: *** [jk_ajp12_worker.lo] Error 127
make[1]: Leaving directory 
`/home/gump/workspaces2/public/workspace/jakarta-tomcat-connectors/jk/native/common'
make: *** [all-recursive] Error 1
-

To subscribe to this information via syndicated feeds:
- RSS: 
http://brutus.apache.org/gump/public/jakarta-tomcat-connectors/jakarta-tomcat-jk-native/rss.xml
- Atom: 
http://brutus.apache.org/gump/public/jakarta-tomcat-connectors/jakarta-tomcat-jk-native/atom.xml

== Gump Tracking Only ===
Produced by Gump version 2.2.
Gump Run 1925022005, brutus:brutus-public:1925022005
Gump E-mail Identifier (unique within run) #10.

--
Apache Gump
http://gump.apache.org/ [Instance: brutus]

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



DO NOT REPLY [Bug 32646] - Serious: Exception retrieving password for username

2005-02-25 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=32646.
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=32646





--- Additional Comments From [EMAIL PROTECTED]  2005-02-25 10:51 ---
(In reply to comment #3)
 Maybe this helps:
 connectionURL=jdbc:mysql://projekt1:3306/elmar?autoReconnect=true

I had tried it on Tomcat 5.5.8 and it did not work. Thanks!



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



cvs commit: jakarta-tomcat-connectors/jk/native/iis jk_isapi_plugin.c

2005-02-25 Thread mturk
mturk   2005/02/25 02:20:06

  Modified:jk/native/iis jk_isapi_plugin.c
  Log:
  Remove default value from get_server_variable.
  It was not used at first flace.
  
  Revision  ChangesPath
  1.43  +12 -16jakarta-tomcat-connectors/jk/native/iis/jk_isapi_plugin.c
  
  Index: jk_isapi_plugin.c
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native/iis/jk_isapi_plugin.c,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- jk_isapi_plugin.c 25 Feb 2005 09:40:05 -  1.42
  +++ jk_isapi_plugin.c 25 Feb 2005 10:20:06 -  1.43
  @@ -95,8 +95,7 @@
   if (get_server_value(private_data-lpEcb,   \
   (name), \
   huge_buf,   \
  -huge_buf_sz,\
  -)) {  \
  +huge_buf_sz)) { \
   (place) = jk_pool_strdup(private_data-p,  \
huge_buf); \
 } } while(0)
  @@ -107,8 +106,7 @@
   if (get_server_value(private_data-lpEcb,   \
   (name), \
   huge_buf,   \
  -huge_buf_sz,\
  -)) {  \
  +huge_buf_sz)) { \
   (place) = atoi(huge_buf);   \
   if (0 == (place)) { \
   (place) = def;  \
  @@ -182,7 +180,7 @@
   
   static int get_server_value(LPEXTENSION_CONTROL_BLOCK lpEcb,
   char *name,
  -char *buf, DWORD bufsz, char *def_val);
  +char *buf, DWORD bufsz);
   
   static int base64_encode_cert_len(int len);
   
  @@ -1399,7 +1397,7 @@
   
   huge_buf_sz = sizeof(huge_buf);
   if (get_server_value(private_data-lpEcb,
  - ALL_HTTP, huge_buf, huge_buf_sz, )) {
  + ALL_HTTP, huge_buf, huge_buf_sz)) {
   unsigned int cnt = 0;
   char *tmp;
   
  @@ -1512,18 +1510,16 @@
   }
   
   static int get_server_value(LPEXTENSION_CONTROL_BLOCK lpEcb,
  -char *name, char *buf, DWORD bufsz, char 
*def_val)
  +char *name, char *buf, DWORD bufsz)
   {
  -if (!lpEcb-GetServerVariable(lpEcb-ConnID,
  -  name, buf, (LPDWORD) bufsz)) {
  -strcpy(buf, def_val);
  +DWORD sz = bufsz;
  +buf[0]   = '\0';
  +if (!lpEcb-GetServerVariable(lpEcb-ConnID, name,
  +  buf, (LPDWORD) sz))
   return JK_FALSE;
  -}
  -
  -if (bufsz  0) {
  -buf[bufsz - 1] = '\0';
  -}
   
  +if (sz = bufsz)
  +buf[sz-1] = '\0';
   return JK_TRUE;
   }
   
  
  
  

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



cvs commit: jakarta-tomcat-connectors/jk/native/iis jk_isapi_plugin.c

2005-02-25 Thread mturk
mturk   2005/02/25 02:54:26

  Modified:jk/native/iis jk_isapi_plugin.c
  Log:
  Calculate reason string if not provided to be HTTP rfc compliant.
  
  Revision  ChangesPath
  1.44  +57 -2 jakarta-tomcat-connectors/jk/native/iis/jk_isapi_plugin.c
  
  Index: jk_isapi_plugin.c
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native/iis/jk_isapi_plugin.c,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- jk_isapi_plugin.c 25 Feb 2005 10:20:06 -  1.43
  +++ jk_isapi_plugin.c 25 Feb 2005 10:54:26 -  1.44
  @@ -331,6 +331,61 @@
   return where;
   }
   
  +static char *status_reason(int status)
  +{
  +static struct reasons {
  +int status;
  +char *reason;
  +} *r, reasons[] = {
  +{ 100, Continue }, 
  +{ 101, Switching Protocols }, 
  +{ 200, OK }, 
  +{ 201, Created }, 
  +{ 202, Accepted }, 
  +{ 203, Non-Authoritative Information }, 
  +{ 204, No Content }, 
  +{ 205, Reset Content }, 
  +{ 206, Partial Content }, 
  +{ 300, Multiple Choices }, 
  +{ 301, Moved Permanently }, 
  +{ 302, Moved Temporarily }, 
  +{ 303, See Other }, 
  +{ 304, Not Modified }, 
  +{ 305, Use Proxy }, 
  +{ 400, Bad Request }, 
  +{ 401, Unauthorized }, 
  +{ 402, Payment Required }, 
  +{ 403, Forbidden }, 
  +{ 404, Not Found }, 
  +{ 405, Method Not Allowed }, 
  +{ 406, Not Acceptable }, 
  +{ 407, Proxy Authentication Required }, 
  +{ 408, Request Timeout }, 
  +{ 409, Conflict }, 
  +{ 410, Gone }, 
  +{ 411, Length Required }, 
  +{ 412, Precondition Failed }, 
  +{ 413, Request Entity Too Large }, 
  +{ 414, Request-URI Too Long }, 
  +{ 415, Unsupported Media Type }, 
  +{ 500, Internal Server Error }, 
  +{ 501, Not Implemented }, 
  +{ 502, Bad Gateway }, 
  +{ 503, Service Unavailable }, 
  +{ 504, Gateway Timeout }, 
  +{ 505, HTTP Version Not Supported },
  +{ 000, NULL}
  +};
  +
  +r = reasons;
  +while (r-status = status)
  +if (r-status == status)
  +return r-reason;
  +else
  +r++;
  +return No Reason;
  +} 
  +
   static int escape_url(const char *path, char *dest, int destsize)
   {
   const BYTE *s = (const BYTE *)path;
  @@ -433,7 +488,7 @@
* Create the status line
*/
   if (!reason) {
  -reason = ;
  +reason = status_reason(status);
   }
   status_str = (char *)_alloca((6 + strlen(reason)) * 
sizeof(char));
   sprintf(status_str, %d %s, status, reason);
  
  
  

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



cvs commit: jakarta-tomcat-connectors/jk/native/isapi README.txt

2005-02-25 Thread mturk
mturk   2005/02/25 03:05:22

  Added:   jk/native/isapi README.txt
  Log:
  Add readme for this connector.
  
  Revision  ChangesPath
  1.1  jakarta-tomcat-connectors/jk/native/isapi/README.txt
  
  Index: README.txt
  ===
  This connector is unsported!
  Use native/iis instead for using iside Microsoft IIS.
  
  
  

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



cvs commit: jakarta-tomcat-connectors/jk/native/isapi README.txt

2005-02-25 Thread mturk
mturk   2005/02/25 03:05:54

  Modified:jk/native/isapi README.txt
  Log:
  Fix typo.
  
  Revision  ChangesPath
  1.2   +1 -1  jakarta-tomcat-connectors/jk/native/isapi/README.txt
  
  Index: README.txt
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/isapi/README.txt,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- README.txt25 Feb 2005 11:05:22 -  1.1
  +++ README.txt25 Feb 2005 11:05:54 -  1.2
  @@ -1,2 +1,2 @@
  -This connector is unsported!
  +This connector is unsupported!
   Use native/iis instead for using iside Microsoft IIS.
  
  
  

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



DO NOT REPLY [Bug 33711] - Memory leak (classloader) with Log4J and Single Sign On.

2005-02-25 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=33711.
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=33711





--- Additional Comments From [EMAIL PROTECTED]  2005-02-25 12:11 ---
I tried the obvious quick solution of changing expire(false) to expire(true), 
but unfortunately that had a nasty side-effect.  If the user is logged in to a 
SSO session, and is using several web apps, then if one of those web apps is 
undeployed, their *entire* SSO is destroyed. This means they are immediately 
logged out (of all the apps), and their next interaction with any of the other 
web apps will force them to log in again (which is obviously not what was 
intended).

I'll keep digging and trying to follow the code base.  (Out of interest, does 
all of the code have as few comments as this session/authentication stuff?)

We've downgraded our upcoming product release to a beta (and use a single 
shared log instead of per webapp logging) until we figure a way to get the SSO 
to release the ref to the classloader.

Thanks again, and please do let us know if you have any ideas for how to 
change this SSO behaviour.  
BTW - Is there a tomcat test suite I should be using so that I know if I have 
broken anything while I look at this issue? Being new to the tomcat code, I'm 
quite wary of breaking stuff via strange side-effects.

Cheers,

Kev




-- 
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 31276] - Child elements of context.xml are lost when deployed in a war

2005-02-25 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=31276.
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=31276


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|WORKSFORME  |




--- Additional Comments From [EMAIL PROTECTED]  2005-02-25 12:27 ---
I have rechecked the sitation and it definitely happens as I describe. Let me 
explain again, starting with a clean installation of Tomcat.

I created a war file that contained a context.xml that included a parameter 
(see attachment). This file exists on the server but not in any place that 
Tomcat knows about. Then I go through the following steps (on Tomcat 5.0.28).

1. Use the HTML manager. In WAR or directory URL: I 
put file:/apps/servlet/targets/test/MyApp.war and click Deploy

2. The war file onthe server is untouched by tomcat and a copy is not placed in 
webapps. Tomcat does create myapp.xml in conf/Catalina/localhost but the 
parameters are lost:
?xml version='1.0' encoding='utf-8'?
Context docBase=/apps/servlet/targets/test/MyApp.war path=/myapp
/Context

3. I go to the test JSP page and I get
  Context param: myparam = My test parameter 
It worked because the parameters were used, just not copied through to 
conf/Catalina/localhost/myapp.xml

4. If I stop teh server and restart it, it obviously uses the new myapp.xml, 
fails to find the parameter and the JSP page returns:
  Context param: myparam = null 

I also tried this on Tomat 5.5.7 but got entirely different (and more 
confusing) results

1. Use the HTML manager. In WAR or directory URL: I 
put file:/apps/servlet/targets/test/MyApp.war and click Deploy
This fails with Invalid context path. I get around this by adding /myapp to 
the web form in Context Path. Why do I need to do this? It says this is 
optional and I wanted Tomcat to get the path out of the context file in the war.

2. This time Tomcat creates a copy of MyApp.war in the webapps directory as 
myapp.war and correctly copies the context.xml file to 
conf/Catalina/localhost/myapp.xml


So, 
  Tomcat 5.0.28 appears to have a bug
  Tomcat 5.5.7 does not appear to operate as I expected


-- 
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 31276] - Child elements of context.xml are lost when deployed in a war

2005-02-25 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=31276.
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=31276





--- Additional Comments From [EMAIL PROTECTED]  2005-02-25 12:29 ---
Created an attachment (id=14359)
 -- (http://issues.apache.org/bugzilla/attachment.cgi?id=14359action=view)
The war file I was testing Tomcat with


-- 
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 31276] - Child elements of context.xml are lost when deployed in a war

2005-02-25 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=31276.
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=31276





--- Additional Comments From [EMAIL PROTECTED]  2005-02-25 13:02 ---
Tomcat 5.5.7 will never get the context path from your context file. I recommend
you get used to it, because this will not be changed.

-- 
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: JK Removing local_worker and local_worker_only directives

2005-02-25 Thread Peter Rossbach
Hello Mladen,
after a very long thinking I have missing a hot Standby feature, when we 
remove local_work flag.

Example
two   tomcat instance with local_worker=true and domain=A
one   tomcat instance with local_worker=false and domain=B
New session only generate to domain A  tomcat instance
After complete disable all domain A instance, the new sessions fork to 
tomcat  instances at domain B ( hot standby)
After complete domain A instances failure all requests forward to domain 
B instances.

How I can configure this without local_work flag?
I thing we can rename the flag to preferred_worker.
Peter
Mladen Turk schrieb:
Hi,
I would like to deprecate the local_worker and local_worker_only
directives.
The reason is that we have now shared memory, and thus more powerful
ways to accomplish it's use.
Now, we two new directives 'redirect' and 'domain' that are more
powerful then exiting ones.
Here is how it works:
1. If there is a session the request is routed to the worker.
2. If there is no session and the worker is disabled, meaning not
   accepting new connections then the request is redirected to
   the 'redirect' router if present or 'domain' if not.
3. If there is a session and the worker is in error state and
   the 'sticky_session_force' is not set then the 'redirect'
   and 'domain' are checked.
4. If there is a session and the worker is in error state and
   the 'sticky_session_force' is set the 500 is returned.
Here is the simple state table:
('x' means don't care, '-' means not set)
 
| worker | session | route | domain | force | err | dis | result |
 
| w1 | w1  |   x   |   x| x | 0   |  x  | w1 |
 
| w1 | w1  |   x   |   x| 1 | 1   |  x  | 500|
 
| w1 | w1  |   w2  |   x| 0 | 1   |  x  | w2 |
 
| w1 | w1  |   -   |   grp  | 0 | 1   |  x  | grp|
 
| w1 | -   |   -   |   -| x | 0   |  0  | any|
 
| w1 | -   |   -   |   grp  | x | 0   |  0  | grp|
 
| w1 | -   |   -   |   -| x | 0   |  1  | !w1|
 
So, basically the local_worker_only will become 'sticky_session_force',
that is more descriptive meaning of the actual usage.
Regards,
Mladen.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]


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


Re: JK Removing local_worker and local_worker_only directives

2005-02-25 Thread Mladen Turk
Peter Rossbach wrote:
Hello Mladen,
after a very long thinking I have missing a hot Standby feature, when we 
remove local_work flag.

How I can configure this without local_work flag?
I thing we can rename the flag to preferred_worker.
OK.
Worker B used as hot standby:
worker.A.redirect=B
worker.B.disabled=True
worker.LB.sticky_session=True
worker.LB.balance_workers=A,B
If you wish to have a hot-standby
tomcat cluster group, then use domains.
For single workers use worker names.
So worker B is initially disabled.
Worker A has redirect of 'failover' to B.
Worker B will not receive any requests unless
worker A gets in error state or disabled.
If worker A gets disabled existing sessions will
be still served, new one will go to B.
Later you can use jkstatus, and switch their roles.
Mladen.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]


Re: Configure list to suitably handle return receipts

2005-02-25 Thread Rahul Akolkar
William A. Rowe, Jr. wrote:

 But you are ignoring;

 Precedence: bulk
 
 present on all list mails, which should supercede any 
 DSN request.

This is a red herring. I did some digging, its possible to have little
control over one's mail client/mail server (its true). Can we go back
to the original suggestion I got from the apache infrastructure list?

It would be better to configure those mailing lists to remove headers
which cause return receipts. I think old lists are missing
'Disposition-Notification-To' and 'Return-Receipt-To:' 

No one has any business requesting return receipts on public mailing
lists. In their defence, they probably don't even know they're doing
it. All mail clients aren't ideal.

So zap the headers. Its the only lasting solution. 

Its fine if you say you can do it but you don't want to, I was just
hoping you'd want to improve my quality of life. I'm just trying to
stay subscribed for longer this time ;-)

-Rahul

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



DO NOT REPLY [Bug 33743] New: - WebappClassLoader race condition

2005-02-25 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=33743.
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=33743

   Summary: WebappClassLoader race condition
   Product: Tomcat 5
   Version: 5.0.28
  Platform: PC
OS/Version: Windows XP
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
AssignedTo: tomcat-dev@jakarta.apache.org
ReportedBy: [EMAIL PROTECTED]
CC: [EMAIL PROTECTED]


WebAppClassLoader may fail if concurrent threads try to load a not-yet-loaded 
class.

Scenario:
two threads enter loadClass(name, resolve) (line 1214) concurrently.
none of them finds a loaded class, so both enter findClass (827) and
findClassInternal (1559). 

Now one thread goes ahead, finds the resource and defines the class.
Consequently, it sets entry.binaryContent to null (1633). Thread 2 now
checks binaryContent for null (1572) and throws a ClassNotFoundException.

In the field, this error occurs, if you start Tomcat and load a number of
different jsps concurrently that all use the same tag class.

I also have a standalone testcase where I made WCL#addRepository(String,File)
public.

As it seems, #loadClass(String, boolean) (1211) should be synchronized, as in
the superclasses.


Matthias

-- 
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 33743] - WebappClassLoader race condition

2005-02-25 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=33743.
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=33743





--- Additional Comments From [EMAIL PROTECTED]  2005-02-25 18:06 ---
Created an attachment (id=14362)
 -- (http://issues.apache.org/bugzilla/attachment.cgi?id=14362action=view)
standalone testcase

Test produces output like the following:

class hox.util.Util

intermingled with

java.lang.ClassNotFoundException: hox.util.Util
at
org.apache.catalina.loader.WebappClassLoader.loadClass(WebappClassLoader.java:1332)

at
org.apache.catalina.loader.WebappClassLoader.loadClass(WebappClassLoader.java:1181)

at org.apache.catalina.loader.test.WCT$1.run(WCT.java:35)

-- 
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 33743] - WebappClassLoader race condition

2005-02-25 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=33743.
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=33743





--- Additional Comments From [EMAIL PROTECTED]  2005-02-25 18:11 ---
This will not be fixed for now.

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



cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime PageContextImpl.java

2005-02-25 Thread luehe
luehe   2005/02/25 09:32:31

  Modified:jasper2/src/share/org/apache/jasper/runtime
PageContextImpl.java
  Log:
  Fixed indentation prior to making changes
  
  Revision  ChangesPath
  1.63  +20 -20
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/PageContextImpl.java
  
  Index: PageContextImpl.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/PageContextImpl.java,v
  retrieving revision 1.62
  retrieving revision 1.63
  diff -u -r1.62 -r1.63
  --- PageContextImpl.java  22 Nov 2004 16:35:52 -  1.62
  +++ PageContextImpl.java  25 Feb 2005 17:32:31 -  1.63
  @@ -802,26 +802,26 @@
   ((HttpServletRequest) request).getRequestURI());
   request.setAttribute(javax.servlet.error.servlet_name,
config.getServletName());
  -try {
  -forward(errorPageURL);
  -} catch (IllegalStateException ise) {
  -include(errorPageURL);
  -}
  -
  -// The error page could be inside an include.
  -
  -Object newException = 
request.getAttribute(javax.servlet.error.exception);
  -
  -// t==null means the attribute was not set.
  -if( (newException!= null)  (newException==t) ) {
  -request.removeAttribute(javax.servlet.error.exception);
  -}
  -
  -// now clear the error code - to prevent double handling.
  -request.removeAttribute(javax.servlet.error.status_code);
  -request.removeAttribute(javax.servlet.error.request_uri);
  -request.removeAttribute(javax.servlet.error.status_code);
  -request.removeAttribute(javax.servlet.jsp.jspException);
  +try {
  +forward(errorPageURL);
  +} catch (IllegalStateException ise) {
  +include(errorPageURL);
  +}
  +
  +// The error page could be inside an include.
  +
  +Object newException = 
request.getAttribute(javax.servlet.error.exception);
  +
  +// t==null means the attribute was not set.
  +if( (newException!= null)  (newException==t) ) {
  +request.removeAttribute(javax.servlet.error.exception);
  +}
  +
  +// now clear the error code - to prevent double handling.
  +request.removeAttribute(javax.servlet.error.status_code);
  +request.removeAttribute(javax.servlet.error.request_uri);
  +request.removeAttribute(javax.servlet.error.status_code);
  +request.removeAttribute(javax.servlet.jsp.jspException);
   
   } else {
   // Otherwise throw the exception wrapped inside a 
ServletException.
  
  
  

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



DO NOT REPLY [Bug 31659] - [PATCH] Page context not fully populated for Exception if using app-wide error page

2005-02-25 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=31659.
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=31659





--- Additional Comments From [EMAIL PROTECTED]  2005-02-25 18:44 ---
Created an attachment (id=14363)
 -- (http://issues.apache.org/bugzilla/attachment.cgi?id=14363action=view)
Alternative patch

Alternative patch used to fix the issue.
This patch leverages JspRuntimeLibrary.getThrowable(), which already checks for
javax.servlet.error.exception and javax.servlet.jsp.jspException, in this
order.

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



cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime PageContextImpl.java

2005-02-25 Thread luehe
luehe   2005/02/25 09:45:59

  Modified:jasper2/src/share/org/apache/jasper/runtime
PageContextImpl.java
  Log:
  Fixed 31659 (Page context not fully populated for Exception if using 
app-wide error page)
  
  Revision  ChangesPath
  1.64  +7 -5  
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/PageContextImpl.java
  
  Index: PageContextImpl.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/PageContextImpl.java,v
  retrieving revision 1.63
  retrieving revision 1.64
  diff -u -r1.63 -r1.64
  --- PageContextImpl.java  25 Feb 2005 17:32:31 -  1.63
  +++ PageContextImpl.java  25 Feb 2005 17:45:59 -  1.64
  @@ -559,26 +559,28 @@
   public ServletRequest getRequest() { return request; }
   public ServletResponse getResponse() { return response; }
   
  +
   /**
* Returns the exception associated with this page
* context, if any.
* p/
  - * Added wrapping for Throwables to avoid ClassCaseException:
  + * Added wrapping for Throwables to avoid ClassCastException:
* see Bugzilla 31171 for details.
*
* @return The Exception associated with this page context, if any.
*/
   public Exception getException() {
  -Throwable exc = (Throwable) request.getAttribute(EXCEPTION);
  +Throwable t = JspRuntimeLibrary.getThrowable(request);
   
   // Only wrap if needed
  -if((exc != null)  (! (exc instanceof Exception))) {
  -exc = new JspException(exc);
  +if((t != null)  (! (t instanceof Exception))) {
  +t = new JspException(t);
   }
   
  -return (Exception) exc;
  +return (Exception) t;
   }
   
  +
   public Object getPage() { return servlet; }
   
   
  
  
  

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



DO NOT REPLY [Bug 31659] - [PATCH] Page context not fully populated for Exception if using app-wide error page

2005-02-25 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=31659.
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=31659


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




-- 
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: JK Removing local_worker and local_worker_only directives

2005-02-25 Thread Peter Rossbach
Hello Mladen,
hmm, with your example I got a Internal Server Error after I disable or 
drop active node2 and start a new session request! :-(
All request with active node2 session work properly when node2 shutdown! 
What I want is that after a failure,
the node1 got all requests. This szenario work very well with old 
local_worker mode.

Here my test confguration:
worker.list=lb,status
worker.node1.port=9012
worker.node1.host=localhost
worker.node1.type=ajp13
worker.node1.disabled=true
worker.node2.port=9022
worker.node2.host=localhost
worker.node2.type=ajp13
worker.node2.disabled=false
worker.node2.redirect=node1
worker.lb.balance_workers=node1,node2
worker.lb.type=lb
worker.status.type=status
Peter

Mladen Turk schrieb:
Peter Rossbach wrote:
Hello Mladen,
after a very long thinking I have missing a hot Standby feature, when 
we remove local_work flag.

How I can configure this without local_work flag?
I thing we can rename the flag to preferred_worker.
OK.
Worker B used as hot standby:
worker.A.redirect=B
worker.B.disabled=True
worker.LB.sticky_session=True
worker.LB.balance_workers=A,B
If you wish to have a hot-standby
tomcat cluster group, then use domains.
For single workers use worker names.
So worker B is initially disabled.
Worker A has redirect of 'failover' to B.
Worker B will not receive any requests unless
worker A gets in error state or disabled.
If worker A gets disabled existing sessions will
be still served, new one will go to B.
Later you can use jkstatus, and switch their roles.
Mladen.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]


--

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


Re: JK Removing local_worker and local_worker_only directives

2005-02-25 Thread Mladen Turk
Peter Rossbach wrote:
Hello Mladen,
hmm, with your example I got a Internal Server Error after I disable or 
drop active node2 and start a new session request! :-(
All request with active node2 session work properly when node2 shutdown! 
What I want is that after a failure,
the node1 got all requests.
Sorry, but this works well and as expected.
1. Node2:in_error - redirect to node1
2. Node2:disabled - exiting sessions to node2
   if Node1 disabled too - 500
3. Enable Node1 - new sessions to Node1
So you will need to enable node1 then disable node2
if you are doing maintenance.
Other thing is if Node2 breaks, then Node1 will
take old and new requests.
Mladen.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]


DO NOT REPLY [Bug 33745] New: - Poor performance and timeouts

2005-02-25 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=33745.
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=33745

   Summary: Poor performance and timeouts
   Product: Tomcat 5
   Version: 5.0.28
  Platform: PC
OS/Version: Windows Server 2003
Status: NEW
  Severity: critical
  Priority: P1
 Component: Catalina
AssignedTo: tomcat-dev@jakarta.apache.org
ReportedBy: [EMAIL PROTECTED]


Our users (teachers) are experiencing long delays between saves to sqlserver 
database. Up to a minute or more. Some users are timing out and have to log in 
again.

The vender of this product provided a fixed for 4.1.24 but it does not work 
with 5.0.28. Their solution was to add in this 
text sendStringParametersAsUnicode=false in the server.xml file in the conf 
folder of tomcat.

valuejdbc:microsoft:sqlserver://IT_SERVER7:1433;DatabaseName=TRPROD;SelectMet
hod=cursor;sendStringParametersAsUnicode=false/value 

In 5.0.28, the text is in the application xml file.

One solution to go to 4.1.24 of Tomcat.

Any help would be appreciated.

-- 
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 33745] - Poor performance and timeouts

2005-02-25 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=33745.
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=33745


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID




--- Additional Comments From [EMAIL PROTECTED]  2005-02-25 21:34 ---
Please post to tomcat-user about this problem. Bugzilla is for reporting bugs,
not getting support.

-- 
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 33745] - Poor performance and timeouts

2005-02-25 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=33745.
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=33745


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|RESOLVED|CLOSED




-- 
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 32898] - Cluster restart fails

2005-02-25 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=32898.
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=32898





--- Additional Comments From [EMAIL PROTECTED]  2005-02-25 22:40 ---
Created an attachment (id=14364)
 -- (http://issues.apache.org/bugzilla/attachment.cgi?id=14364action=view)
5.0.28 cluster jar with fix

Library with updated file for 5.0.28 attached

-- 
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 32898] - Cluster restart fails

2005-02-25 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=32898.
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=32898





--- Additional Comments From [EMAIL PROTECTED]  2005-02-25 22:41 ---
Created an attachment (id=14365)
 -- (http://issues.apache.org/bugzilla/attachment.cgi?id=14365action=view)
Source code fix

Modified source code attached

-- 
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: JK Removing local_worker and local_worker_only directives

2005-02-25 Thread Peter Rossbach
Well,
but at my test following is not the case:
Other thing is if Node2 breaks, then Node1 will
take old and new requests.
It works only for old requests, but new request get an Internal Server 
Error!

Test with Apache 2.053, Windows XP, mod_jk CVS Head, Tomcat 5.5.8, JDK 1.5.0
Peter
Mladen Turk schrieb:
Peter Rossbach wrote:
Hello Mladen,
hmm, with your example I got a Internal Server Error after I disable 
or drop active node2 and start a new session request! :-(
All request with active node2 session work properly when node2 
shutdown! What I want is that after a failure,
the node1 got all requests.

Sorry, but this works well and as expected.
1. Node2:in_error - redirect to node1
2. Node2:disabled - exiting sessions to node2
   if Node1 disabled too - 500
3. Enable Node1 - new sessions to Node1
So you will need to enable node1 then disable node2
if you are doing maintenance.
Other thing is if Node2 breaks, then Node1 will
take old and new requests.
Mladen.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]


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


DO NOT REPLY [Bug 33711] - Memory leak (classloader) with Log4J and Single Sign On.

2005-02-25 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=33711.
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=33711





--- Additional Comments From [EMAIL PROTECTED]  2005-02-26 00:28 ---
I had a bit more of a look at this. Again, please be aware that I am new to 
this code base. 

The only mechanism I can see for an instance of SingleSignOn to be told that a 
WebApp has been undeployed is if it were to be told when the sessions related 
to that app were destroyed (i.e. if StandardManager.doUnload() were to be 
changed to call expire(true) instead of expire(false)).  However, the listener 
SingleSignOn.sessionEvent(SessionEvent) assumes that it is only ever called 
for one of two reasons - either the user logged out, or the session expired. 

But what we have is a third case - one of the apps being undeployed.  

Now, it seems that if we can detect the third case then the method to be 
called has already been implemented (if not tested)... The method 
SingleSignOn.deregister(ssoId, session) [note the 2nd param] already exists 
and looks like it is designed for the job, but I can't find anything that 
calls it!

So the question is: How does the listener method detect the third case? I can 
think of hacks involving overloading the expire(notify) method with an extra 
param and using that to put some marker in the data field of the SessionEvent, 
but I can't help but think I'm missing something obvious by not knowing the 
code base.

Ideas?

Kev

-- 
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 33751] New: - AJP12 support broken ; loses query string

2005-02-25 Thread bugzilla
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=33751.
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=33751

   Summary: AJP12 support broken ; loses query string
   Product: Tomcat 3
   Version: 3.3.2 Final
  Platform: PC
OS/Version: Windows XP
Status: NEW
  Severity: major
  Priority: P2
 Component: Connectors
AssignedTo: tomcat-dev@jakarta.apache.org
ReportedBy: [EMAIL PROTECTED]


I must be the only person still using this thing, because it just blew up in my 
face in a big way. Apparently all query strings get dropped by Tomcat 332 when 
using the AJP12 protocol. (It works with Tomcat 331a. It works with AJP13.)

Environment:
Windows XP
Apache 1.3.33
mod_jk 1.2.6
Tomcat 3.3.2
Sun JDK 1.4.2

A Test servlet (included below) fails to print any values (no request 
parameters) when accessed over AJP12. Same servlet works with AJP12 on Tomcat 
331a. Also works with AJP13 on Tomcat 332.

To reproduce, setup Tomcat 332 with only the Ajp12Connector enabled. 
Setup Apache+mod_jk with one ajp12 worker. Access the servlet below with query 
string parameters.



public class Test extends HttpServlet
{
protected void doGet(HttpServletRequest arg0, HttpServletResponse arg1)
throws ServletException, IOException
{
printParams(arg0, arg1);
}

protected void doPost(HttpServletRequest arg0, HttpServletResponse arg1)
throws ServletException, IOException
{
printParams(arg0, arg1);
}

private void printParams(HttpServletRequest request, HttpServletResponse 
response) throws IOException
{
response.setContentType(text/html);
response.getWriter().println(htmlbody);

for (Enumeration e = request.getParameterNames(); e.hasMoreElements(); )
{
String name = (String) e.nextElement();
response.getWriter().println(p + name +  = );
response.getWriter().println(request.getParameter(name));
}

response.getWriter().println(/html);
}
}

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



cvs commit: jakarta-tomcat-connectors/jk/native/common jk_lb_worker.c

2005-02-25 Thread mturk
mturk   2005/02/25 23:16:54

  Modified:jk/native/common jk_lb_worker.c
  Log:
  Add failover for hot standby. This allows new sessions to use failover
  worker or worker group. Limit is that you can not have two different
  failover workers or workers groups.
  
  Revision  ChangesPath
  1.72  +37 -23jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c
  
  Index: jk_lb_worker.c
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c,v
  retrieving revision 1.71
  retrieving revision 1.72
  diff -u -r1.71 -r1.72
  --- jk_lb_worker.c22 Feb 2005 08:59:57 -  1.71
  +++ jk_lb_worker.c26 Feb 2005 07:16:54 -  1.72
  @@ -281,11 +281,8 @@
   }
   }
   
  -if (candidate) {
  +if (candidate)
   candidate-s-lb_value -= total_factor;
  -candidate-r = (candidate-s-name[0]);
  -}
  -
   return candidate;
   }
   
  @@ -320,27 +317,9 @@
   }
   }
   }
  -if (candidate)
  -candidate-r = (candidate-s-name[0]);
   return candidate;
   }
   
  -static worker_record_t *find_best_worker(lb_worker_t * p,
  - jk_logger_t *l)
  -{
  -worker_record_t *rc = NULL;
  -
  -if (p-lbmethod == JK_LB_BYREQUESTS)
  -rc = find_best_byrequests(p, l);
  -else if (p-lbmethod == JK_LB_BYTRAFFIC)
  -rc = find_best_bytraffic(p, l);
  -/* By default use worker name as session route */
  -if (rc)
  -rc-r = (rc-s-name[0]);
  -
  -return rc;
  -}
  -
   static worker_record_t *find_bysession_route(lb_worker_t *p, 
const char *name,
jk_logger_t *l)
  @@ -395,6 +374,41 @@
   return candidate;
   }
   
  +static worker_record_t *find_failover_worker(lb_worker_t * p,
  + jk_logger_t *l)
  +{
  +worker_record_t *rc = NULL;
  +unsigned int i;
  +const char *redirect = NULL;
  +
  +for (i = 0; i  p-num_of_workers; i++) {
  +if (strlen(p-lb_workers[i].s-redirect)) {
  +redirect = (p-lb_workers[i].s-redirect[0]);
  +break;
  +}
  +}
  +if (redirect)
  +rc = find_bysession_route(p, redirect, l);
  +return rc;
  +}
  +
  +static worker_record_t *find_best_worker(lb_worker_t * p,
  + jk_logger_t *l)
  +{
  +worker_record_t *rc = NULL;
  +
  +if (p-lbmethod == JK_LB_BYREQUESTS)
  +rc = find_best_byrequests(p, l);
  +else if (p-lbmethod == JK_LB_BYTRAFFIC)
  +rc = find_best_bytraffic(p, l);
  +/* By default use worker name as session route */
  +if (rc)
  +rc-r = (rc-s-name[0]);
  +else
  +rc = find_failover_worker(p, l);
  +return rc;
  +}
  +
   static worker_record_t *get_most_suitable_worker(lb_worker_t * p,
jk_ws_service_t *s,
int attempt,
  
  
  

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



Re: JK Removing local_worker and local_worker_only directives

2005-02-25 Thread Mladen Turk
Peter Rossbach wrote:
Well,
It works only for old requests, but new request get an Internal Server 
Error!

Yes, seems that my test case was broken.
It should work now. Can you check?
Mladen.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]