svn commit: r565352 - in /tomcat/trunk/java/org/apache/catalina/tribes: group/interceptors/ThroughputInterceptor.java tipis/AbstractReplicatedMap.java

[fhanik]

Author: fhanik
Date: Mon Aug 13 06:54:30 2007
New Revision: 565352

URL: http://svn.apache.org/viewvc?view=rev&rev=565352
Log:
Fix NPE in the map, add accessors to stats information

Modified:

tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/ThroughputInterceptor.java

tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/ThroughputInterceptor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/ThroughputInterceptor.java?view=diff&rev=565352&r1=565351&r2=565352
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/ThroughputInterceptor.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/ThroughputInterceptor.java
 Mon Aug 13 06:54:30 2007
@@ -16,6 +16,10 @@
 
 package org.apache.catalina.tribes.group.interceptors;
 
+import java.text.DecimalFormat;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+
 import org.apache.catalina.tribes.ChannelException;
 import org.apache.catalina.tribes.ChannelMessage;
 import org.apache.catalina.tribes.Member;
@@ -23,10 +27,6 @@
 import org.apache.catalina.tribes.group.InterceptorPayload;
 import org.apache.catalina.tribes.io.ChannelData;
 import org.apache.catalina.tribes.io.XByteBuffer;
-import java.text.DecimalFormat;
-import org.apache.catalina.tribes.membership.MemberImpl;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
 
 
 
@@ -61,7 +61,7 @@
 super.sendMessage(destination, msg, payload);
 }catch ( ChannelException x ) {
 msgTxErr.addAndGet(1);
-access.addAndGet(-1);
+if ( access.get() == 1 ) access.addAndGet(-1);
 throw x;
 } 
 mbTx += ((double)(bytes*destination.length))/(1024d*1024d);
