Candidate binaries for 6.0.14

2007-07-24 Thread Remy Maucherat 

New binaries are available (in case nobody found them):
http://people.apache.org/~remm/tomcat-6/v6.0.14/

Rémy

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

DO NOT REPLY [Bug 42343] - Posted parameters are not available

2007-07-24 Thread 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=42343





--- Additional Comments From [EMAIL PROTECTED]  2007-07-24 07:00 ---
(In reply to comment #4)
I'm having the same problem, but with a Servlet mapping. No servlet is able to
obtain HTTP Post parameters from the HttpRequest object. Here's web.xml:


mpp
My Servlet

org.whatever.MyServlet

1


In Tomcat 5, posts to localhost/mpp would result in org.whatever.MyServlet
correctly able to get the request parameters. In Tomcat 6 this is no longer the
case. Is there some additional server settings I need to change in order to
re-enable this?

> (In reply to comment #3)
> > Interesting approach... What if the URL I am trying to filter doesn't 
> > correspond
> > to a file, directory, or even a servlet mapping?
> 
> it shouldn't be a problem in that case, it's only a problem because a 
> reference
> to a directory / path with out a file also maps to the index pages, such as
> index.html index.jsp, (or what ever you have configured in your web.xml) and
> causes a redirect on the server side (but no a normal servlet redirect).



-- 
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 42343] - Posted parameters are not available

2007-07-24 Thread 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=42343





--- Additional Comments From [EMAIL PROTECTED]  2007-07-24 07:43 ---
(In reply to comment #5)
> I'm having the same problem, but with a Servlet mapping. No servlet is able to
> obtain HTTP Post parameters from the HttpRequest object. Here's web.xml:

I don't have problems with servlets; however, I don't think I tried POST, I only
tried GET. I didn't think this problem affected servlets.

-- 
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 42950] - ConcurrentModificationException on Shutdown

2007-07-24 Thread 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=42950





--- Additional Comments From [EMAIL PROTECTED]  2007-07-24 10:36 ---
Does this happen on every shutdown?  does the user running tomcat have full
permission to the context /rbodkin?  

-- 
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: Candidate binaries for 6.0.14

2007-07-24 Thread Filip Hanik - Dev Lists 

Remy Maucherat wrote:

New binaries are available (in case nobody found them):
http://people.apache.org/~remm/tomcat-6/v6.0.14/

these look good to me

Filip


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]

svn commit: r559163 - in /tomcat/connectors/trunk/jk/native: apache-1.3/Makefile.netware apache-1.3/NWGNUmakefile.mak netscape/Makefile.netware

2007-07-24 Thread fuankg 
Author: fuankg
Date: Tue Jul 24 11:55:46 2007
New Revision: 559163

URL: http://svn.apache.org/viewvc?view=rev&rev=559163
Log:
updated makefiles for recent changes.

Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/Makefile.netware
tomcat/connectors/trunk/jk/native/apache-1.3/NWGNUmakefile.mak
tomcat/connectors/trunk/jk/native/netscape/Makefile.netware