@@ -115,6 +115,46 @@
 
 public int getInterval() {
 return interval;
+}
+
+public double getLastCnt() {
+return lastCnt;
+}
+
+public double getMbAppTx() {
+return mbAppTx;
+}
+
+public double getMbRx() {
+return mbRx;
+}
+
+public double getMbTx() {
+return mbTx;
+}
+
+public AtomicLong getMsgRxCnt() {
+return msgRxCnt;
+}
+
+public AtomicLong getMsgTxCnt() {
+return msgTxCnt;
+}
+
+public AtomicLong getMsgTxErr() {
+return msgTxErr;
+}
+
+public long getRxStart() {
+return rxStart;
+}
+
+public double getTimeTx() {
+return timeTx;
+}
+
+public long getTxStart() {
+return txStart;
 }
 
 }

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?view=diff&rev=565352&r1=565351&r2=565352
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java 
Mon Aug 13 06:54:30 2007
@@ -511,7 +511,7 @@
 while (i.hasNext()) {
 Map.Entry e = (Map.Entry) i.next();
 MapEntry entry = (MapEntry) super.get(e.getKey());
-if ( entry.isSerializable() ) {
+if ( entry != null && entry.isSerializable() ) {
 boolean copy = (mapmsg.getMsgType() == 
mapmsg.MSG_STATE_COPY);
 MapMessage me = new MapMessage(mapContextName, 

copy?MapMessage.MSG_COPY:MapMessage.MSG_PROXY,
@@ -719,6 +719,7 @@
 while (i.hasNext()) {
 Map.Entry e = (Map.Entry) i.next();
 MapEntry entry = (MapEntry) super.get(e.getKey());
+if (entry==null) continue;
 if (entry.isPrimary() && inSet(member,entry.getBackupNodes())) {
 if (log.isDebugEnabled()) log.debug("[1] Primary choosing a 
new backup");
 try {
@@ -977,7 +978,7 @@
 while (i.hasNext()) {
 Map.Entry e = (Map.Entry) i.next();
 MapEntry entry = (MapEntry) super.get(e.getKey());
-if (entry.isPrimary() && value.equals(entry.getValue())) 
return true;
+if (entry!=null && entry.isPrimary() && 
value.equals(entry.getValue())) return true;
 }//while
 return false;
 }//end if
@@ -1062,7 +1063,7 @@
 while ( i.hasNext() ) {
 Map.Entry e = (Map.Entry)i.next();
 MapEntry entry = (MapEntry)super.get(e.getKey());
-if ( entry.isPrimary()

svn commit: r565395 - /tomcat/container/tc5.5.x/catalina/src/conf/web.xml

[pero]

Author: pero
Date: Mon Aug 13 09:21:23 2007
New Revision: 565395

URL: http://svn.apache.org/viewvc?view=rev&rev=565395
Log:
Fix double xml processing instruction :-)

Modified:
tomcat/container/tc5.5.x/catalina/src/conf/web.xml

Modified: tomcat/container/tc5.5.x/catalina/src/conf/web.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/conf/web.xml?view=diff&rev=565395&r1=565394&r2=565395
==
--- tomcat/container/tc5.5.x/catalina/src/conf/web.xml (original)
+++ tomcat/container/tc5.5.x/catalina/src/conf/web.xml Mon Aug 13 09:21:23 2007
@@ -1,4 +1,4 @@
-
+
 
-
 http://java.sun.com/xml/ns/j2ee";
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
 xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee 
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";



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

svn commit: r565402 - /tomcat/container/tc5.5.x/webapps/docs/changelog.xml

[pero]

Author: pero
Date: Mon Aug 13 09:26:57 2007
New Revision: 565402

URL: http://svn.apache.org/viewvc?view=rev&rev=565402
Log:
Update to Commons Modeler 2.0.1, fix embed release starting issue

Modified:
tomcat/container/tc5.5.x/webapps/docs/changelog.xml

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diff&rev=565402&r1=565401&r2=565402
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Mon Aug 13 09:26:57 2007
@@ -36,6 +36,9 @@
   
 Correct j.u.l log levels in JULI docs. (rjung)
   
+  
+Update to Commons Modeler 2.0.1, fix embed release starting issue 
(pero)
+  
 
   
   



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

svn commit: r565403 - /tomcat/build/tc5.5.x/build.properties.default

[pero]

Author: pero
Date: Mon Aug 13 09:27:01 2007
New Revision: 565403

URL: http://svn.apache.org/viewvc?view=rev&rev=565403
Log:
Update to Commons Modeler 2.0.1, fix embed release starting issue

Modified:
tomcat/build/tc5.5.x/build.properties.default

Modified: tomcat/build/tc5.5.x/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/build/tc5.5.x/build.properties.default?view=diff&rev=565403&r1=565402&r2=565403
==
--- tomcat/build/tc5.5.x/build.properties.default (original)
+++ tomcat/build/tc5.5.x/build.properties.default Mon Aug 13 09:27:01 2007
@@ -22,7 +22,6 @@
 compile.deprecation=off
 compile.optimize=off
 
-
 # - Build Control Flags
 
 #Build all components
@@ -118,10 +117,10 @@
 
 
 # - Commons Modeler, version 2.0 or later -
-commons-modeler.home=${base.path}/commons-modeler-2.0
+commons-modeler.home=${base.path}/commons-modeler-2.0.1
 commons-modeler.lib=${commons-modeler.home}
-commons-modeler.jar=${commons-modeler.lib}/commons-modeler-2.0.jar
-commons-modeler.loc=${base-jakarta.loc}/commons/modeler/binaries/commons-modeler-2.0.tar.gz
+commons-modeler.jar=${commons-modeler.lib}/commons-modeler-2.0.1.jar
+commons-modeler.loc=${base-jakarta.loc}/commons/modeler/binaries/commons-modeler-2.0.1.tar.gz
 
 # - Xerces XML Parser, version 2.8.0 -
 xerces.home=${base.path}/xerces-2_8_0



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

[ANN] Apache Tomcat 6.0.14 released

[Remy Maucherat]

The Apache Tomcat team announces the immediate availability of Apache
Tomcat 6.0.14 stable. This release includes bugfixes over Apache Tomcat 
6.0.13.


Apache Tomcat 6.0 includes new features over Apache Tomcat 5.5,
including support for the new Servlet 2.5 and JSP 2.1 specifications, a
refactored clustering implementation, advanced IO features, and
improvements in memory usage.

Please refer to the change log for the list of changes:
http://tomcat.apache.org/tomcat-6.0-doc/changelog.html

Downloads:
http://tomcat.apache.org/download-60.cgi

Migration guide from Apache Tomcat 5.5.x:
http://tomcat.apache.org/migration.html

Thank you,

-- The Apache Tomcat Team

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

DO NOT REPLY [Bug 43103] - tomcat stops automatically

[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=43103





--- Additional Comments From [EMAIL PROTECTED]  2007-08-13 09:30 ---
1. Can you provide a very simple test case demonstrating this behavior? Ideally
a war with source.

2. To clarify, is tomcat server is shutting down, leaving all servlets/jsps
inaccessible?

3. Also, you mention that you are using 5.0.28 - can you replicate this on later
versions of tomcat (eg. 5.5.23)?

-- 
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.
You are on the CC list for the bug, or are watching someone who is.

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

svn commit: r565420 - /tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml

[fhanik]

Author: fhanik
Date: Mon Aug 13 10:04:52 2007
New Revision: 565420

URL: http://svn.apache.org/viewvc?view=rev&rev=565420
Log:
Added in backup manager

Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml

Modified: 
tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml?view=diff&rev=565420&r1=565419&r2=565420
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml Mon 
Aug 13 10:04:52 2007
@@ -1,7 +1,7 @@
 
 http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd";>
+"-//Apache Software Foundation//DTD Model MBeans Configuration File"
+"http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd";>
 
   
 
 
 
 
 
 
 
   
-
+  
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  
+  
+
+
+  
+
+
+  
+
   
 



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

svn commit: r565432 - /tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml

[fhanik]

Author: fhanik
Date: Mon Aug 13 10:22:03 2007
New Revision: 565432

URL: http://svn.apache.org/viewvc?view=rev&rev=565432
Log:
backport from trunk

Modified:

tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml?view=diff&rev=565432&r1=565431&r2=565432
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml 
(original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml 
Mon Aug 13 10:22:03 2007
@@ -1,336 +1,550 @@
 
-
 http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd";>
+"-//Apache Software Foundation//DTD Model MBeans Configuration File"
+"http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd";>
 
-
-
-
-
-
-
-
-
-
-   
-
-
-
-
-   
-
-
-   
-
- 
-
-
-
-
-
-
-
-
-
-
-
-
-
-   
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  
-  
-
-
-
-  
+  
+
+
+
+
+
+
+
+  
+  
+
+
+  
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  
+  
 
-
-
-  
+
+  
 
-
-   
+
+  
 
-
-   
+
+
+
+
+  
+  
+
+
+
+
+
+
+
+
+
+  
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  
+  
 
-
-   
+
+  
 
-   
+
+  
 
-
   
-
 



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

svn commit: r565433 - /tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java

[fhanik]

Author: fhanik
Date: Mon Aug 13 10:23:04 2007
New Revision: 565433

URL: http://svn.apache.org/viewvc?view=rev&rev=565433
Log:
protect against a NPE when a member disappears

Modified:

tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?view=diff&rev=565433&r1=565432&r2=565433
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
 (original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
 Mon Aug 13 10:23:04 2007
@@ -511,7 +511,7 @@
 while (i.hasNext()) {
 Map.Entry e = (Map.Entry) i.next();
 MapEntry entry = (MapEntry) super.get(e.getKey());
-if ( entry.isSerializable() ) {
+if ( entry != null && entry.isSerializable() ) {
 boolean copy = (mapmsg.getMsgType() == 
mapmsg.MSG_STATE_COPY);
 MapMessage me = new MapMessage(mapContextName, 

copy?MapMessage.MSG_COPY:MapMessage.MSG_PROXY,
@@ -719,6 +719,7 @@
 while (i.hasNext()) {
 Map.Entry e = (Map.Entry) i.next();
 MapEntry entry = (MapEntry) super.get(e.getKey());
+if (entry==null) continue;
 if (entry.isPrimary() && inSet(member,entry.getBackupNodes())) {
 if (log.isDebugEnabled()) log.debug("[1] Primary choosing a 
new backup");
 try {
@@ -977,7 +978,7 @@
 while (i.hasNext()) {
 Map.Entry e = (Map.Entry) i.next();
 MapEntry entry = (MapEntry) super.get(e.getKey());
-if (entry.isPrimary() && value.equals(entry.getValue())) 
return true;
+if (entry!=null && entry.isPrimary() && 
value.equals(entry.getValue())) return true;
 }//while
 return false;
 }//end if
@@ -1062,7 +1063,7 @@
 while ( i.hasNext() ) {
 Map.Entry e = (Map.Entry)i.next();
 MapEntry entry = (MapEntry)super.get(e.getKey());
-if ( entry.isPrimary() && entry.getValue()!=null) 
values.add(entry.getValue());
+if (entry!=null && entry.isPrimary() && 
entry.getValue()!=null) values.add(entry.getValue());
 }
 return Collections.unmodifiableCollection(values);
 }



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

DO NOT REPLY [Bug 43094] - Allowing non-file based keystore and other providers

[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=43094


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |ASSIGNED




--- Additional Comments From [EMAIL PROTECTED]  2007-08-13 10:26 ---
Thanks for the patch, I will review it and possible extend it to the NIO
connector as well

-- 
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: r565463 - in /tomcat/container/tc5.5.x: catalina/src/share/org/apache/catalina/valves/ webapps/docs/

[pero]

Author: pero
Date: Mon Aug 13 11:12:51 2007
New Revision: 565463

URL: http://svn.apache.org/viewvc?view=rev&rev=565463
Log:
Improve large-file support (more then 4 Gb) at all AccessLogValves.

Modified:

tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/AccessLogValve.java

tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/ExtendedAccessLogValve.java

tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/FastCommonAccessLogValve.java

tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/JDBCAccessLogValve.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml

Modified: 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/AccessLogValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/AccessLogValve.java?view=diff&rev=565463&r1=565462&r2=565463
==
--- 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/AccessLogValve.java
 (original)
+++ 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/AccessLogValve.java
 Mon Aug 13 11:12:51 2007
@@ -120,7 +120,7 @@
  * Construct a new instance of this class with default property values.
  */
 public AccessLogValve() {
-
+
 super();
 setPattern("common");
 
@@ -599,8 +599,7 @@
 
 result.append(space);
 
-int length = response.getContentCount();
-
+long length = response.getCoyoteResponse().getBytesWritten() ;
 if (length <= 0)
 value = "-";
 else
@@ -805,13 +804,15 @@
 value = "127.0.0.1";
 }
 } else if (pattern == 'b') {
-int length = response.getContentCount();
+//int length = response.getContentCount();
+long length = response.getCoyoteResponse().getBytesWritten() ;
 if (length <= 0)
 value = "-";
 else
 value = "" + length;
 } else if (pattern == 'B') {
-value = "" + response.getContentLength();
+//value = "" + response.getContentLength();
+value = "" + response.getCoyoteResponse().getBytesWritten();
 } else if (pattern == 'h') {
 value = request.getRemoteHost();
 } else if (pattern == 'H') {

Modified: 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/ExtendedAccessLogValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/ExtendedAccessLogValve.java?view=diff&rev=565463&r1=565462&r2=565463
==
--- 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/ExtendedAccessLogValve.java
 (original)
+++ 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/ExtendedAccessLogValve.java
 Mon Aug 13 11:12:51 2007
@@ -584,7 +584,7 @@
 else if (FieldInfo.SPECIAL_TIME==fieldInfos[i].location)
 result.append(timeFormatter.format(date));
 else if (FieldInfo.SPECIAL_BYTES==fieldInfos[i].location) {
-int length = response.getContentCount();
+long length = 
response.getCoyoteResponse().getBytesWritten() ;
 if (length > 0)
 result.append(length);
 else
@@ -744,7 +744,7 @@
 FieldInfo.X_LOC_REQUESTEDSESSIONIDVALID) {
 return wrap(""+request.isRequestedSessionIdValid());
 } else if (fieldInfo.location==FieldInfo.X_LOC_CONTENTLENGTH) {
-return wrap(""+request.getContentLength());
+return 
wrap(""+request.getCoyoteRequest().getContentLengthLong());
 } else if (fieldInfo.location==
 FieldInfo.X_LOC_CHARACTERENCODING) {
 return wrap(request.getCharacterEncoding());

Modified: 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/FastCommonAccessLogValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/FastCommonAccessLogValve.java?view=diff&rev=565463&r1=565462&r2=565463
==
--- 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/FastCommonAccessLogValve.java
 (original)
+++ 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/FastCommonAccessLogValve.java
 Mon Aug 13 11:12:51 2007
@@ -523,8 +523,8 @@
 
 result.append(space);
 
-int length = response.getContentCount();
-
+long length = response.getCoyoteResponse().getB

svn commit: r565464 - in /tomcat/tc6.0.x/trunk/java/org/apache: catalina/connector/ catalina/startup/ coyote/ajp/ coyote/http11/ tomcat/util/ tomcat/util/digester/

[remm]

Author: remm
Date: Mon Aug 13 11:13:47 2007
New Revision: 565464

URL: http://svn.apache.org/viewvc?view=rev&rev=565464
Log:
- Experiment with reporting warnings for unmatched elements and attributes, 
based on Bill's ideas.
- The NIO HTTP protocol handler does not seem very reporting friendly at the 
moment.
- The change should be rather safe, if it causes problems that cannot be fixed 
easily I will revert it.

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Catalina.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Embedded.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/SetAllPropertiesRule.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/SetContextPropertiesRule.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProtocol.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Protocol.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/Digester.java

tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/SetPropertiesRule.java

tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/SetPropertyRule.java

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java?view=diff&rev=565464&r1=565463&r2=565464
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Connector.java Mon 
Aug 13 11:13:47 2007
@@ -318,6 +318,20 @@
 if (replacements.get(name) != null) {
 repl = (String) replacements.get(name);
 }
+if (!IntrospectionUtils.setProperty(protocolHandler, repl, value)) {
+log.warn("Property " + name + " not found on the protocol 
handler.");
+}
+}
+
+
+/**
+ * Set a configured property.
+ */
+public void setPropertyInternal(String name, String value) {
+String repl = name;
+if (replacements.get(name) != null) {
+repl = (String) replacements.get(name);
+}
 IntrospectionUtils.setProperty(protocolHandler, repl, value);
 }
 
@@ -388,7 +402,7 @@
 public void setAllowTrace(boolean allowTrace) {
 
 this.allowTrace = allowTrace;
-setProperty("allowTrace", String.valueOf(allowTrace));
+setPropertyInternal("allowTrace", String.valueOf(allowTrace));
 
 }
 
@@ -466,7 +480,7 @@
 public void setEmptySessionPath(boolean emptySessionPath) {
 
 this.emptySessionPath = emptySessionPath;
-setProperty("emptySessionPath", String.valueOf(emptySessionPath));
+setPropertyInternal("emptySessionPath", 
String.valueOf(emptySessionPath));
 
 }
 
@@ -489,7 +503,7 @@
 public void setEnableLookups(boolean enableLookups) {
 
 this.enableLookups = enableLookups;
-setProperty("enableLookups", String.valueOf(enableLookups));
+setPropertyInternal("enableLookups", String.valueOf(enableLookups));
 
 }
 
@@ -559,7 +573,7 @@
 public void setMaxSavePostSize(int maxSavePostSize) {
 
 this.maxSavePostSize = maxSavePostSize;
-setProperty("maxSavePostSize", String.valueOf(maxSavePostSize));
+setPropertyInternal("maxSavePostSize", 
String.valueOf(maxSavePostSize));
 }
 
 
@@ -581,7 +595,7 @@
 public void setPort(int port) {
 
 this.port = port;
-setProperty("port", String.valueOf(port));
+setPropertyInternal("port", String.valueOf(port));
 
 }
 
@@ -745,7 +759,7 @@
 
 if(proxyName != null && proxyName.length() > 0) {
 this.proxyName = proxyName;
-setProperty("proxyName", proxyName);
+setPropertyInternal("proxyName", proxyName);
 } else {
 this.proxyName = null;
 removeProperty("proxyName");
@@ -772,7 +786,7 @@
 public void setProxyPort(int proxyPort) {
 
 this.proxyPort = proxyPort;
-setProperty("proxyPort", String.valueOf(proxyPort));
+setPropertyInternal("proxyPort", String.valueOf(proxyPort));
 
 }
 
@@ -797,7 +811,7 @@
 public void setRedirectPort(int redirectPort) {
 
 this.redirectPort = redirectPort;
-setProperty("redirectPort", String.valueOf(redirectPort));
+setPropertyInternal("redirectPort", String.valueOf(redirectPort));
 
 }
 
@@ -846,7 +860,7 @@
 public void setSecure(boolean secure) {
 
 this.secure = secure;
-setProperty("secure", Boolean.toString(secure));
+setPropertyInternal("secure", Boole

svn commit: r565467 - /tomcat/container/tc5.5.x/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/ManagerServlet.java

[pero]

Author: pero
Date: Mon Aug 13 11:25:14 2007
New Revision: 565467

URL: http://svn.apache.org/viewvc?view=rev&rev=565467
Log:
remove useless copy and unused context.xml file reference.

Modified:

tomcat/container/tc5.5.x/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/ManagerServlet.java

Modified: 
tomcat/container/tc5.5.x/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/ManagerServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/ManagerServlet.java?view=diff&rev=565467&r1=565466&r2=565467
==
--- 
tomcat/container/tc5.5.x/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/ManagerServlet.java
 (original)
+++ 
tomcat/container/tc5.5.x/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/ManagerServlet.java
 Mon Aug 13 11:25:14 2007
@@ -625,14 +625,12 @@
 try {
 // Upload WAR
 uploadWar(request, localWar);
-// Copy WAR and XML to the host app base if needed
+// Copy WAR to the host app base if needed
 if (tag != null) {
 deployedPath = deployed;
 File localWarCopy = new File(deployedPath, basename + 
".war");
 copy(localWar, localWarCopy);
-localWar = localWarCopy;
-copy(localWar, new File(getAppBase(), basename + 
".war"));
-}
+ }
 // Perform new deployment
 check(path);
 } finally {
@@ -684,8 +682,6 @@
 
 // Find the local WAR file
 File localWar = new File(deployedPath, getDocBase(path) + ".war");
-// Find the local context deployment file (if any)
-File localXml = new File(configBase, getConfigFile(path) + ".xml");
 
 // Check if app already exists, or undeploy it if updating
 Context context = (Context) host.findChild(path);



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

svn commit: r565469 - in /tomcat/container/tc5.5.x: modules/cluster/src/share/org/apache/catalina/cluster/tcp/ webapps/docs/

[pero]

Author: pero
Date: Mon Aug 13 11:32:58 2007
New Revision: 565469

URL: http://svn.apache.org/viewvc?view=rev&rev=565469
Log:
Backport Tomcat 6 cluster socket parameter.

Modified:

tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ClusterReceiverBase.java

tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/DataSender.java

tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ReplicationListener.java

tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/SocketReplicationListener.java

tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/mbeans-descriptors.xml
tomcat/container/tc5.5.x/webapps/docs/changelog.xml

Modified: 
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ClusterReceiverBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ClusterReceiverBase.java?view=diff&rev=565469&r1=565468&r2=565469
==
--- 
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ClusterReceiverBase.java
 (original)
+++ 
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ClusterReceiverBase.java
 Mon Aug 13 11:32:58 2007
@@ -93,6 +93,16 @@
 
 private long lastChecked = System.currentTimeMillis();
 
+private int rxBufSize = 43800;
+private int txBufSize = 25188;
+private boolean tcpNoDelay = true;
+private boolean soKeepAlive = false;
+private boolean ooBInline = true;
+private boolean soReuseAddress = true;
+private boolean soLingerOn = true;
+private int soLingerTime = 3;
+private int soTrafficClass = 0x04 | 0x08 | 0x010;
+private int timeout = 3000; //3 seconds
 
 /**
  * Compress message data bytes
@@ -104,6 +114,146 @@
  */
 private ObjectName objectName;
 
+/**
+ * @return the ooBInline
+ */
+public boolean isOoBInline() {
+return ooBInline;
+}
+
+/**
+ * @param ooBInline the ooBInline to set
+ */
+public void setOoBInline(boolean ooBInline) {
+this.ooBInline = ooBInline;
+}
+
+/**
+ * @return the rxBufSize
+ */
+public int getRxBufSize() {
+return rxBufSize;
+}
+
+/**
+ * @param rxBufSize the rxBufSize to set
+ */
+public void setRxBufSize(int rxBufSize) {
+this.rxBufSize = rxBufSize;
+}
+
+/**
+ * @return the soKeepAlive
+ */
+public boolean isSoKeepAlive() {
+return soKeepAlive;
+}
+
+/**
+ * @param soKeepAlive the soKeepAlive to set
+ */
+public void setSoKeepAlive(boolean soKeepAlive) {
+this.soKeepAlive = soKeepAlive;
+}
+
+/**
+ * @return the soLingerOn
+ */
+public boolean isSoLingerOn() {
+return soLingerOn;
+}
+
+/**
+ * @param soLingerOn the soLingerOn to set
+ */
+public void setSoLingerOn(boolean soLingerOn) {
+this.soLingerOn = soLingerOn;
+}
+
+/**
+ * @return the soLingerTime
+ */
+public int getSoLingerTime() {
+return soLingerTime;
+}
+
+/**
+ * @param soLingerTime the soLingerTime to set
+ */
+public void setSoLingerTime(int soLingerTime) {
+this.soLingerTime = soLingerTime;
+}
+
+/**
+ * @return the soReuseAddress
+ */
+public boolean isSoReuseAddress() {
+return soReuseAddress;
+}
+
+/**
+ * @param soReuseAddress the soReuseAddress to set
+ */
+public void setSoReuseAddress(boolean soReuseAddress) {
+this.soReuseAddress = soReuseAddress;
+}
+
+/**
+ * @return the soTrafficClass
+ */
+public int getSoTrafficClass() {
+return soTrafficClass;
+}
+
+/**
+ * @param soTrafficClass the soTrafficClass to set
+ */
+public void setSoTrafficClass(int soTrafficClass) {
+this.soTrafficClass = soTrafficClass;
+}
+
+/**
+ * @return the tcpNoDelay
+ */
+public boolean isTcpNoDelay() {
+return tcpNoDelay;
+}
+
+/**
+ * @param tcpNoDelay the tcpNoDelay to set
+ */
+public void setTcpNoDelay(boolean tcpNoDelay) {
+this.tcpNoDelay = tcpNoDelay;
+}
+
+/**
+ * @return the timeout
+ */
+public int getTimeout() {
+return timeout;
+}
+
+/**
+ * @param timeout the timeout to set
+ */
+public void setTimeout(int timeout) {
+this.timeout = timeout;
+}
+
+/**
+ * @return the txBufSize
+ */
+public int getTxBufSize() {
+return txBufSize;
+}
+
+/**
+ * @param txBufSize the txBufSize to set
+ */
+public void setTxBufSize(int txBufSize) {
+this.txBufSize = txBufSize;
+}
+
 /**
  * @return Return

svn commit: r565470 - /tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java

[pero]

Author: pero
Date: Mon Aug 13 11:35:13 2007
New Revision: 565470

URL: http://svn.apache.org/viewvc?view=rev&rev=565470
Log:
Fix: only access time as debugging is enabled.

Modified:

tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java

Modified: 
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java?view=diff&rev=565470&r1=565469&r2=565470
==
--- 
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java
 (original)
+++ 
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java
 Mon Aug 13 11:35:13 2007
@@ -218,9 +218,12 @@
  * @param response current response
  */
 protected void handlePossibleTurnover(Request request, Response response) {
-Session session = request.getSessionInternal(false);
+Session session = request.getSessionInternal(false);   
 if (session != null) {
-long t1 = System.currentTimeMillis();
+long t1 = 0 ;
+if (log.isDebugEnabled()) {
+t1 = System.currentTimeMillis();
+}
 String jvmRoute = getLocalJvmRoute(request);
 if (jvmRoute == null) {
 if (log.isWarnEnabled())



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

Change request for Tomcat resources list

[Vivek Chopra]

Not sure what the procedure for this is (File a bug?),
but I would like to request an addition to the books
list at http://tomcat.apache.org/resources.html.

Professional Apache Tomcat 6 by by Vivek Chopra, Sing
Li, Jeff Genender
Wrox Press (August 2007)
ISBN: 0471753610

BTW Jeff is a Committer for Apache Geronimo, and is
also a PMC member.

Thanks,

- Vivek


  

Shape Yahoo! in your own image.  Join our Network Research Panel today!   
http://surveylink.yahoo.com/gmrs/yahoo_panel_invite.asp?a=7 



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

svn commit: r565477 - in /tomcat/site/trunk: docs/resources.html xdocs/resources.xml

[yoavs]

Author: yoavs
Date: Mon Aug 13 11:58:44 2007
New Revision: 565477

URL: http://svn.apache.org/viewvc?view=rev&rev=565477
Log:
Add a couple of links to resources.xml: Professional Apache Tomcat 6 book, and 
Filip's recent blog entry.

Modified:
tomcat/site/trunk/docs/resources.html
tomcat/site/trunk/xdocs/resources.xml

Modified: tomcat/site/trunk/docs/resources.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/resources.html?view=diff&rev=565477&r1=565476&r2=565477
==
--- tomcat/site/trunk/docs/resources.html (original)
+++ tomcat/site/trunk/docs/resources.html Mon Aug 13 11:58:44 2007
@@ -232,6 +232,13 @@
   
 
   
+http://blog.covalent.net/roller/covalent/entry/20070308";>
+ Can Servlet Containers Scale?  16,000 Concurrent Connections using 
Tomcat 6!
+, a performance
+ study and benchmark analysis by Filip Hanik.
+
+
+  
 So Much Static
 , a traffic and performance benchmark
   analysis by Peter Lin.
@@ -340,6 +347,14 @@
 http://www.amazon.com/exec/obidos/tg/detail/-/1861007736/ref=pd_sbs_b_1/002-9433156-6683214?v=glance&s=books";>Professional
 Apache Tomcat
 , by Chanoch Wiggers, Ben Galbraith, Vivek Chopra, Sing Li, Debashish 
Bhattacharjee, Amit Bakore, Romin Irani, Sandip Bhattacharya, Chad Fowler
   Wrox Press (09/2002)
+
+
+  
+http://www.amazon.com/Professional-Apache-Tomcat-WROX-Guides/dp/0471753610";>Professional
 Apache Tomcat 6
+, by by Vivek Chopra, Sing Li, Jeff Genender.
+  
+Wrox Press (August 2007)
+  ISBN: 0471753610
 
 
   

Modified: tomcat/site/trunk/xdocs/resources.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/resources.xml?view=diff&rev=565477&r1=565476&r2=565477
==
--- tomcat/site/trunk/xdocs/resources.xml (original)
+++ tomcat/site/trunk/xdocs/resources.xml Mon Aug 13 11:58:44 2007
@@ -32,6 +32,11 @@
 
   
 
+  http://blog.covalent.net/roller/covalent/entry/20070308";>
+ Can Servlet Containers Scale?  16,000 Concurrent Connections using 
Tomcat 6!, a performance
+ study and benchmark analysis by Filip Hanik.
+
+
   So Much Static, a 
traffic and performance benchmark
   analysis by Peter Lin.
 
@@ -94,6 +99,11 @@
 
   http://www.amazon.com/exec/obidos/tg/detail/-/1861007736/ref=pd_sbs_b_1/002-9433156-6683214?v=glance&s=books";>Professional
 Apache Tomcat, by Chanoch Wiggers, Ben Galbraith, Vivek Chopra, Sing 
Li, Debashish Bhattacharjee, Amit Bakore, Romin Irani, Sandip Bhattacharya, 
Chad Fowler
   Wrox Press (09/2002)
+
+
+  http://www.amazon.com/Professional-Apache-Tomcat-WROX-Guides/dp/0471753610";>Professional
 Apache Tomcat 6, by by Vivek Chopra, Sing Li, Jeff Genender.
+  Wrox Press (August 2007)
+  ISBN: 0471753610
 
 
   http://tomcatbook.sourceforge.net/";>Tomcat Book 
Project



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

Re: Change request for Tomcat resources list

[Yoav Shapira]

Hey,

On 8/13/07, Vivek Chopra <[EMAIL PROTECTED]> wrote:
> Not sure what the procedure for this is (File a bug?),
> but I would like to request an addition to the books
> list at http://tomcat.apache.org/resources.html.

I've added your book to the resources page.  The change will show up
on the live site during its next update: I believe the relevant rsync
job runs hourly.

The normal process for this is to file an issue in Bugzilla, yes,
though emailing [EMAIL PROTECTED] works also, as you can see ;)  It's mildly
amusing that the author of a book of Tomcat has to ask..

Yoav

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

DO NOT REPLY [Bug 42976] - Certain valid Content-Type headers are messed up before sending on the wire.

[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=42976





--- Additional Comments From [EMAIL PROTECTED]  2007-08-13 16:59 ---
Hi Dan,

(Not to make excuses for tomcat...)

I'm thinking that maybe your start-info parameter should just be  without the charset.

The XOP spec says:

The "start-info" parameter of the package's media type MUST contain the content 
type associated with the content's XML serialization. (i.e. it will contain the 
same value as the "type" parameter of the root part).


i.e.i.e. not the same as the Content-Type HTTP header.

The soap MTOM submission shows an example XML the supports this - see Table 2 
of .
Other random pages supporting the view:



Cheers

-- 
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: r565601 - /tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd

[markt]

Author: markt
Date: Mon Aug 13 18:27:51 2007
New Revision: 565601

URL: http://svn.apache.org/viewvc?view=rev&rev=565601
Log:
Fix bug 43102. Patch by Ben Hatton.

Modified:

tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd?view=diff&rev=565601&r1=565600&r2=565601
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd 
(original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd 
Mon Aug 13 18:27:51 2007
@@ -1,3 +1,4 @@
+
 
-
 
 
 

DO NOT REPLY [Bug 43102] - Invalid DTD - mbeans-descriptors.dtd

[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=43102


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2007-08-13 18:29 ---
Thanks for the patch. I used a tool to update a bunch of files and that commit
is still in my "to review" pile. I'll be checking the rest of the commit 
shortly.


-- 
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 43103] - tomcat stops automatically

[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=43103


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID




--- Additional Comments From [EMAIL PROTECTED]  2007-08-13 18:30 ---
Bugzilla is not a support forum. Please use the users list for help debugging
your application.

-- 
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.
You are on the CC list for the bug, or are watching someone who is.

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

svn commit: r565608 - /tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml

[markt]

Author: markt
Date: Mon Aug 13 18:59:56 2007
New Revision: 565608

URL: http://svn.apache.org/viewvc?view=rev&rev=565608
Log:
Add license header back in removed in previous commit.

Modified:

tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml?view=diff&rev=565608&r1=565607&r2=565608
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml 
(original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml 
Mon Aug 13 18:59:56 2007
@@ -1,4 +1,20 @@
 
+
 http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd";>



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

svn commit: r565612 - in /tomcat/site/trunk: docs/security-3.html docs/security-4.html docs/security-5.html docs/security-6.html xdocs/security-3.xml xdocs/security-4.xml xdocs/security-5.xml xdocs/se

[markt]

Author: markt
Date: Mon Aug 13 19:48:57 2007
New Revision: 565612

URL: http://svn.apache.org/viewvc?view=rev&rev=565612
Log:
Update the security pages with the 6.0.14 vulnerabilities

Modified:
tomcat/site/trunk/docs/security-3.html
tomcat/site/trunk/docs/security-4.html
tomcat/site/trunk/docs/security-5.html
tomcat/site/trunk/docs/security-6.html
tomcat/site/trunk/xdocs/security-3.xml
tomcat/site/trunk/xdocs/security-4.xml
tomcat/site/trunk/xdocs/security-5.xml
tomcat/site/trunk/xdocs/security-6.xml

Modified: tomcat/site/trunk/docs/security-3.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-3.html?view=diff&rev=565612&r1=565611&r2=565612
==
--- tomcat/site/trunk/docs/security-3.html (original)
+++ tomcat/site/trunk/docs/security-3.html Mon Aug 13 19:48:57 2007
@@ -239,6 +239,18 @@
 Affects: 3.0, 3.1-3.1.1, 3.2-3.2.4, 3.3a-3.3.2
 
 
+low: Session hi-jacking
+   http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-3382";>
+   CVE-2007-3382
+
+
+Tomcat incorrectly treated a single quote character (') in a cookie
+   value as a delimiter. In some circumstances this lead to the leaking of
+   information such as session ID to an attacker.
+
+Affects: 3.3-3.3.2
+
+
 low: Cross site scripting
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-3384";>
CVE-2007-3384
@@ -249,6 +261,19 @@
from the Tomcat 3 download page.
 
 Affects: 3.3-3.3.2
+
+
+low: Session hi-jacking
+   http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-3385";>
+   CVE-2007-3385
+
+
+Tomcat incorrectly handled the character sequence \" in a cookie value.
+   In some circumstances this lead to the leaking of information such as
+   session ID to an attacker.
+
+Affects: 3.3-3.3.2
+
   
 
 

Modified: tomcat/site/trunk/docs/security-4.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-4.html?view=diff&rev=565612&r1=565611&r2=565612
==
--- tomcat/site/trunk/docs/security-4.html (original)
+++ tomcat/site/trunk/docs/security-4.html Mon Aug 13 19:48:57 2007
@@ -321,6 +321,18 @@
 Affects: 4.0.1-4.0.6, 4.1.0-4.1.36
 
 
+low: Session hi-jacking
+   http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-3382";>
+   CVE-2007-3382
+
+
+Tomcat incorrectly treated a single quote character (') in a cookie
+   value as a delimiter. In some circumstances this lead to the leaking of
+   information such as session ID to an attacker.
+
+Affects: 4.1.0-4.1.36
+
+
 low: Cross-site scripting
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-3383";>
CVE-2007-3383
@@ -335,6 +347,19 @@

 
 Affects: 4.0.0-4.0.6, 4.1.0-4.1.36
+
+
+low: Session hi-jacking
+   http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-3385";>
+   CVE-2007-3385
+
+
+Tomcat incorrectly handled the character sequence \" in a cookie value.
+   In some circumstances this lead to the leaking of information such as
+   session ID to an attacker.
+
+Affects: 4.1.0-4.1.36
+
   
 
 

Modified: tomcat/site/trunk/docs/security-5.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-5.html?view=diff&rev=565612&r1=565611&r2=565612
==
--- tomcat/site/trunk/docs/security-5.html (original)
+++ tomcat/site/trunk/docs/security-5.html Mon Aug 13 19:48:57 2007
@@ -254,6 +254,41 @@
 
 Affects: 5.0.0-5.0.30, 5.5.0-5.5.24
 
+
+low: Session hi-jacking
+   http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-3382";>
+   CVE-2007-3382
+
+
+Tomcat incorrectly treated a single quote character (') in a cookie
+   value as a delimiter. In some circumstances this lead to the leaking of
+   information such as session ID to an attacker.
+
+Affects: 5.0.0-5.0.30, 5.5.0-5.5.24
+
+
+low: Session hi-jacking
+   http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-3385";>
+   CVE-2007-3385
+
+
+Tomcat incorrectly handled the character sequence \" in a cookie value.
+   In some circumstances this lead to the leaking of information such as
+   session ID to an attacker.
+
+Affects: 5.0.0-5.0.30, 5.5.0-5.5.24
+
+
+low: Cross-site scripting
+   http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-3386";>
+   CVE-2007-3386
+
+
+The Host Manager Servlet did not filter user supplied data before
+   display. This enabled an XSS attack.
+
+Affects: 5.5.0-5.5.24
+
   
 
 

Modified: tomcat/site/trunk/docs/security-6.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-6.html?view=diff&rev=565612&r1=565611&r2=565612
==
--- tomcat/site/trunk/docs/

DO NOT REPLY [Bug 43115] New: - Simple JSP fails to compile/load

[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=43115

   Summary: Simple JSP fails to compile/load
   Product: Tomcat 6
   Version: 6.0.14
  Platform: Other
OS/Version: Mac OS X 10.4
Status: NEW
  Severity: major
  Priority: P2
 Component: Jasper
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]


The jsp file is called x.jsp and contains just the word 'test'. It's the 
simplest possible
jsp one can imagine. It is saved with plain old us-ascii encoding.

Upon trying to load x.jsp, I get the following error:

org.apache.jasper.JasperException: Unable to compile class for JSP: 
An error occurred at line: 22 in the generated java file
The method getJspApplicationContext(ServletContext) is undefined for the type 
JspFactory

Stacktrace:
at 
org.apache.jasper.compiler.DefaultErrorHandler.javacError(DefaultErrorHandler.java:92)
at 
org.apache.jasper.compiler.ErrorDispatcher.javacError(ErrorDispatcher.java:330)
at 
org.apache.jasper.compiler.JDTCompiler.generateClass(JDTCompiler.java:423)
at org.apache.jasper.compiler.Compiler.compile(Compiler.java:308)
at org.apache.jasper.compiler.Compiler.compile(Compiler.java:286)
at org.apache.jasper.compiler.Compiler.compile(Compiler.java:273)
at 
org.apache.jasper.JspCompilationContext.compile(JspCompilationContext.java:566)
at 
org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper.java:317)
at 
org.apache.jasper.servlet.JspServlet.serviceJspFile(JspServlet.java:320)
at org.apache.jasper.servlet.JspServlet.service(JspServlet.java:266)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:802)
at 
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290)
at 
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)
at 
org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:233)
at 
org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:175)
at 
org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:128)
at 
org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:102)
at 
org.apache.catalina.valves.AccessLogValve.invoke(AccessLogValve.java:563)
at 
org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:109)
at 
org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:263)
at 
org.apache.coyote.http11.Http11AprProcessor.process(Http11AprProcessor.java:852)
at 
org.apache.coyote.http11.Http11AprProtocol$Http11ConnectionHandler.process(Http11AprProtocol.jav
a:584)
at 
org.apache.tomcat.util.net.AprEndpoint$Worker.run(AprEndpoint.java:1508)
at java.lang.Thread.run(Thread.java:613)
 

There is NO error with tomcat 5.5.23 for the exact same file.

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

CVE-2007-3382: Handling of cookies containing a ' character

[Mark Thomas]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

CVE-2007-3382: Handling of cookies containing a ' character

Severity:
Low (Session Hi-jacking)

Vendor:
The Apache Software Foundation

Versions Affected:
6.0.0 to 6.0.13
5.5.0 to 5.5.24
5.0.0 to 5.0.30
4.1.0 to 4.1.36
3.3 to 3.3.2

Description:
Tomcat incorrectly treats a single quote character (') in a cookie
value as a delimiter. In some circumstances this can lead to the
leaking of information such as session ID to an attacker.

Mitigation:
Upgrade to 6.0.14

Credit:
This issue was discovered by Tomasz Kuczynski, Poznan Supercomputing
and Networking Center, who worked with the CERT/CC to report the
vulnerability.

Example:
http://localost:8080/servlets-examples/servlet/CookieExample?cookiename=BLOCKER&cookievalue=%5C%22A%3D%27%3B+Expires%3DThu%2C+1+Jan+2009+00%3A00%3A01+UTC%3B+Path%3D%2Fservlets-examples%2Fservlet+%3B

References:
http://tomcat.apache.org/security.html

Mark Thomas


-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.7 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFGwSFVb7IeiTPGAkMRAjkwAKDnu+C08WRZazmZfzunFeHcitsvnACg3CtP
6c6FCxbFOcfxhqqayg8kdUI=
=MkDj
-END PGP SIGNATURE-

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

CVE-2007-3385: Handling of \" in cookies

[Mark Thomas]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

CVE-2007-3385: Handling of \" in cookies

Severity:
Low (Session Hi-jacking)

Vendor:
The Apache Software Foundation

Versions Affected:
6.0.0 to 6.0.13
5.5.0 to 5.5.24
5.0.0 to 5.0.30
4.1.0 to 4.1.36
3.3 to 3.3.2

Description:
Tomcat incorrectly handles the character sequence \" in a cookie
value. In some circumstances this can lead to the leaking of
information such as session ID to an attacker.

Mitigation:
Upgrade to 6.0.14

Credit:
This issue was discovered by Tomasz Kuczynski, Poznan Supercomputing
and Networking Center, who worked with the CERT/CC to report the
vulnerability.

Example:
http://localhost:8080/examples/servlets/servlet/CookieExample?cookiename=HAHA&cookievalue=%5C%22FOO%3B+Expires%3DThu%2C+1+Jan+2009+00%3A00%3A01+UTC%3B+Path%3D%2F%3B

References:
http://tomcat.apache.org/security.html


-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.7 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFGwSFlb7IeiTPGAkMRArdPAJ99AXYzSterU7oG+u8UrtQAd2lTZwCbBK2R
hwRixKaYOwWyj5kD+fLT1ls=
=hgTP
-END PGP SIGNATURE-

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

CVE-2007-3386: XSS in Host Manager

[Mark Thomas]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

CVE-2007-3386: XSS in Host Manager

Severity:
Low (Cross-site scripting)

Vendor:
The Apache Software Foundation

Versions Affected:
6.0.0 to 6.0.13
5.5.0 to 5.5.24

Description:
The Host Manager Servlet does not filter user supplied data before
display. This enables an XSS attack.

Mitigation:
Log out (close browser) of the Host Manager application once admin
tasks are complete
Upgrade to 6.0.14

Credit:
This issue was discovered by the NTT OSS CENTER who worked with the
JPCERT/CC to report the vulnerability.

Example:
http://localhost:8080/host-manager/html/add"; method="get">





References:
http://tomcat.apache.org/security.html


-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.7 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFGwSFyb7IeiTPGAkMRAlgMAKCe0hS+c6so9pxK3KfN7LggWv+3uQCfUsAg
95+vMfHDJlrKHP/yKUZ0SYc=
=1pQc
-END PGP SIGNATURE-

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