Modified: tomcat/connectors/trunk/jk/native/apache-1.3/Makefile.netware
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/Makefile.netware?view=diff&rev=559163&r1=559162&r2=559163
==
--- tomcat/connectors/trunk/jk/native/apache-1.3/Makefile.netware (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/Makefile.netware Tue Jul 24 
11:55:46 2007
@@ -113,12 +113,13 @@
 INCLUDES += -I$(JKCOMMON) -I$(NW_JDK)/include -I$(NW_JDK)/include/netware 
 
 ifeq ($(LIBARCH),LIBC)
-   INCLUDES += -I$(SDK_LIBC)/include -I$(SDK_LIBC)/include/nks
+   INCLUDES += -I$(SDK_LIBC)/include
INCLUDES += -I$(SDK_LIBC)/include/winsock
 else
-   INCLUDES += -I$(SDK_CLIB)/include/nlm -I$(SDK_CLIB)/include
-   INCLUDES += -I$(NDKBASE)/ws295sdk/include
+   INCLUDES += -I$(SDK_CLIB)/include/nlm
+   # INCLUDES += -I$(NDKBASE)/ws295sdk/include
CFLAGS += -DNETDB_USE_INTERNET
+   CFLAGS += -DJK_PREFORK
 endif
 CFLAGS += $(INCLUDES)
 

Modified: tomcat/connectors/trunk/jk/native/apache-1.3/NWGNUmakefile.mak
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/NWGNUmakefile.mak?view=diff&rev=559163&r1=559162&r2=559163
==
--- tomcat/connectors/trunk/jk/native/apache-1.3/NWGNUmakefile.mak (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/NWGNUmakefile.mak Tue Jul 24 
11:55:46 2007
@@ -41,6 +41,7 @@
 # These flags will come after CFLAGS
 #
 XCFLAGS+= \
+   -DJK_PREFORK \
$(EOLIST)
 
 #

Modified: tomcat/connectors/trunk/jk/native/netscape/Makefile.netware
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/netscape/Makefile.netware?view=diff&rev=559163&r1=559162&r2=559163
==
--- tomcat/connectors/trunk/jk/native/netscape/Makefile.netware (original)
+++ tomcat/connectors/trunk/jk/native/netscape/Makefile.netware Tue Jul 24 
11:55:46 2007
@@ -21,17 +21,24 @@
 endif
 
 # Edit the vars below to change NLM target settings.
-TARGET  = nsapi_rd
+TARGET  = jni_conn
 VERSION= $(JK_VERSION)
 #COPYR = Copyright (c) 2000-2007 The Apache Software Foundation. All rights 
reserved.
 COPYR  = Licensed under the Apache License, Version 2.0
-DESCR  = Netscape plugin for Tomcat $(JK_VERSION_STR)
+DESCR  = JNI natives for Tomcat $(JK_VERSION_STR)
 MTSAFE = NO
-STACK  = 65536
+STACK  = 64000
 #SCREEN= System Console
-MODULES= nshttpd
-EXPORTS= jk_init jk_service
-IMPORTS= __nsapi30_table
+MODULES= nsapi
+EXPORTS= \
+   Java_org_apache_tomcat_modules_server_JNIConnectionHandler_write \
+   
Java_org_apache_tomcat_modules_server_JNIConnectionHandler_startReasponse \
+   Java_org_apache_tomcat_modules_server_JNIConnectionHandler_readHeaders \
+   
Java_org_apache_tomcat_modules_server_JNIConnectionHandler_readEnvironment \
+   Java_org_apache_tomcat_modules_server_JNIConnectionHandler_read \
+   
Java_org_apache_tomcat_modules_server_JNIConnectionHandler_getNumberOfHeaders
+
+#IMPORTS   = __nsapi30_table
 
 # Edit the var below to point to your lib architecture.
 ifndef LIBARCH
@@ -109,12 +116,13 @@
 INCLUDES += -I$(JKCOMMON) -I$(NW_JDK)/include -I$(NW_JDK)/include/netware 
 
 ifeq ($(LIBARCH),LIBC)
-   INCLUDES += -I$(SDK_LIBC)/include -I$(SDK_LIBC)/include/nks
+   INCLUDES += -I$(SDK_LIBC)/include
INCLUDES += -I$(SDK_LIBC)/include/winsock
 else
-   INCLUDES += -I$(SDK_CLIB)/include/nlm -I$(SDK_CLIB)/include
+   INCLUDES += -I$(SDK_CLIB)/include/nlm
# INCLUDES += -I$(NDKBASE)/ws295sdk/include
CFLAGS += -DNETDB_USE_INTERNET
+   CFLAGS += -DJK_PREFORK
 endif
 CFLAGS += $(INCLUDES)
 
@@ -128,28 +136,11 @@
 endif
 
 OBJS   = \
-   $(OBJDIR)/jk_nsapi_plugin.o \
+   $(OBJDIR)/jk_jnicb.o \
$(OBJDIR)/jk_nwmain.o \
-   $(OBJDIR)/jk_ajp12_worker.o \
-   $(OBJDIR)/jk_ajp13.o \
-   $(OBJDIR)/jk_ajp13_worker.o \
-   $(OBJDIR)/jk_ajp14.o \
-   $(OBJDIR)/jk_ajp14_worker.o \
-   $(OBJDIR)/jk_ajp_common.o \
-   $(OBJDIR)/jk_connect.o \
-   $(OBJDIR)/jk_context.o \
-   $(OBJDIR)/jk_jni_worker.o \
-   $(OBJDIR)/jk_lb_worker.o \
$(OBJDIR)/jk_map.o \
-   $(OBJDIR)/jk_md5.o \
-   $(OBJDIR)/jk_msg_buff.o \
$(OBJDIR)/jk_pool.o \
-   $(OBJDIR)/jk_shm.o \
-   $(OBJDIR)/jk_sockbuf.o \
-   $(OBJDIR)/jk

svn commit: r559164 - in /tomcat/connectors/trunk/jk/native: jni/Makefile.netware netscape/Makefile.netware

2007-07-24 Thread fuankg 
Author: fuankg
Date: Tue Jul 24 12:09:03 2007
New Revision: 559164

URL: http://svn.apache.org/viewvc?view=rev&rev=559164
Log:
copy&paste error, wrong file copied.

Modified:
tomcat/connectors/trunk/jk/native/jni/Makefile.netware
tomcat/connectors/trunk/jk/native/netscape/Makefile.netware

Modified: tomcat/connectors/trunk/jk/native/jni/Makefile.netware
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/jni/Makefile.netware?view=diff&rev=559164&r1=559163&r2=559164
==
--- tomcat/connectors/trunk/jk/native/jni/Makefile.netware (original)
+++ tomcat/connectors/trunk/jk/native/jni/Makefile.netware Tue Jul 24 12:09:03 
2007
@@ -116,12 +116,13 @@
 INCLUDES += -I$(JKCOMMON) -I$(NW_JDK)/include -I$(NW_JDK)/include/netware 
 
 ifeq ($(LIBARCH),LIBC)
-   INCLUDES += -I$(SDK_LIBC)/include -I$(SDK_LIBC)/include/nks
+   INCLUDES += -I$(SDK_LIBC)/include
INCLUDES += -I$(SDK_LIBC)/include/winsock
 else
-   INCLUDES += -I$(SDK_CLIB)/include/nlm -I$(SDK_CLIB)/include
+   INCLUDES += -I$(SDK_CLIB)/include/nlm
# INCLUDES += -I$(NDKBASE)/ws295sdk/include
CFLAGS += -DNETDB_USE_INTERNET
+   CFLAGS += -DJK_PREFORK
 endif
 CFLAGS += $(INCLUDES)
 

Modified: tomcat/connectors/trunk/jk/native/netscape/Makefile.netware
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/netscape/Makefile.netware?view=diff&rev=559164&r1=559163&r2=559164
==
--- tomcat/connectors/trunk/jk/native/netscape/Makefile.netware (original)
+++ tomcat/connectors/trunk/jk/native/netscape/Makefile.netware Tue Jul 24 
12:09:03 2007
@@ -21,24 +21,17 @@
 endif
 
 # Edit the vars below to change NLM target settings.
-TARGET  = jni_conn
+TARGET  = nsapi_rd
 VERSION= $(JK_VERSION)
 #COPYR = Copyright (c) 2000-2007 The Apache Software Foundation. All rights 
reserved.
 COPYR  = Licensed under the Apache License, Version 2.0
-DESCR  = JNI natives for Tomcat $(JK_VERSION_STR)
+DESCR  = Netscape plugin for Tomcat $(JK_VERSION_STR)
 MTSAFE = NO
-STACK  = 64000
+STACK  = 65536
 #SCREEN= System Console
-MODULES= nsapi
-EXPORTS= \
-   Java_org_apache_tomcat_modules_server_JNIConnectionHandler_write \
-   
Java_org_apache_tomcat_modules_server_JNIConnectionHandler_startReasponse \
-   Java_org_apache_tomcat_modules_server_JNIConnectionHandler_readHeaders \
-   
Java_org_apache_tomcat_modules_server_JNIConnectionHandler_readEnvironment \
-   Java_org_apache_tomcat_modules_server_JNIConnectionHandler_read \
-   
Java_org_apache_tomcat_modules_server_JNIConnectionHandler_getNumberOfHeaders
-
-#IMPORTS   = __nsapi30_table
+MODULES= nshttpd
+EXPORTS= jk_init jk_service
+IMPORTS= __nsapi30_table
 
 # Edit the var below to point to your lib architecture.
 ifndef LIBARCH
@@ -136,11 +129,29 @@
 endif
 
 OBJS   = \
-   $(OBJDIR)/jk_jnicb.o \
+   $(OBJDIR)/jk_nsapi_plugin.o \
$(OBJDIR)/jk_nwmain.o \
+   $(OBJDIR)/jk_ajp12_worker.o \
+   $(OBJDIR)/jk_ajp13.o \
+   $(OBJDIR)/jk_ajp13_worker.o \
+   $(OBJDIR)/jk_ajp14.o \
+   $(OBJDIR)/jk_ajp14_worker.o \
+   $(OBJDIR)/jk_ajp_common.o \
+   $(OBJDIR)/jk_connect.o \
+   $(OBJDIR)/jk_context.o \
+   $(OBJDIR)/jk_jni_worker.o \
+   $(OBJDIR)/jk_lb_worker.o \
$(OBJDIR)/jk_map.o \
+   $(OBJDIR)/jk_md5.o \
+   $(OBJDIR)/jk_msg_buff.o \
$(OBJDIR)/jk_pool.o \
+   $(OBJDIR)/jk_shm.o \
+   $(OBJDIR)/jk_sockbuf.o \
+   $(OBJDIR)/jk_status.o \
+   $(OBJDIR)/jk_uri_worker_map.o \
+   $(OBJDIR)/jk_url.o \
$(OBJDIR)/jk_util.o \
+   $(OBJDIR)/jk_worker.o \
$(OBJDIR)/ap_snprintf.o
 
 vpath %.c . $(JKCOMMON)



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

svn commit: r559168 - in /tomcat/connectors/trunk/jk/native: apache-1.3/mod_jk.c apache-2.0/mod_jk.c

2007-07-24 Thread rjung 
Author: rjung
Date: Tue Jul 24 12:30:04 2007
New Revision: 559168

URL: http://svn.apache.org/viewvc?view=rev&rev=559168
Log:
Fix message typo.

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

Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c?view=diff&rev=559168&r1=559167&r2=559168
==
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Tue Jul 24 12:30:04 
2007
@@ -1908,7 +1908,7 @@
 {"JkLogLevel", jk_set_log_level, NULL, RSRC_CONF, TAKE1,
  "The mod_jk module log level, can be debug, info, request, error, or 
emerg"},
 {"JkLogStampFormat", jk_set_log_fmt, NULL, RSRC_CONF, TAKE1,
- "The mod_jk module log format, follow strftime synthax"},
+ "The mod_jk module log format, follow strftime syntax"},
 {"JkRequestLogFormat", jk_set_request_log_format, NULL, RSRC_CONF, TAKE1,
  "The mod_jk module request log format string"},
 

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?view=diff&rev=559168&r1=559167&r2=559168
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Tue Jul 24 12:30:04 
2007
@@ -1949,7 +1949,7 @@
   "The Tomcat module log level, can be debug, "
   "info, error or emerg"),
 AP_INIT_TAKE1("JkLogStampFormat", jk_set_log_fmt, NULL, RSRC_CONF,
-  "The Tomcat module log format, follow strftime synthax"),
+  "The Tomcat module log format, follow strftime syntax"),
 AP_INIT_TAKE1("JkRequestLogFormat", jk_set_request_log_format, NULL,
   RSRC_CONF,
   "The mod_jk module request log format string"),



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

DO NOT REPLY [Bug 30949] - After Failed Include, Request and Response not Unwrapped

2007-07-24 Thread 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=30949


[EMAIL PROTECTED] changed:

   What|Removed |Added

 CC||[EMAIL PROTECTED]




-- 
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 30949] - After Failed Include, Request and Response not Unwrapped

2007-07-24 Thread 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=30949





--- Additional Comments From [EMAIL PROTECTED]  2007-07-24 13:04 ---
I'm running into an issue that I think is a side effect of this patch. When
forward() calls invoke() the request object now gets unwrapped. Then the forward
method again tries to unwrap the already unwrapped request. As a result I am
getting a ClassCastException in unwrapRequest (ApplicationDispatcher.java:814).
It seems like unwrapRequest should be setting wrappedRequest to null before
exiting so subsequent calls to the method don't do anything. Does this seem
reasonable?

-- 
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: r559196 - /tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c

2007-07-24 Thread rjung 
Author: rjung
Date: Tue Jul 24 13:31:42 2007
New Revision: 559196

URL: http://svn.apache.org/viewvc?view=rev&rev=559196
Log:
Fix compiler warning.
We only need to close the socket, if we've got one.

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=559196&r1=559195&r2=559196
==
--- tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c Tue Jul 24 
13:31:42 2007
@@ -740,10 +740,10 @@
 }
 }
 JK_LEAVE_CS(&aw->cs, rc);
+/* Close previous socket */
+if (IS_VALID_SOCKET(sock))
+jk_shutdown_socket(sock);
 }
-/* Close previous socket */
-if (IS_VALID_SOCKET(sock))
-jk_shutdown_socket(sock);
 }
 
 /*



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

svn commit: r559197 - in /tomcat/connectors/trunk/jk/native/common: jk_ajp12_worker.c jk_ajp_common.c jk_jni_worker.c jk_lb_worker.c jk_status.c

2007-07-24 Thread rjung 
Author: rjung
Date: Tue Jul 24 13:39:09 2007
New Revision: 559197

URL: http://svn.apache.org/viewvc?view=rev&rev=559197
Log:
Small changes to the service method of the various workers.
Make them a little more consistent:
- always set is_error
- don't TRACE_EXIT to early
- no longer using is_recoverable_error instead of is_error
  in jni worker

Modified:
tomcat/connectors/trunk/jk/native/common/jk_ajp12_worker.c
tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
tomcat/connectors/trunk/jk/native/common/jk_jni_worker.c
tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c
tomcat/connectors/trunk/jk/native/common/jk_status.c

Modified: tomcat/connectors/trunk/jk/native/common/jk_ajp12_worker.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_ajp12_worker.c?view=diff&rev=559197&r1=559196&r2=559197
==
--- tomcat/connectors/trunk/jk/native/common/jk_ajp12_worker.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_ajp12_worker.c Tue Jul 24 
13:39:09 2007
@@ -88,7 +88,7 @@
  jk_ws_service_t *s,
  jk_logger_t *l, int *is_error)
 {
-ajp12_endpoint_t *p = e->endpoint_private;
+ajp12_endpoint_t *p;
 unsigned int attempt;
 int rc = -1;
 /*
@@ -97,14 +97,19 @@
 
 JK_TRACE_ENTER(l);
 
-if (is_error)
-*is_error = JK_HTTP_SERVER_ERROR;
 if (!e || !e->endpoint_private || !s || !is_error) {
 JK_LOG_NULL_PARAMS(l);
+if (is_error)
+*is_error = JK_HTTP_SERVER_ERROR;
 JK_TRACE_EXIT(l);
 return JK_FALSE;
 }
 
+p = e->endpoint_private;
+
+/* Set returned error to OK */
+*is_error = JK_HTTP_OK;
+
 for (attempt = 0; attempt < p->worker->connect_retry_attempts;
  attempt++) {
 p->sd =
@@ -130,6 +135,7 @@
 }
 jk_log(l, JK_LOG_ERROR, "In jk_endpoint_t::service, Error sd = %d",
p->sd);
+*is_error = JK_HTTP_SERVER_ERROR;
 
 JK_TRACE_EXIT(l);
 return JK_FALSE;

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=559197&r1=559196&r2=559197
==
--- tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c Tue Jul 24 
13:39:09 2007
@@ -1833,15 +1833,19 @@
 
 JK_TRACE_ENTER(l);
 
-if (is_error)
-*is_error = JK_HTTP_SERVER_ERROR;
 if (!e || !e->endpoint_private || !s || !is_error) {
 JK_LOG_NULL_PARAMS(l);
+if (is_error)
+*is_error = JK_HTTP_SERVER_ERROR;
 JK_TRACE_EXIT(l);
 return JK_FALSE;
 }
 
 p = e->endpoint_private;
+
+/* Set returned error to OK */
+*is_error = JK_HTTP_OK;
+
 op->request = jk_b_new(&(p->pool));
 if (!op->request) {
 *is_error = JK_HTTP_SERVER_ERROR;
@@ -2017,11 +2021,12 @@
"(%s) receiving reply from tomcat failed "
"without recovery in send loop attempt=%d",
p->worker->name, i);
-JK_TRACE_EXIT(l);
 if (err == JK_REPLY_TIMEOUT) {
 *is_error = JK_HTTP_GATEWAY_TIME_OUT;
+JK_TRACE_EXIT(l);
 return JK_REPLY_TIMEOUT;
 }
+JK_TRACE_EXIT(l);
 return JK_FALSE;
 }
 jk_log(l, JK_LOG_INFO,
@@ -2080,11 +2085,13 @@
"or is listening on the wrong port",
p->worker->name);
 
-JK_TRACE_EXIT(l);
 if (err == JK_REPLY_TIMEOUT) {
 *is_error = JK_HTTP_GATEWAY_TIME_OUT;
+JK_TRACE_EXIT(l);
 return JK_REPLY_TIMEOUT;
 }
+
+JK_TRACE_EXIT(l);
 return JK_FALSE;
 }
 

Modified: tomcat/connectors/trunk/jk/native/common/jk_jni_worker.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_jni_worker.c?view=diff&rev=559197&r1=559196&r2=559197
==
--- tomcat/connectors/trunk/jk/native/common/jk_jni_worker.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_jni_worker.c Tue Jul 24 
13:39:09 2007
@@ -250,29 +250,31 @@
 
 static int JK_METHOD service(jk_endpoint_t *e,
  jk_ws_service_t *s,
- jk_logger_t *l, int *is_recoverable_error)
+ jk_logger_t *l, int *is_error)
 {
 jni_endpoint_t *p;
 jint rc;
 
 JK_TRACE_ENTER(l);
 
-if (is_recoverable_error)
-*is_recoverable_error = JK_FALSE;
-if (!e || !e->endpoint_private || !s || !is_recoverable_error) {
+if (!e || !e->endpoint_private || !s ||

svn commit: r559202 - in /tomcat/connectors/trunk/jk: native/iis/jk_isapi_plugin.c native/netscape/jk_nsapi_plugin.c xdocs/miscellaneous/changelog.xml

2007-07-24 Thread rjung 
Author: rjung
Date: Tue Jul 24 13:47:32 2007
New Revision: 559202

URL: http://svn.apache.org/viewvc?view=rev&rev=559202
Log:
IIS & Sun: Log service failures also, if return code is negative.

Modified:
tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c
tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c?view=diff&rev=559202&r1=559201&r2=559202
==
--- tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c Tue Jul 24 13:47:32 
2007
@@ -40,6 +40,7 @@
 #include "jk_worker.h"
 #include "jk_uri_worker_map.h"
 #include "jk_shm.h"
+#include "jk_ajp13.h"
 #include "pcre.h"
 
 #ifndef POSIX_MALLOC_THRESHOLD
@@ -1519,7 +1520,8 @@
 s.retries = worker->retries;
 if (worker->get_endpoint(worker, &e, logger)) {
 int is_error = JK_HTTP_SERVER_ERROR;
-if (e->service(e, &s, logger, &is_error)) {
+int result;
+if ((result = e->service(e, &s, logger, &is_error)) > 0) {
 rc = HSE_STATUS_SUCCESS;
 lpEcb->dwHttpStatusCode = HTTP_STATUS_OK;
 if (JK_IS_DEBUG_LEVEL(logger))
@@ -1527,8 +1529,14 @@
"service() returned OK");
 }
 else {
-jk_log(logger, JK_LOG_ERROR,
-   "service() failed with http error %d", 
is_error);
+if ((result == JK_CLIENT_ERROR) && (is_error == 
JK_HTTP_OK)) {
+jk_log(logger, JK_LOG_INFO,
+   "service() failed because client aborted 
connection");
+}
+else {
+jk_log(logger, JK_LOG_ERROR,
+   "service() failed with http error %d", 
is_error);
+}
 lpEcb->dwHttpStatusCode = is_error;
 write_error_message(lpEcb, is_error);
 }

Modified: tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c?view=diff&rev=559202&r1=559201&r2=559202
==
--- tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c (original)
+++ tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c Tue Jul 24 
13:47:32 2007
@@ -24,13 +24,14 @@
 
 #include "nsapi.h"
 #include "jk_global.h"
+#include "jk_url.h"
 #include "jk_util.h"
 #include "jk_map.h"
 #include "jk_pool.h"
 #include "jk_service.h"
 #include "jk_worker.h"
 #include "jk_shm.h"
-#include "jk_url.h"
+#include "jk_ajp13.h"
 
 #define URI_PATTERN "path"
 #define DEFAULT_WORKER_NAME ("ajp13")
@@ -370,9 +371,24 @@
 jk_endpoint_t *e = NULL;
 if (worker->get_endpoint(worker, &e, logger)) {
 int recover = JK_FALSE;
-if (e->service(e, &s, logger, &recover)) {
+int result;
+if ((result = e->service(e, &s, logger, &recover)) > 0) {
 rc = REQ_PROCEED;
+if (JK_IS_DEBUG_LEVEL(logger))
+jk_log(logger, JK_LOG_DEBUG,
+   "service() returned OK");
 }
+else {
+if ((result == JK_CLIENT_ERROR) && (is_error == 
JK_HTTP_OK)) {
+jk_log(logger, JK_LOG_INFO,
+   "service() failed because client aborted 
connection");
+}
+else {
+jk_log(logger, JK_LOG_ERROR,
+   "service() failed with http error %d", 
is_error);
+}
+}
+
 e->done(&e, logger);
 }
 }

Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?view=diff&rev=559202&r1=559201&r2=559202
==
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Tue Jul 24 
13:47:32 2007
@@ -27,6 +27,9 @@
   
   
 
+  
+  IIS & Sun: Log service failures also, if return code is negative. (rjung)
+  
   
 42849: Abort startup of Apache httpd 1.3 in case
 mod_jk initialization faile

svn commit: r559205 - /tomcat/connectors/trunk/jk/native/common/jk_util.c

2007-07-24 Thread rjung 
Author: rjung
Date: Tue Jul 24 14:01:14 2007
New Revision: 559205

URL: http://svn.apache.org/viewvc?view=rev&rev=559205
Log:
Minor reorg of log line building.
Drop fixed 8 bytes length for log level strings, because
the variing length of correct thread ids breaks
alignment of log messages anyways.

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

Modified: tomcat/connectors/trunk/jk/native/common/jk_util.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_util.c?view=diff&rev=559205&r1=559204&r2=559205
==
--- tomcat/connectors/trunk/jk/native/common/jk_util.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_util.c Tue Jul 24 14:01:14 2007
@@ -286,12 +286,11 @@
 MAINTAIN_PROPERTY_NAME
 };
 
-/* All entries need to have fixed length 8 chars! */
 static const char *jk_level_verbs[] = {
 "[" JK_LOG_TRACE_VERB "] ",
 "[" JK_LOG_DEBUG_VERB "] ",
-"[" JK_LOG_INFO_VERB "]  ",
-"[" JK_LOG_WARN_VERB "]  ",
+"[" JK_LOG_INFO_VERB "] ",
+"[" JK_LOG_WARN_VERB "] ",
 "[" JK_LOG_ERROR_VERB "] ",
 "[" JK_LOG_EMERG_VERB "] ",
 NULL
@@ -493,31 +492,51 @@
 #endif
 used = set_time_str(buf, usable_size, l->log_fmt);
 
-if (line) {
+if (line) { /* line==0 only used for request log item */
 /* Log [pid:threadid] for all levels except REQUEST. */
 /* This information helps to correlate lines from different logs. 
*/
 /* Performance is no issue, because with production log levels */
 /* we only call it often, if we have a lot of errors */
-rc = snprintf(&buf[used], usable_size - used,
- "[%" JK_PID_T_FMT ":%" JK_UINT32_T_FMT "] ", 
getpid(), jk_gettid());
+rc = snprintf(buf + used, usable_size - used,
+  "[%" JK_PID_T_FMT ":%" JK_UINT32_T_FMT "] ", 
getpid(), jk_gettid());
 used += rc;
-if (rc < 0 || usable_size - used < 8) {
+if (rc < 0 ) {
 return 0;
 }
-strcat(buf, jk_level_verbs[level]);
-used += 8;
+
+rc = (int)strlen(jk_level_verbs[level]);
+if (usable_size - used >= rc) {
+strncpy(buf + used, jk_level_verbs[level], rc);
+used += rc;
+}
+else {
+return 0;   /* [V] not sure what to return... */
+}
 
 if (funcname) {
-rc = (int)strlen(funcname) + 2;
-if (usable_size - used >= rc) {
-strcat(buf, funcname);
-strcat(buf, "::");
+rc = (int)strlen(funcname);
+if (usable_size - used >= rc + 2) {
+strncpy(buf + used, funcname, rc);
 used += rc;
+strncpy(buf + used, "::", 2);
+used += 2;
+}
+else {
+return 0;   /* [V] not sure what to return... */
 }
 }
 
-rc = snprintf(&buf[used], usable_size - used,
- "%s (%d): ", f, line);
+rc = (int)strlen(f);
+if (usable_size - used >= rc) {
+strncpy(buf + used, f, rc);
+used += rc;
+}
+else {
+return 0;   /* [V] not sure what to return... */
+}
+
+rc = snprintf(buf + used, usable_size - used,
+  " (%d): ", line);
 used += rc;
 if (rc < 0 || usable_size - used < 0) {
 return 0;   /* [V] not sure what to return... */



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

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

2007-07-24 Thread rjung 
Author: rjung
Date: Tue Jul 24 14:54:41 2007
New Revision: 559232

URL: http://svn.apache.org/viewvc?view=rev&rev=559232
Log:
Fix entity name in xml changelog.

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

Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?view=diff&rev=559232&r1=559231&r2=559232
==
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Tue Jul 24 
14:54:41 2007
@@ -28,7 +28,7 @@
   
 
   
-  IIS & Sun: Log service failures also, if return code is negative. (rjung)
+  IIS & Sun: Log service failures also, if return code is negative. 
(rjung)
   
   
 42849: Abort startup of Apache httpd 1.3 in case



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

svn commit: r559234 - in /tomcat/connectors/trunk/jk: native/apache-1.3/mod_jk.c native/apache-2.0/mod_jk.c native/common/jk_logger.h native/common/jk_util.c native/common/jk_util.h xdocs/miscellaneou

2007-07-24 Thread rjung 
Author: rjung
Date: Tue Jul 24 14:56:33 2007
New Revision: 559234

URL: http://svn.apache.org/viewvc?view=rev&rev=559234
Log:
Apache: add milliseconds (%Q) and microseconds (%q) as possible
JkLogStampFormat conversion specifiers. This does not use strftime(),
but needs gettimeofday().

Also add milliseconds to the default timestamp format,
if we have gettimeofday().

Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
tomcat/connectors/trunk/jk/native/common/jk_logger.h
tomcat/connectors/trunk/jk/native/common/jk_util.c
tomcat/connectors/trunk/jk/native/common/jk_util.h
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
tomcat/connectors/trunk/jk/xdocs/reference/apache.xml

Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c?view=diff&rev=559234&r1=559233&r2=559234
==
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Tue Jul 24 14:56:33 
2007
@@ -2496,12 +2496,14 @@
 if (jkl && flp) {
 jkl->log = jk_log_to_file;
 jkl->level = conf->log_level;
-jkl->log_fmt = conf->stamp_format_string;
+jk_set_time_fmt(jkl, conf->stamp_format_string);
 jkl->logger_private = flp;
 flp->log_fd = conf->log_fd;
 conf->log = jkl;
 if (main_log == NULL)
 main_log = conf->log;
+jk_log(conf->log, JK_LOG_DEBUG, "log time stamp format is '%s'",
+   conf->log->log_fmt);
 return;
 }
 

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?view=diff&rev=559234&r1=559233&r2=559234
==
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Tue Jul 24 14:56:33 
2007
@@ -2637,7 +2637,7 @@
 if (jkl && flp) {
 jkl->log = jk_log_to_file;
 jkl->level = conf->log_level;
-jkl->log_fmt = conf->stamp_format_string;
+jk_set_time_fmt(jkl, conf->stamp_format_string);
 jkl->logger_private = flp;
 flp->jklogfp = conf->jklogfp;
 conf->log = jkl;
@@ -2649,6 +2649,8 @@
 /* Also should we pass pointer (ie: main_log) or handle 
(*main_log) ? */
 apr_pool_cleanup_register(p, &main_log, jklog_cleanup, 
jklog_cleanup);
 }
+jk_log(conf->log, JK_LOG_DEBUG, "log time stamp format is '%s'",
+   conf->log->log_fmt);
 
 return 0;
 }

Modified: tomcat/connectors/trunk/jk/native/common/jk_logger.h
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_logger.h?view=diff&rev=559234&r1=559233&r2=559234
==
--- tomcat/connectors/trunk/jk/native/common/jk_logger.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_logger.h Tue Jul 24 14:56:33 
2007
@@ -36,7 +36,12 @@
 {
 void *logger_private;
 int level;
-const char *log_fmt;
+const char *log_fmt; /* the configured timestamp format for logging */
+const char *log_fmt_subsec; /* like log_fmt, but milli/micro seconds
+   marker replaced, because strftie() doesn't 
handle those */
+int log_fmt_type; /* do we want milli or microseconds */
+int log_fmt_offset; /* at which position shoukd they occur */
+int log_fmt_size; /* how long is this format string */
 
 int (JK_METHOD * log) (jk_logger_t *l, int level, int used, char *what);
 

Modified: tomcat/connectors/trunk/jk/native/common/jk_util.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_util.c?view=diff&rev=559234&r1=559233&r2=559234
==
--- tomcat/connectors/trunk/jk/native/common/jk_util.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_util.c Tue Jul 24 14:56:33 2007
@@ -127,9 +127,16 @@
  * [Mon Mar 26 19:44:48 2001] [jk_uri_worker_map.c (155)]: Into 
jk_uri_worker_map_t::uri_worker_map_alloc
  * log format used by apache in error.log
  */
-#ifndef JK_TIME_FORMAT
-#define JK_TIME_FORMAT "[%a %b %d %H:%M:%S %Y] "
-#endif
+#define JK_STRFTIME_MILLI "%Q"
+#define JK_STRFTIME_MICRO "%q"
+#define JK_PATTERN_MILLI "XXX"
+#define JK_PATTERN_MICRO "XX"
+#define JK_TIME_FORMAT_NONE  "[%a %b %d %H:%M:%S %Y] "
+#define JK_TIME_FORMAT_MILLI "[%a %b %d %H:%M:%S." JK_STRFTIME_MILLI " %Y] "
+#define JK_TIME_FORMAT_MICRO "[%a %b %d %H:%M:%S." JK_STRFTIME_MICRO " %Y] "
+#define JK_TIME_SUBSEC_NONE  (0)
+#define JK_TIME_SUBSEC_MILLI (1)
+#define JK_TIME_SUBSEC_MICRO (2)

svn commit: r559258 - in /tomcat/site/trunk: docs/download-33.html xdocs/download-33.xml

2007-07-24 Thread markt 
Author: markt
Date: Tue Jul 24 16:26:02 2007
New Revision: 559258

URL: http://svn.apache.org/viewvc?view=rev&rev=559258
Log:
Redo Tomcat 3 download page to make it more like 4, 5 and 6.
Add a patches download area

Modified:
tomcat/site/trunk/docs/download-33.html
tomcat/site/trunk/xdocs/download-33.xml

Modified: tomcat/site/trunk/docs/download-33.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-33.html?view=diff&rev=559258&r1=559257&r2=559258
==
--- tomcat/site/trunk/docs/download-33.html (original)
+++ tomcat/site/trunk/docs/download-33.html Tue Jul 24 16:26:02 2007
@@ -2,7 +2,7 @@
 http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
 
 
-Apache Tomcat - Tomcat 3 Downloads
+Apache Tomcat - Apache Tomcat 3 Downloads
 
 
 
@@ -185,97 +185,247 @@
 
 
 
-We recommend you use a mirror to download our release
-builds, but you must verify the integrity of
-the downloaded files using signatures downloaded from our main 
-distribution directories. Recent releases (48 hours) may not yet 
be available from the mirrors. 
-You are currently using [preferred].  If you
-encounter a problem with this mirror, please select another
-mirror.  If all mirrors are failing, there are backup
-mirrors (at the end of the mirrors list) that should be
-available.[if-any logo]
-
-[end]
+  Welcome to the Tomcat 3.3.x download page. This page provides
+ download links for obtaining the latest versions of Tomcat
+ 3.3.x, as well as links to the archives of older releases.
+  
+  For more information concerning Tomcat 3, see the
+ http://tomcat.apache.org/tomcat-3.3-doc/"; class="name">
+ Tomcat 3 documentation.
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Release Integrity
+
+
+
+
+
+
+
+
+  You must verify the integrity of the
+ downloaded files. We provide PGP signatures
+ for every release file.  This signature should be matched
+ against the
+ http://www.apache.org/dist/tomcat/tomcat-3/KEYS";>
+ KEYS file which contains the PGP keys of Tomcat's
+ Release Managers. We also provide an MD5 checksum
+ for every release file. After you download the file, you
+ should calculate a checksum for your download, and make sure
+ it is the same as ours.
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Mirrors
+
+
+
+
+
+
 
+
+ 
+  You are currently using [preferred].  If you
+ encounter a problem with this mirror, please select another
+ mirror.  If all mirrors are failing, there are backup
+ mirrors (at the end of the mirrors list) that should be
+ available.[if-any logo]
+
+[end]
+  
+  
 
-  Other mirrors: 
-  [if-any http]
-[for http][http][end]
-  [end]
-  [if-any ftp]
-[for ftp][ftp][end]
-  [end]
-  [if-any backup]
-[for backup][backup] 
(backup)[end]
-  [end]
-  
+ Other mirrors: 
+ [if-any http]
+   [for http][http][end]
+ [end]
+ [if-any ftp]
+   [for ftp][ftp][end]
+ [end]
+ [if-any backup]
+   [for backup][backup] (backup)[end]
+ [end]
+ 
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+3.3.2 (Stable)
+
+
+
+
+
+
 
-The KEYS link links to the code signing keys used to 
sign the product. The PGP link downloads the OpenPGP compatible 
signature from our main site. 
-
-For more information concerning Tomcat 3, see the http://jakarta.apache.org/tomcat/tomcat-3.3-doc/"; class="name">Tomcat 
3 site. 
-
-
-http://www.apache.org/dist/tomcat/tomcat-3/v3.3.2/KEYS";>KEYS
-
-
-
-
-
-Binary
-
-
-
-3.3.2 
tar.gz
-
-
-[http://www.apache.org/dist/tomcat/tomcat-3/v3.3.2/bin/jakarta-tomcat-3.3.2.tar.gz.asc";>pgp]
-
-
-
-
-3.3.2 
zip
-
-
-[http://www.apache.org/dist/tomcat/tomcat-3/v3.3.2/bin/jakarta-tomcat-3.3.2.zip.asc";>pgp]
-
-
-
-
-
-
-
-Source
-
-
-
-3.3.2
 tar.gz
-
-
-[http://www.apache.org/dist/tomcat/tomcat-3/v3.3.2/src/jakarta-tomcat-3.3.2-src.tar.gz.asc";>pgp]
-
-
-
-
-3.3.2
 zip
-
-
-[http://www.apache.org/dist/tomcat/tomcat-3/v3.3.2/src/jakarta-tomcat-3.3.2-src.zip.asc";>pgp]
-
-
-
-
-
-
-browse download area
-
-
-http://archive.apache.org/dist/tomcat/tomcat-3/";>archives...
-
-
-
+
+  
+
+
+
+
+Binary Distributions
+
+
+
+
+
+
+
+
+  
+zip
+(http://www.apache.org/dist/tomcat/tomcat-3/v3.3.2/bin/jakarta-tomcat-3.2.2.zip.asc";>pgp)
+  
+  
+tar.gz
+(http://www.apache.org/dist/tomcat/tomcat-3/v3.3.2/bin/jakarta-tomcat-3.2.2.tar.gz.asc";>pgp)
+  
+
+  
+
+
+
+
+
+
+
+
+  
+
+
+
+
+Source Distributions
+
+
+
+
+
+
+
+
+  
+

svn commit: r559264 - in /tomcat/connectors/trunk/jk/native/common: jk_logger.h jk_util.c jk_util.h

2007-07-24 Thread rjung 
Author: rjung
Date: Tue Jul 24 17:05:02 2007
New Revision: 559264

URL: http://svn.apache.org/viewvc?view=rev&rev=559264
Log:
Minor optimization of new millisecond/microsecond
logging. Timestamps restricted to 64 Bytes, less
copying.

Modified:
tomcat/connectors/trunk/jk/native/common/jk_logger.h
tomcat/connectors/trunk/jk/native/common/jk_util.c
tomcat/connectors/trunk/jk/native/common/jk_util.h

Modified: tomcat/connectors/trunk/jk/native/common/jk_logger.h
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_logger.h?view=diff&rev=559264&r1=559263&r2=559264
==
--- tomcat/connectors/trunk/jk/native/common/jk_logger.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_logger.h Tue Jul 24 17:05:02 
2007
@@ -36,12 +36,11 @@
 {
 void *logger_private;
 int level;
-const char *log_fmt; /* the configured timestamp format for logging */
-const char *log_fmt_subsec; /* like log_fmt, but milli/micro seconds
-   marker replaced, because strftie() doesn't 
handle those */
-int log_fmt_type; /* do we want milli or microseconds */
-int log_fmt_offset; /* at which position shoukd they occur */
-int log_fmt_size; /* how long is this format string */
+char *log_fmt;/* the configured timestamp format for logging */
+char *log_fmt_subsec; /* like log_fmt, but milli/micro seconds
+ marker replaced, because strftime() doesn't 
handle those */
+char *log_fmt_offset; /* at which position should we insert */
+int log_fmt_type; /* do we want milli or microseconds */
 
 int (JK_METHOD * log) (jk_logger_t *l, int level, int used, char *what);
 

Modified: tomcat/connectors/trunk/jk/native/common/jk_util.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_util.c?view=diff&rev=559264&r1=559263&r2=559264
==
--- tomcat/connectors/trunk/jk/native/common/jk_util.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_util.c Tue Jul 24 17:05:02 2007
@@ -113,7 +113,6 @@
 #define TOMCAT50_BRIDGE_NAME("tomcat5")
 
 #define HUGE_BUFFER_SIZE (8*1024)
-#define LOG_LINE_SIZE(1024)
 
 #define MAKE_WORKER_PARAM(P) \
 strcpy(buf, "worker.");  \
@@ -127,16 +126,17 @@
  * [Mon Mar 26 19:44:48 2001] [jk_uri_worker_map.c (155)]: Into 
jk_uri_worker_map_t::uri_worker_map_alloc
  * log format used by apache in error.log
  */
-#define JK_STRFTIME_MILLI "%Q"
-#define JK_STRFTIME_MICRO "%q"
-#define JK_PATTERN_MILLI "XXX"
-#define JK_PATTERN_MICRO "XX"
-#define JK_TIME_FORMAT_NONE  "[%a %b %d %H:%M:%S %Y] "
-#define JK_TIME_FORMAT_MILLI "[%a %b %d %H:%M:%S." JK_STRFTIME_MILLI " %Y] "
-#define JK_TIME_FORMAT_MICRO "[%a %b %d %H:%M:%S." JK_STRFTIME_MICRO " %Y] "
-#define JK_TIME_SUBSEC_NONE  (0)
-#define JK_TIME_SUBSEC_MILLI (1)
-#define JK_TIME_SUBSEC_MICRO (2)
+#define JK_TIME_CONV_MILLI"%Q"
+#define JK_TIME_CONV_MICRO"%q"
+#define JK_TIME_PATTERN_MILLI "000"
+#define JK_TIME_PATTERN_MICRO "00"
+#define JK_TIME_FORMAT_NONE   "[%a %b %d %H:%M:%S %Y] "
+#define JK_TIME_FORMAT_MILLI  "[%a %b %d %H:%M:%S." JK_TIME_CONV_MILLI " %Y] "
+#define JK_TIME_FORMAT_MICRO  "[%a %b %d %H:%M:%S." JK_TIME_CONV_MICRO " %Y] "
+#define JK_TIME_SUBSEC_NONE   (0)
+#define JK_TIME_SUBSEC_MILLI  (1)
+#define JK_TIME_SUBSEC_MICRO  (2)
+#define JK_TIME_MAX_SIZE  (64)
 
 /* Visual C++ Toolkit 2003 support */
 #if defined (_MSC_VER) && (_MSC_VER == 1310)
@@ -350,11 +350,11 @@
 #endif
 }
 
-void jk_set_time_fmt(jk_logger_t *l, const char *jk_log_fmt)
+void jk_set_time_fmt(jk_logger_t *l, char *jk_log_fmt)
 {
 if (l) {
 char *s;
-char log_fmt_safe[LOG_LINE_SIZE];
+char log_fmt_safe[JK_TIME_MAX_SIZE];
 char *fmt;
 
 if (!jk_log_fmt) {
@@ -365,43 +365,40 @@
 #endif
 }
 l->log_fmt_type = JK_TIME_SUBSEC_NONE;
-l->log_fmt_offset = 0;
-l->log_fmt_size = 0;
+l->log_fmt_offset = NULL;
 l->log_fmt_subsec = jk_log_fmt;
 l->log_fmt = jk_log_fmt;
 
-fmt = (char *)malloc(LOG_LINE_SIZE + strlen(JK_PATTERN_MICRO));
+fmt = (char *)malloc(JK_TIME_MAX_SIZE + strlen(JK_TIME_PATTERN_MICRO));
 if ( fmt ) {
-strncpy(log_fmt_safe, jk_log_fmt, LOG_LINE_SIZE);
-if ( (s = strstr(log_fmt_safe, JK_STRFTIME_MILLI)) ) {
+strncpy(log_fmt_safe, jk_log_fmt, JK_TIME_MAX_SIZE);
+if ( (s = strstr(log_fmt_safe, JK_TIME_CONV_MILLI)) ) {
 int offset = s - log_fmt_safe;
-int len = strlen(JK_PATTERN_MILLI);
+int len = strlen(JK_TIME_PATTERN_MILLI);
 
 l->log_fmt_type = JK_TIME_SUBSEC_MILLI;
-l->log_fmt_offset = offset;
+l->log_fmt_offset = fmt + offset;
 strn

svn commit: r559265 - /tomcat/connectors/trunk/jk/xdocs/reference/apache.xml

2007-07-24 Thread rjung 
Author: rjung
Date: Tue Jul 24 17:14:15 2007
New Revision: 559265

URL: http://svn.apache.org/viewvc?view=rev&rev=559265
Log:
Minor docs update to milliseconds/microseconds logging.

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

Modified: tomcat/connectors/trunk/jk/xdocs/reference/apache.xml
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/reference/apache.xml?view=diff&rev=559265&r1=559264&r2=559265
==
--- tomcat/connectors/trunk/jk/xdocs/reference/apache.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/reference/apache.xml Tue Jul 24 17:14:15 
2007
@@ -170,13 +170,17 @@
 The default value is info.
 
 
-The Tomcat Connector module date log format, follow an
+The Tomcat Connector module date log format, using an
 extended strftime syntax.
 This format will be used for the time stamps in the JkLogFile.
-Besides the usual strftime conversion specifications,
-you can also use %Q for adding milliseconds to the log and
-%q for microseconds. This will only work with mod_jk minimum
-version 1.2.24 on platforms with a gettimeofday() function.
+The maximum length of the format is 63 characters.
+
+Starting with version 1.2.24 of mod_jk you can also use %Q
+for adding milliseconds to the log and %q for microseconds. 
+These conversion specifiers are an extension to strftime.
+They will only work on platforms with a gettimeofday() function.
+You can use %Q and %q only once in the pattern and also not both
+together in the same pattern.
 
 The default value is "[%a %b %d %H:%M:%S %Y] " and beginning
 with version 1.2.24 on platforms with a gettimeofday()



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

DO NOT REPLY [Bug 42959] - tomcat-connectors-1.2.23-src: source code fails to compile

2007-07-24 Thread 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=42959





--- Additional Comments From [EMAIL PROTECTED]  2007-07-24 18:20 ---
FOLLOW UP:

Okay, I downloaded the .tar.gz package (tomcat-connectors-1.2.23-src.tar.gz):
http://apache.mirrors.tds.net/tomcat/tomcat-connectors/jk/source/jk-1.2.23/tomcat-
connectors-1.2.23-src.tar.gz

As prophesized, the line-endings were linux compatible.

The ./configure step successfully ran to completion.
The resulting Makefile also ran to a successful completion.

For the record, my compiler was the honorable:  powerpc-apple-darwin8-gcc-4.0.1

So the conclusion seems to be: use the intended set of source files.  The *.zip 
file is not an equivalent 
alternative on Mac OS X.

If someone were so inclined, it could be helpful to add the target operating 
system to the main 
downloads page:
http://tomcat.apache.org/download-connectors.cgi

* Source:
 * JK 1.2.23 Source Release tar.gz  (Linux, Macintosh)
 * JK 1.2.23 Source Release zip  (Windows)

As a guide for people who aren't sure which source package they ought to be 
using.  (This is probably 
more important for the Macintosh users, who might go either way, than it is for 
Linux or Windows 
users.)

I'm not on the tomcat-dev list, but if you were to write a one-line follow up 
to this bug report when the 
candidate for 1.2.24 is pre-released, I would be happy to download it and 
compile it for the Mac.  I can 
also provide a PowerPC binary for Mac OS X if necessary.

-- 
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: r559270 - in /tomcat/site/trunk: docs/download-33.html xdocs/download-33.xml

2007-07-24 Thread markt 
Author: markt
Date: Tue Jul 24 18:20:32 2007
New Revision: 559270

URL: http://svn.apache.org/viewvc?view=rev&rev=559270
Log:
Fix typo

Modified:
tomcat/site/trunk/docs/download-33.html
tomcat/site/trunk/xdocs/download-33.xml

Modified: tomcat/site/trunk/docs/download-33.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-33.html?view=diff&rev=559270&r1=559269&r2=559270
==
--- tomcat/site/trunk/docs/download-33.html (original)
+++ tomcat/site/trunk/docs/download-33.html Tue Jul 24 18:20:32 2007
@@ -316,12 +316,12 @@
 
 
   
-zip
-(http://www.apache.org/dist/tomcat/tomcat-3/v3.3.2/bin/jakarta-tomcat-3.2.2.zip.asc";>pgp)
+zip
+(http://www.apache.org/dist/tomcat/tomcat-3/v3.3.2/bin/jakarta-tomcat-3.3.2.zip.asc";>pgp)
   
   
-tar.gz
-(http://www.apache.org/dist/tomcat/tomcat-3/v3.3.2/bin/jakarta-tomcat-3.2.2.tar.gz.asc";>pgp)
+tar.gz
+(http://www.apache.org/dist/tomcat/tomcat-3/v3.3.2/bin/jakarta-tomcat-3.3.2.tar.gz.asc";>pgp)
   
 
   
@@ -348,12 +348,12 @@
 
 
   
-zip
-(http://www.apache.org/dist/tomcat/tomcat-3/v3.3.2/src/jakarta-tomcat-3.2.2.zip.asc";>pgp)
+zip
+(http://www.apache.org/dist/tomcat/tomcat-3/v3.3.2/src/jakarta-tomcat-3.3.2.zip.asc";>pgp)
   
   
-tar.gz
-(http://www.apache.org/dist/tomcat/tomcat-3/v3.3.2/src/jakarta-tomcat-3.2.2-src.tar.gz.asc";>pgp)
+tar.gz
+(http://www.apache.org/dist/tomcat/tomcat-3/v3.3.2/src/jakarta-tomcat-3.3.2-src.tar.gz.asc";>pgp)
   
 
   

Modified: tomcat/site/trunk/xdocs/download-33.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-33.xml?view=diff&rev=559270&r1=559269&r2=559270
==
--- tomcat/site/trunk/xdocs/download-33.xml (original)
+++ tomcat/site/trunk/xdocs/download-33.xml Tue Jul 24 18:20:32 2007
@@ -53,24 +53,24 @@
   
 
   
-zip
-(http://www.apache.org/dist/tomcat/tomcat-3/v3.3.2/bin/jakarta-tomcat-3.2.2.zip.asc";>pgp)
+zip
+(http://www.apache.org/dist/tomcat/tomcat-3/v3.3.2/bin/jakarta-tomcat-3.3.2.zip.asc";>pgp)
   
   
-tar.gz
-(http://www.apache.org/dist/tomcat/tomcat-3/v3.3.2/bin/jakarta-tomcat-3.2.2.tar.gz.asc";>pgp)
+tar.gz
+(http://www.apache.org/dist/tomcat/tomcat-3/v3.3.2/bin/jakarta-tomcat-3.3.2.tar.gz.asc";>pgp)
   
 
   
   
 
   
-zip
-(http://www.apache.org/dist/tomcat/tomcat-3/v3.3.2/src/jakarta-tomcat-3.2.2.zip.asc";>pgp)
+zip
+(http://www.apache.org/dist/tomcat/tomcat-3/v3.3.2/src/jakarta-tomcat-3.3.2.zip.asc";>pgp)
   
   
-tar.gz
-(http://www.apache.org/dist/tomcat/tomcat-3/v3.3.2/src/jakarta-tomcat-3.2.2-src.tar.gz.asc";>pgp)
+tar.gz
+(http://www.apache.org/dist/tomcat/tomcat-3/v3.3.2/src/jakarta-tomcat-3.3.2-src.tar.gz.asc";>pgp)
   
 
   



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

svn commit: r559280 - /tomcat/connectors/trunk/util/java/org/apache/tomcat/util/http/Cookies.java

2007-07-24 Thread markt 
Author: markt
Date: Tue Jul 24 19:04:36 2007
New Revision: 559280

URL: http://svn.apache.org/viewvc?view=rev&rev=559280
Log:
Port cookie value parsing fix from TC6

Modified:
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/http/Cookies.java

Modified: 
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/http/Cookies.java
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/util/java/org/apache/tomcat/util/http/Cookies.java?view=diff&rev=559280&r1=559279&r2=559280
==
--- tomcat/connectors/trunk/util/java/org/apache/tomcat/util/http/Cookies.java 
(original)
+++ tomcat/connectors/trunk/util/java/org/apache/tomcat/util/http/Cookies.java 
Tue Jul 24 19:04:36 2007
@@ -250,8 +250,10 @@
 
 cc=bytes[pos];
 if(  cc=='"' ) {
-startValue++;
-endValue=indexOf( bytes, startValue, end, cc );
+endValue=findDelim3( bytes, startValue+1, end, cc );
+if (endValue == -1) {
+endValue = findDelim2(bytes, startValue+1, end);
+} else startValue++;
 pos=endValue+1; // to skip to next cookie
  } else {
 endValue=findDelim2( bytes, startValue, end );
@@ -335,27 +337,26 @@
 return off;
 }
 
-public static int indexOf( byte bytes[], int off, int end, byte qq )
+/*
+ *  search for cc but skip \cc as required by rfc2616
+ *  (according to rfc2616 cc should be ")
+ */
+public static int findDelim3( byte bytes[], int off, int end, byte cc )
 {
 while( off < end ) {
 byte b=bytes[off];
-if( b==qq )
+if (b=='\\') {
+off++;
+off++;
+continue;
+}
+if( b==cc )
 return off;
 off++;
 }
-return off;
+return -1;
 }
 
-public static int indexOf( byte bytes[], int off, int end, char qq )
-{
-while( off < end ) {
-byte b=bytes[off];
-if( b==qq )
-return off;
-off++;
-}
-return off;
-}
 
 // XXX will be refactored soon!
 public static boolean equals( String s, byte b[], int start, int end) {



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

svn commit: r559281 - /tomcat/connectors/branches/tc5.0.x/util/java/org/apache/tomcat/util/http/Cookies.java

2007-07-24 Thread markt 
Author: markt
Date: Tue Jul 24 19:10:50 2007
New Revision: 559281

URL: http://svn.apache.org/viewvc?view=rev&rev=559281
Log:
Port cookie value parsing fix from TC6

Modified:

tomcat/connectors/branches/tc5.0.x/util/java/org/apache/tomcat/util/http/Cookies.java

Modified: 
tomcat/connectors/branches/tc5.0.x/util/java/org/apache/tomcat/util/http/Cookies.java
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/branches/tc5.0.x/util/java/org/apache/tomcat/util/http/Cookies.java?view=diff&rev=559281&r1=559280&r2=559281
==
--- 
tomcat/connectors/branches/tc5.0.x/util/java/org/apache/tomcat/util/http/Cookies.java
 (original)
+++ 
tomcat/connectors/branches/tc5.0.x/util/java/org/apache/tomcat/util/http/Cookies.java
 Tue Jul 24 19:10:50 2007
@@ -244,8 +244,10 @@
 // quote is valid only in version=1 cookies
 cc=bytes[pos];
 if( ( version == 1 || isSpecial ) && ( cc=='"' ) ) {
-startValue++;
-endValue=indexOf( bytes, startValue, end, cc );
+endValue=findDelim3( bytes, startValue+1, end, cc );
+if (endValue == -1) {
+endValue = findDelim2(bytes, startValue+1, end);
+} else startValue++;
 pos=endValue+1; // to skip to next cookie
  } else {
 endValue=findDelim2( bytes, startValue, end );
@@ -321,28 +323,26 @@
 return off;
 }
 
-public static int indexOf( byte bytes[], int off, int end, byte qq )
+/*
+ *  search for cc but skip \cc as required by rfc2616
+ *  (according to rfc2616 cc should be ")
+ */
+public static int findDelim3( byte bytes[], int off, int end, byte cc )
 {
 while( off < end ) {
 byte b=bytes[off];
-if( b==qq )
+if (b=='\\') {
+off++;
+off++;
+continue;
+}
+if( b==cc )
 return off;
 off++;
 }
-return off;
+return -1;
 }
 
-public static int indexOf( byte bytes[], int off, int end, char qq )
-{
-while( off < end ) {
-byte b=bytes[off];
-if( b==qq )
-return off;
-off++;
-}
-return off;
-}
-
 // XXX will be refactored soon!
 public static boolean equals( String s, byte b[], int start, int end) {
 int blen = end-start;



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

svn commit: r559283 - /tomcat/connectors/branches/tc5.0.x/util/java/org/apache/tomcat/util/http/ServerCookie.java

2007-07-24 Thread markt 
Author: markt
Date: Tue Jul 24 19:19:40 2007
New Revision: 559283

URL: http://svn.apache.org/viewvc?view=rev&rev=559283
Log:
Port changes from 5.5

Modified:

tomcat/connectors/branches/tc5.0.x/util/java/org/apache/tomcat/util/http/ServerCookie.java

Modified: 
tomcat/connectors/branches/tc5.0.x/util/java/org/apache/tomcat/util/http/ServerCookie.java
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/branches/tc5.0.x/util/java/org/apache/tomcat/util/http/ServerCookie.java?view=diff&rev=559283&r1=559282&r2=559283
==
--- 
tomcat/connectors/branches/tc5.0.x/util/java/org/apache/tomcat/util/http/ServerCookie.java
 (original)
+++ 
tomcat/connectors/branches/tc5.0.x/util/java/org/apache/tomcat/util/http/ServerCookie.java
 Tue Jul 24 19:19:40 2007
@@ -123,6 +123,7 @@
 //
 // private static final String tspecials = "()<>@,;:\\\"/[]?={} \t";
 private static final String tspecials = ",;";
+private static final String tspecials2 = ",; \"";
 
 /*
  * Tests a string and returns true if the string counts as a
@@ -147,6 +148,20 @@
return true;
 }
 
+public static boolean isToken2(String value) {
+if( value==null) return true;
+int len = value.length();
+
+for (int i = 0; i < len; i++) {
+char c = value.charAt(i);
+
+if (c < 0x20 || c >= 0x7f || tspecials2.indexOf(c) != -1)
+return false;
+}
+return true;
+}
+
+
 public static boolean checkName( String name ) {
if (!isToken(name)
|| name.equalsIgnoreCase("Comment") // rfc2019
@@ -206,7 +221,7 @@
 // this part is the same for all cookies
buf.append( name );
 buf.append("=");
-maybeQuote(version, buf, value);
+maybeQuote2(version, buf, value);
 
// XXX Netscape cookie: "; "
// add version 1 specific information
@@ -276,16 +291,56 @@
throw new IllegalArgumentException( value );
else {
buf.append ('"');
-   buf.append (value);
+   buf.append (escapeDoubleQuotes(value));
buf.append ('"');
}
}
 }
 
+public static void maybeQuote2 (int version, StringBuffer buf,
+String value) {
+// special case - a \n or \r  shouldn't happen in any case
+if (isToken2(value)) {
+buf.append(value);
+} else {
+buf.append('"');
+buf.append(escapeDoubleQuotes(value));
+buf.append('"');
+}
+}
+
+
 // log
 static final int dbg=1;
 public static void log(String s ) {
System.out.println("ServerCookie: " + s);
+}
+
+/**
+ * Escapes any double quotes in the given string.
+ *
+ * @param s the input string
+ *
+ * @return The (possibly) escaped string
+ */
+private static String escapeDoubleQuotes(String s) {
+
+if (s == null || s.length() == 0 || s.indexOf('"') == -1) {
+return s;
+}
+
+StringBuffer b = new StringBuffer();
+char p = s.charAt(0);
+for (int i = 0; i < s.length(); i++) {
+char c = s.charAt(i);
+if (c == '"' && p != '\\')
+b.append('\\').append('"');
+else
+b.append(c);
+p = c;
+}
+
+return b.toString();
 }
 
 }



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

svn commit: r559287 - in /tomcat/site/trunk: docs/download-33.html xdocs/download-33.xml

2007-07-24 Thread markt 
Author: markt
Date: Tue Jul 24 19:25:34 2007
New Revision: 559287

URL: http://svn.apache.org/viewvc?view=rev&rev=559287
Log:
Fix another typo

Modified:
tomcat/site/trunk/docs/download-33.html
tomcat/site/trunk/xdocs/download-33.xml

Modified: tomcat/site/trunk/docs/download-33.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-33.html?view=diff&rev=559287&r1=559286&r2=559287
==
--- tomcat/site/trunk/docs/download-33.html (original)
+++ tomcat/site/trunk/docs/download-33.html Tue Jul 24 19:25:34 2007
@@ -349,7 +349,7 @@
 
   
 zip
-(http://www.apache.org/dist/tomcat/tomcat-3/v3.3.2/src/jakarta-tomcat-3.3.2.zip.asc";>pgp)
+(http://www.apache.org/dist/tomcat/tomcat-3/v3.3.2/src/jakarta-tomcat-3.3.2-src.zip.asc";>pgp)
   
   
 tar.gz

Modified: tomcat/site/trunk/xdocs/download-33.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-33.xml?view=diff&rev=559287&r1=559286&r2=559287
==
--- tomcat/site/trunk/xdocs/download-33.xml (original)
+++ tomcat/site/trunk/xdocs/download-33.xml Tue Jul 24 19:25:34 2007
@@ -66,7 +66,7 @@
 
   
 zip
-(http://www.apache.org/dist/tomcat/tomcat-3/v3.3.2/src/jakarta-tomcat-3.3.2.zip.asc";>pgp)
+(http://www.apache.org/dist/tomcat/tomcat-3/v3.3.2/src/jakarta-tomcat-3.3.2-src.zip.asc";>pgp)
   
   
 tar.gz



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