On 26/01/2012 23:15, Mark Thomas wrote:
> Good news. The WebSocket implementation has reached a state where you
> should be able to play with it. Receiving and sending of binary and text
> data via streams/writers and messages is all working as long as you
> don't use continuation frames. See the Echo example for the general idea.

Some minor tweaks and clean-up [1]. Main improvement is that now if you
write more data than the buffer can handle it doesn't fall over.

> I'm leaning towards committing this
> on the grounds that it changes very little of the existing code and -
> fingers crossed - it should stay that way. It will be easier for the
> wider community to experiment and provide patches once it is in trunk. I
> expect that the back-port to 7.0.x will wait until things were more
> feature complete and any obvious performance issues had been addressed.

No-one has complained about this (yet) so I'll probably commit this some
time next week.

> Anyway, I hope you enjoy playing with this. As always, feedback welcome.

Mark

[1] http://people.apache.org/~markt/patches/draft/2012-01-27-websocket.patch

The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot.
Full details are available at:
http://ci.apache.org/builders/tomcat-trunk/builds/2681

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-vm_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch tomcat/trunk] 1236914
Blamelist: markt

BUILD FAILED: failed compile_1

sincerely,
-The Buildbot

To whom it may engage...
   
This is an automated request, but not an unsolicited one. For
more information please visit http://gump.apache.org/nagged.html,
and/or contact the folk at general@(protected).

Project tomcat-trunk-test has an issue affecting its community integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
  - tomcat-trunk-test : Tomcat 8.x, a web server implementing Java Servlet 3.1,
  ...


Full details are available at:
  http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were provided:
-DEBUG- Dependency on tomcat-trunk-dbcp exists, no need to add for property tomcat-dbcp-src.jar.
-DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz.
-DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz.
-DEBUG- Dependency on tomcat-trunk-dbcp exists, no need to add for property tomcat-dbcp.home.
-INFO- Failed with reason build failed
-INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/build/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/gump_work/build_tomcat-trunk_tomcat-trunk-test.html
Work Name: build_tomcat-trunk_tomcat-trunk-test (Type: Build)
Work ended in a state of : Failed
Elapsed: 20 mins 28 secs
Command Line: /usr/lib/jvm/java-6-openjdk/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/dist/junit-28012012.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-28012012-native-src.tar.gz -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-28012012-native-src.tar.gz -Dexamples.sources.skip=true -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps -Djdt.jar=/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-28012012.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-src.jar -Dtest.accesslog=true -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dcommons-dbcp.home=/
srv/gump/public/workspace/commons-dbcp-1.x -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-28012012.jar test
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: /usr/lib/jvm/java-6-openjdk/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.jar:/srv/gump/public/workspace/tomcat-trunk/outp
ut/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-util.jar:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/packages/jaf-1.1ea/activation.jar:/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar:/srv/gump/public/workspace/tomcat-tr
unk/tomcat-deps/tomcat-dbcp-28012012.jar:/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-28012012.jar:/srv/gump/public/workspace/junit/dist/junit-28012012.jar
---------------------------------------------
  [junit] Jan 28, 2012 3:54:01 AM org.apache.catalina.startup.ContextConfig getDefaultWebXmlFragment
  [junit] INFO: No global web.xml found
  [junit] Jan 28, 2012 3:54:01 AM org.apache.catalina.core.ApplicationContext log
  [junit] INFO: ContextListener: contextInitialized()
  [junit] Jan 28, 2012 3:54:01 AM org.apache.catalina.core.ApplicationContext log
  [junit] INFO: SessionListener: contextInitialized()
  [junit] Tests run: 2, Failures: 0, Errors: 0, Time elapsed: 2.887 sec
  [junit] Jan 28, 2012 3:54:01 AM org.apache.catalina.core.ApplicationContext log
  [junit] INFO: ContextListener: attributeAdded('org.apache.jasper.compiler.TldLocationsCache', 'org.apache.jasper.compiler.TldLocationsCache@(protected)')
  [junit] Jan 28, 2012 3:54:01 AM org.apache.coyote.AbstractProtocol start
  [junit] INFO: Starting ProtocolHandler ["http-nio-127.0.0.1-auto-2"]
  [junit] Jan 28, 2012 3:54:01 AM org.apache.tomcat.util.net.NioSelectorPool getSharedSelector
  [junit] INFO: Using a shared selector for servlet write/read
  [junit] Jan 28, 2012 3:54:01 AM org.apache.coyote.AbstractProtocol stop
  [junit] INFO: Stopping ProtocolHandler ["http-nio-127.0.0.1-auto-2"]
  [junit] Jan 28, 2012 3:54:01 AM org.apache.coyote.AbstractProtocol start
  [junit] INFO: Starting ProtocolHandler ["http-nio-127.0.0.1-auto-2"]
  [junit] Jan 28, 2012 3:54:01 AM org.apache.tomcat.util.net.NioSelectorPool getSharedSelector
  [junit] INFO: Using a shared selector for servlet write/read
  [junit] Jan 28, 2012 3:54:01 AM org.apache.coyote.AbstractProtocol pause
  [junit] INFO: Pausing ProtocolHandler ["http-nio-127.0.0.1-auto-2"]
  [junit] Jan 28, 2012 3:54:01 AM org.apache.catalina.core.StandardService stopInternal
  [junit] INFO: Stopping service Tomcat
  [junit] Jan 28, 2012 3:54:01 AM org.apache.catalina.core.ApplicationContext log
  [junit] INFO: SessionListener: contextDestroyed()
  [junit] Jan 28, 2012 3:54:01 AM org.apache.catalina.core.ApplicationContext log
  [junit] INFO: ContextListener: contextDestroyed()
  [junit] Jan 28, 2012 3:54:01 AM org.apache.coyote.AbstractProtocol stop
  [junit] INFO: Stopping ProtocolHandler ["http-nio-127.0.0.1-auto-2"]
  [junit] Jan 28, 2012 3:54:01 AM org.apache.coyote.AbstractProtocol destroy
  [junit] INFO: Destroying ProtocolHandler ["http-nio-127.0.0.1-auto-2"]
  [junit] Running org.apache.tomcat.util.res.TestStringManager
  [junit] Tests run: 2, Failures: 0, Errors: 0, Time elapsed: 0.021 sec
  [junit] Running org.apache.tomcat.util.scan.TestJarScanner
  [junit] Tests run: 1, Failures: 0, Errors: 0, Time elapsed: 0.262 sec
  [junit] Jan 28, 2012 3:54:03 AM org.apache.coyote.AbstractProtocol destroy
  [junit] INFO: Destroying ProtocolHandler ["http-nio-127.0.0.1-auto-1"]
  [junit] Running org.apache.tomcat.util.threads.TestLimitLatch
  [junit] Tests run: 5, Failures: 0, Errors: 0, Time elapsed: 2.432 sec

test-apr-exists:

test-apr:

test:

BUILD FAILED
/srv/gump/public/workspace/tomcat-trunk/build.xml:1081: Some tests completed with a Failure. See /srv/gump/public/workspace/tomcat-trunk/output/build/logs for details, search for "FAILED".

Total time: 20 minutes 27 seconds
---------------------------------------------

To subscribe to this information via syndicated feeds:
- RSS: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/rss.xml
- Atom: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/atom.xml

============================== Gump Tracking Only ===
Produced by Apache Gump(TM) version 2.3.
Gump Run 12000028012012, vmgump.apache.org:vmgump:12000028012012
Gump E-mail Identifier (unique within run) #26.

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

https://issues.apache.org/bugzilla/show_bug.cgi?id=52548

        Bug #: 52548
      Summary: service.bat fails to set catalina.base and
            catalina.home due to apparent procrun bug
      Product: Tomcat 7
      Version: 7.0.25
      Platform: PC
       Status: NEW
      Severity: minor
      Priority: P2
     Component: Integration
    AssignedTo: dev@(protected)
    ReportedBy: chuck.caldarale@(protected)
  Classification: Unclassified


Created attachment 28221
--> https://issues.apache.org/bugzilla/attachment.cgi?id=28221
diff -u patch for service.bat against 7.0.25

It appears that procrun 1.0.8 is not handling ++JvmOptions properly, instead
treating it as --JvmOptions. This results in only the last use of JvmOptions
being retained in the registry, causing the settings for catalina.base and
catalina.home to be lost when applied by the service.bat script. Attached is a
diff -u patch for service.bat 7.0.25 to work around the problem; it has the
unfortunate effect of making the lines rather long.

--
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.

Author: markt
Date: Sat Jan 28 19:40:43 2012
New Revision: 1237146

URL: http://svn.apache.org/viewvc?rev=1237146&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52543
Provide a meaningful error message when writing more response headers
than permitted

Modified:
  tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
  tomcat/trunk/java/org/apache/coyote/http11/LocalStrings.properties

Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java?rev=1237146&r1=1237145&r2=1237146&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java Sat Jan 28 19:40:43 2012
@@(protected)

     // Writing the byte chunk to the output buffer
     int length = bc.getLength();
+     checkLengthBeforeWrite(length);
     System.arraycopy(bc.getBytes(), bc.getStart(), buf, pos, length);
     pos = pos + length;

@@(protected)

     int start = cc.getStart();
     int end = cc.getEnd();
+     checkLengthBeforeWrite(end-start);
     char[] cbuf = cc.getBuffer();
     for (int i = start; i < end; i++) {
        char c = cbuf[i];
@@(protected)
   * @param b data to be written
   */
  public void write(byte[] b) {
+     checkLengthBeforeWrite(b.length);

     // Writing the byte chunk to the output buffer
     System.arraycopy(b, 0, buf, pos, b.length);
@@(protected)

     // From the Tomcat 3.3 HTTP/1.0 connector
     int len = s.length();
+     checkLengthBeforeWrite(len);
     for (int i = 0; i < len; i++) {
        char c = s.charAt (i);
        // Note: This is clearly incorrect for many strings,
@@(protected)
  }


+   /**
+   * Checks to see if there is enough space in the buffer to write the
+   * requested number of bytes.
+   */
+   private void checkLengthBeforeWrite(int length)
+        throws IllegalStateException {
+     if (pos + length > buf.length) {
+        throw new IllegalStateException(
+             sm.getString("iob.responseheadertoolarge.error"));
+     }
+   }
+
}

Modified: tomcat/trunk/java/org/apache/coyote/http11/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/LocalStrings.properties?rev=1237146&r1=1237145&r2=1237146&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/LocalStrings.properties Sat Jan 28 19:40:43 2012
@@(protected) [
iib.invalidmethod=Invalid character (CR or LF) found in method name
iib.parseheaders.ise.error=Unexpected state: headers already parsed. Buffer not recycled?
iib.requestheadertoolarge.error=Request header is too large
+
+iob.responseheadertoolarge.error=An attempt was made to write more data to the response headers than there was room available in the buffer. Increase maxHttpHeaderSize on the connector or write less data into the response headers.

Author: markt
Date: Sat Jan 28 19:43:06 2012
New Revision: 1237147

URL: http://svn.apache.org/viewvc?rev=1237147&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52543
Provide a meaningful error message when writing more response headers
than permitted

Modified:
  tomcat/tc7.0.x/trunk/  (props changed)
  tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
  tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/LocalStrings.properties
  tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 28 19:43:06 2012
@@(protected) @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
,1173241,1173256,1173288,1173333,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187
381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,1199996,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1
201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,1222201,1222276,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,123129
0,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1232869,1233413,1233423,1233426,1234143,1234567,1235207,1236906-1236907,1236914
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
,1173241,1173256,1173288,1173333,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187
381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,1199996,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1
201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,1222201,1222276,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,123129
0,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1232869,1233413,1233423,1233426,1234143,1234567,1235207,1236906-1236907,1236914,1237146

Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java?rev=1237147&r1=1237146&r2=1237147&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java Sat Jan 28 19:43:06 2012
@@(protected)

     // Writing the byte chunk to the output buffer
     int length = bc.getLength();
+     checkLengthBeforeWrite(length);
     System.arraycopy(bc.getBytes(), bc.getStart(), buf, pos, length);
     pos = pos + length;

@@(protected)

     int start = cc.getStart();
     int end = cc.getEnd();
+     checkLengthBeforeWrite(end-start);
     char[] cbuf = cc.getBuffer();
     for (int i = start; i < end; i++) {
        char c = cbuf[i];
@@(protected)
   * @param b data to be written
   */
  public void write(byte[] b) {
+     checkLengthBeforeWrite(b.length);

     // Writing the byte chunk to the output buffer
     System.arraycopy(b, 0, buf, pos, b.length);
@@(protected)

     // From the Tomcat 3.3 HTTP/1.0 connector
     int len = s.length();
+     checkLengthBeforeWrite(len);
     for (int i = 0; i < len; i++) {
        char c = s.charAt (i);
        // Note: This is clearly incorrect for many strings,
@@(protected)
  }


+   /**
+   * Checks to see if there is enough space in the buffer to write the
+   * requested number of bytes.
+   */
+   private void checkLengthBeforeWrite(int length)
+        throws IllegalStateException {
+     if (pos + length > buf.length) {
+        throw new IllegalStateException(
+             sm.getString("iob.responseheadertoolarge.error"));
+     }
+   }
+
}

Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/LocalStrings.properties?rev=1237147&r1=1237146&r2=1237147&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/LocalStrings.properties (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/LocalStrings.properties Sat Jan 28 19:43:06 2012
@@(protected) [
iib.invalidmethod=Invalid character (CR or LF) found in method name
iib.parseheaders.ise.error=Unexpected state: headers already parsed. Buffer not recycled?
iib.requestheadertoolarge.error=Request header is too large
+
+iob.responseheadertoolarge.error=An attempt was made to write more data to the response headers than there was room available in the buffer. Increase maxHttpHeaderSize on the connector or write less data into the response headers.

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1237147&r1=1237146&r2=1237147&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sat Jan 28 19:43:06 2012
@@(protected) @@
    </fix>
  </changelog>
 </subsection>
+ <subsection name="Coyote">
+   <changelog>
+    <add>
+     <bug>51543</bug>: Provide a meaningful error message when writing more
+     response headers than permitted. (markt)
+    </add>
+   </changelog>
+ </subsection>
 <subsection name="Jasper">
  <changelog>
    <fix>

https://issues.apache.org/bugzilla/show_bug.cgi?id=52543

Mark Thomas <markt@(protected):

      What   |Removed              |Added
----------------------------------------------------------------------------
        Status|REOPENED             |RESOLVED
     Resolution|                   |FIXED

--- Comment #4 from Mark Thomas <markt@(protected) ---
Fixed in trunk and 7.0.x and will be included in 7.0.26 onwards.

--
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.

https://issues.apache.org/bugzilla/show_bug.cgi?id=52545

Mark Thomas <markt@(protected):

      What   |Removed              |Added
----------------------------------------------------------------------------
        Status|NEW                 |RESOLVED
     Resolution|                   |INVALID
     OS/Version|                   |All

--- Comment #1 from Mark Thomas <markt@(protected) ---
The following test surrounds the annotation scanning:
if (webXml.getMajorVersion() >= 3) {
...
}
and a 2.4 web-app (the JSP examples from Tomcat 5.5) reports a major version o2
so no scanning will take place.

--
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.

The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot.
Full details are available at:
http://ci.apache.org/builders/tomcat-trunk/builds/2682

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-vm_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch tomcat/trunk] 1237146
Blamelist: markt

Build succeeded!

sincerely,
-The Buildbot

Author: markt
Date: Sat Jan 28 20:28:18 2012
New Revision: 1237154

URL: http://svn.apache.org/viewvc?rev=1237154&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52547
Ensure byteCount is reset at the end of a HTTP 1.0 request

Modified:
  tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java

Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java?rev=1237154&r1=1237153&r2=1237154&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java Sat Jan 28 20:28:18 2012
@@(protected)
     lastActiveFilter = -1;
     committed = false;
     finished = false;
-
+     byteCount = 0;
  }

  /**

Author: markt
Date: Sat Jan 28 20:28:57 2012
New Revision: 1237155

URL: http://svn.apache.org/viewvc?rev=1237155&view=rev
Log:
Re-ordering. Align recycle() and nextRequest()

Modified:
  tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java

Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java?rev=1237155&r1=1237154&r2=1237155&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java Sat Jan 28 20:28:57 2012
@@(protected)
     for (int i = 0; i <= lastActiveFilter; i++) {
        activeFilters[i].recycle();
     }
-     // Recycle Request object
+     // Recycle response object
     response.recycle();
+     // Reset pointers
     pos = 0;
     lastActiveFilter = -1;
     committed = false;
@@(protected)
   * to parse the next HTTP request.
   */
  public void nextRequest() {
-
-     // Recycle Request object
-     response.recycle();
     // Recycle filters
     for (int i = 0; i <= lastActiveFilter; i++) {
        activeFilters[i].recycle();
     }
-
+     // Recycle response object
+     response.recycle();
     // Reset pointers
     pos = 0;
     lastActiveFilter = -1;

Author: markt
Date: Sat Jan 28 20:29:37 2012
New Revision: 1237156

URL: http://svn.apache.org/viewvc?rev=1237156&view=rev
Log:
Refactor to reduce duplicate code

Modified:
  tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
  tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java

Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java?rev=1237156&r1=1237155&r2=1237156&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java Sat Jan 28 20:29:37 2012
@@(protected)
   * connection.
   */
  public void recycle() {
-     // Recycle filters
-     for (int i = 0; i <= lastActiveFilter; i++) {
-        activeFilters[i].recycle();
-     }
-     // Recycle response object
-     response.recycle();
-     // Reset pointers
-     pos = 0;
-     lastActiveFilter = -1;
-     committed = false;
-     finished = false;
-     byteCount = 0;
+     // Sub-classes may wish to do more than this.
+     nextRequest();
  }

  /**

Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java?rev=1237156&r1=1237155&r2=1237156&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java Sat Jan 28 20:29:37 2012
@@(protected)
  @Override
  public void recycle() {
     super.recycle();
-     socketBuffer.recycle();
     outputStream = null;
  }

Author: markt
Date: Sat Jan 28 20:34:00 2012
New Revision: 1237158

URL: http://svn.apache.org/viewvc?rev=1237158&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52547
Ensure byteCount is reset at the end of a HTTP 1.0 request
Refactor to reduce duplicate code

Modified:
  tomcat/tc7.0.x/trunk/  (props changed)
  tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
  tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java
  tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 28 20:34:00 2012
@@(protected) @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
,1173241,1173256,1173288,1173333,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187
381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,1199996,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1
201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,1222201,1222276,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,123129
0,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1232869,1233413,1233423,1233426,1234143,1234567,1235207,1236906-1236907,1236914,1237146
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
,1173241,1173256,1173288,1173333,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187
381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,1199996,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1
201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,1222201,1222276,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,123129
0,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1232869,1233413,1233423,1233426,1234143,1234567,1235207,1236906-1236907,1236914,1237146,1237154-1237156

Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java?rev=1237158&r1=1237157&r2=1237158&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java Sat Jan 28 20:34:00 2012
@@(protected)
   * connection.
   */
  public void recycle() {
-     // Recycle filters
-     for (int i = 0; i <= lastActiveFilter; i++) {
-        activeFilters[i].recycle();
-     }
-     // Recycle Request object
-     response.recycle();
-     pos = 0;
-     lastActiveFilter = -1;
-     committed = false;
-     finished = false;
-
+     // Sub-classes may wish to do more than this.
+     nextRequest();
  }
 
  /**
@@(protected)
   * to parse the next HTTP request.
   */
  public void nextRequest() {
-
-     // Recycle Request object
-     response.recycle();
     // Recycle filters
     for (int i = 0; i <= lastActiveFilter; i++) {
        activeFilters[i].recycle();
     }
-
+     // Recycle response object
+     response.recycle();
     // Reset pointers
     pos = 0;
     lastActiveFilter = -1;

Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java?rev=1237158&r1=1237157&r2=1237158&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java Sat Jan 28 20:34:00 2012
@@(protected)
  @Override
  public void recycle() {
     super.recycle();
-     socketBuffer.recycle();
     outputStream = null;
  }


Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1237158&r1=1237157&r2=1237158&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sat Jan 28 20:34:00 2012
@@(protected) @@
     <bug>51543</bug>: Provide a meaningful error message when writing more
     response headers than permitted. (markt)
    </add>
+    <fix>
+     <bug>52547</bug>: Ensure that bytes written (which is used by the access
+     log) is correctly reset after an HTTP 1.0 request has been processed.
+     (markt)
+    </fix>
+    <scode>
+     Minor refactoring to reduce code duplication in the HTTP connectors.
+     (markt)
+    </scode>
  </changelog>
 </subsection>
 <subsection name="Jasper">

https://issues.apache.org/bugzilla/show_bug.cgi?id=52547

Mark Thomas <markt@(protected):

      What   |Removed              |Added
----------------------------------------------------------------------------
        Status|NEW                 |RESOLVED
     Resolution|                   |FIXED

--- Comment #1 from Mark Thomas <markt@(protected) ---
Thanks for the report and the analysis. It appears that there is some code
duplicated between recycle() and nextRequest() (nextRequest is a sub-set) so I
also did a little refactoring. I'm always happy to reduce the number of lines
of code we have to maintain.

The fix has been made to trunk and 7.0.x and will be included in 7.0.26
onwards.

--
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.

https://issues.apache.org/bugzilla/show_bug.cgi?id=52548

Mark Thomas <markt@(protected):

      What   |Removed              |Added
----------------------------------------------------------------------------
Attachment #28221|0                  |1
      is patch|                   |
Attachment #28221|application/octet-stream   |text/plain
      mime type|                   |

--
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.

https://issues.apache.org/bugzilla/show_bug.cgi?id=52548

Mark Thomas <markt@(protected):

      What   |Removed              |Added
----------------------------------------------------------------------------
     OS/Version|                   |All

--- Comment #1 from Mark Thomas <markt@(protected) ---
Thanks for the analysis and the patch.

https://issues.apache.org/jira/browse/DAEMON-237 has been raised for the
procrun bug. If that doesn't get fixed before the next 7.0.x release we'll go
with the patch provided.

--
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.

+---------------------------------------------------------------------------+
| Bugzilla Bug ID                                       |
|   +---------------------------------------------------------------------+
|   | Status: UNC=Unconfirmed NEW=New      ASS=Assigned           |
|   |      OPN=Reopened   VER=Verified   (Skipped Closed/Resolved)  |
|   |  +-----------------------------------------------------------------+
|   |  | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major  |
|   |  |       MIN=Minor  NOR=Normal   ENH=Enhancement TRV=Trivial |
|   |  |  +-------------------------------------------------------------+
|   |  |  | Date Posted                                 |
|   |  |  |       +--------------------------------------------------+
|   |  |  |       | Description                         |
|   |  |  |       |                                 |
|38193|Ass|Enh|2006-01-09|[RDC] BuiltIn Grammar support for Field       |
|38600|Ass|Enh|2006-02-10|[RDC] Enable RDCs to be used in X+V markup (X+RDC)|
|42413|New|Enh|2007-05-14|[PATCH] Log Taglib enhancements             |
|46052|New|Nor|2008-10-21|SetLocaleSupport is slow to initialize when many l|
|48333|New|Enh|2009-12-02|TLD generator                         |
|50825|New|Nor|2011-02-24|Site still has links to Jakarta for mailing lists |
|51234|New|Nor|2011-05-20|NumberFormatException in fmt:formatNumber tag   |
|51382|New|Blk|2011-06-15|Link to download pages are broken           |
+-----+---+---+----------+--------------------------------------------------+
| Total   8 bugs                                       |
+---------------------------------------------------------------------------+

+---------------------------------------------------------------------------+
| Bugzilla Bug ID                                       |
|   +---------------------------------------------------------------------+
|   | Status: UNC=Unconfirmed NEW=New      ASS=Assigned           |
|   |      OPN=Reopened   VER=Verified   (Skipped Closed/Resolved)  |
|   |  +-----------------------------------------------------------------+
|   |  | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major  |
|   |  |       MIN=Minor  NOR=Normal   ENH=Enhancement TRV=Trivial |
|   |  |  +-------------------------------------------------------------+
|   |  |  | Date Posted                                 |
|   |  |  |       +--------------------------------------------------+
|   |  |  |       | Description                         |
|   |  |  |       |                                 |
|41679|New|Enh|2007-02-22|SemaphoreValve should be able to filter on url pat|
|41883|Ass|Enh|2007-03-18|use abstract wrapper instead of plain X509Certific|
|43001|New|Enh|2007-07-30|JspC lacks setMappedFile and setDie for use in Ant|
|43400|New|Enh|2007-09-14|enum support for tag libs                 |
|43548|Opn|Enh|2007-10-04|xml schema for tomcat-users.xml             |
|43682|New|Enh|2007-10-23|JULI: web-inf/classes/logging.properties to suppor|
|43742|New|Enh|2007-10-30|.tag compiles performed one at a time -- extremel|
|43979|New|Enh|2007-11-27|Add abstraction for Java and Classfile output   |
|44199|New|Enh|2008-01-10|expose current backlog queue size           |
|44225|New|Enh|2008-01-14|SSL connector tries to load the private keystore f|
|44284|New|Enh|2008-01-23|Support java.lang.Iterable in c:forEach tag     |
|44294|New|Enh|2008-01-25|Support for EL functions with varargs         |
|44312|New|Enh|2008-01-28|Warn when overwritting docBase of the default Host|
|44645|New|Enh|2008-03-20|[Patch] JNDIRealm - Doesn't support JNDI "java.nam|
|44787|New|Enh|2008-04-09|provide more error context on "java.lang.IllegalSt|
|44818|New|Enh|2008-04-13|tomcat hangs with GET when content-length is defin|
|45014|New|Enh|2008-05-15|Request and Response classes should have wrappers |
|45282|New|Enh|2008-06-25|NioReceiver doesn't close cleanly, leaving sockets|
|45428|New|Enh|2008-07-18|warn if the tomcat stop doesn't complete       |
|45832|New|Enh|2008-09-18|add DIGEST authentication support to Ant tasks   |
|45878|New|Enh|2008-09-24|Generated jars do not contain proper manifests or |
|45879|Opn|Enh|2008-09-24|Windows installer fails to install NOTICE and RELE|
|45931|Opn|Enh|2008-10-01|trimSpaces incorrectly modifies output        |
|45995|New|Enh|2008-10-13|RFE - MIME type extension not case sensitive    |
|46173|New|Enh|2008-11-09|Small patch for manager app: Setting an optional c|
|46263|New|Enh|2008-11-21|Tomcat reloading of context does not update contex|
|46284|New|Enh|2008-11-24|Add flag to DeltaManager that blocks processing cl|
|46350|New|Enh|2008-12-05|Maven repository should contain source bundles   |
|46497|New|Enh|2009-01-08|Install Tomcat Deployer/ANT on Windows Platform  |
|46655|New|Enh|2009-02-03|keystore's password handler               |
|46727|New|Enh|2009-02-17|DefaultServlet - serving multiple encodings     |
|46902|New|Enh|2009-03-24|LoginValve to bypass restrictions of j_security_ch|
|47214|New|Enh|2009-05-17|Inner classes that are explicitly referenced - sho|
|47242|New|Enh|2009-05-22|request for AJP command line client          |
|47281|New|Enh|2009-05-28|Efficiency of the JDBCStore               |
|47407|New|Enh|2009-06-23|HttpSessionListener doesn't operate in the session|
|47467|New|Enh|2009-07-02|Deployment of the war file by URL when contextpath|
|47785|Opn|Enh|2009-09-04|Cluster MBean not registered               |
|47834|New|Enh|2009-09-14|TldConfig throws Exception when exploring unpacked|
|47919|New|Enh|2009-09-30|Log Tomcat & Java environment variables in additio|
|48358|Opn|Enh|2009-12-09|JSP-unloading reloaded                   |
|48543|New|Enh|2010-01-14|[Patch] More flexibility in specifying -Dcatalina.|
|48600|Opn|Enh|2010-01-22|Performance issue with tags               |
|48672|New|Enh|2010-02-03|Tomcat Virtual Host Manager (/host-manager) have b|
|48674|New|Enh|2010-02-03|Tomcat Virtual Host Manager application doesn't pe|
|48743|New|Enh|2010-02-15|Make the SLEEP variable in catalina.sh settable fr|
|48899|New|Enh|2010-03-12|Guess URI charset should solve lot of problems   |
|48922|New|Enh|2010-03-16|org.apache.catalina.connector.Request clone static|
|48928|New|Enh|2010-03-17|An alternative solution to preloading classes when|
|49161|New|Enh|2010-04-21|Unknown Publisher when installing tomcat 6.0.26  |
|49176|Opn|Enh|2010-04-23|Jasper in Dev Mode Is Memory Inefficient       |
|49464|New|Enh|2010-06-18|DefaultServlet and CharacterEncoding         |
|49531|New|Enh|2010-06-30|singlesignon failover not working on DeltaManager/|
|49804|New|Enh|2010-08-23|Allow Embedded.redirectStreams value to be configu|
|49939|New|Enh|2010-09-16|Expose a method via JMX which empties the webapp f|
|49943|New|Enh|2010-09-16|Logging (via juli) does not reread configuration c|
|50182|New|Enh|2010-10-29|Contributing back enhancements to CompressionFilte|
|50285|New|Enh|2010-11-17|Standard HTTP and AJP connectors silently ignore a|
|50288|New|Enh|2010-11-17|Uploading a war file that already exists should au|
|50692|New|Enh|2011-01-31|Improve log message in ThreadPool.logFull      |
|51142|New|Enh|2011-05-03|Offer possible resolution of StringIndexOutOfBound|
|51513|New|Enh|2011-07-15|GzipInterceptor: Do not compress small packages  |
|51912|New|Nor|2011-09-28|IOOB exception in InternalNioInputBuffer when debu|
|51966|New|Enh|2011-10-05|Tomcat does not support ssha hashed passwords in a|
|52124|New|Nor|2011-11-02|Tomcat Maven metadata only includes the latest rel|
|52517|New|Nor|2012-01-24|Server affecting URLConnector's defaultUseCache se|
+-----+---+---+----------+--------------------------------------------------+
| Total  66 bugs                                       |
+---------------------------------------------------------------------------+

+---------------------------------------------------------------------------+
| Bugzilla Bug ID                                       |
|   +---------------------------------------------------------------------+
|   | Status: UNC=Unconfirmed NEW=New      ASS=Assigned           |
|   |      OPN=Reopened   VER=Verified   (Skipped Closed/Resolved)  |
|   |  +-----------------------------------------------------------------+
|   |  | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major  |
|   |  |       MIN=Minor  NOR=Normal   ENH=Enhancement TRV=Trivial |
|   |  |  +-------------------------------------------------------------+
|   |  |  | Date Posted                                 |
|   |  |  |       +--------------------------------------------------+
|   |  |  |       | Description                         |
|   |  |  |       |                                 |
|34526|Opn|Nor|2005-04-19|Truncated content in decompressed requests from mo|
|35959|Opn|Enh|2005-08-01|mod_jk not independant of UseCanonicalName     |
|43303|New|Enh|2007-09-04|Versioning under Windows not reported by many conn|
|43968|Inf|Enh|2007-11-26|[patch] support ipv6 with mod_jk            |
|44290|Inf|Nor|2008-01-24|mod_jk/1.2.26: retry is not useful for an importan|
|44349|Inf|Maj|2008-02-04|mod_jk/1.2.26 module does not read worker.status.s|
|44379|New|Enh|2008-02-07|convert the output of strftime into UTF-8      |
|44454|New|Nor|2008-02-19|busy count reported in mod_jk inflated, causes inc|
|44571|New|Enh|2008-03-10|Limits busy per worker to a threshold         |
|45063|New|Nor|2008-05-22|JK-1.2.26 IIS ISAPI filter issue when running diff|
|45313|New|Nor|2008-06-30|mod_jk 1.2.26 & apache 2.2.9 static compiled on so|
|46337|New|Nor|2008-12-04|real worker name is wrong                 |
|46676|New|Enh|2009-02-09|Configurable test request for Watchdog thread   |
|46767|New|Enh|2009-02-25|mod_jk to send DECLINED in case no fail-over tomca|
|47327|New|Enh|2009-06-07|remote_user not logged in apache logfile       |
|47617|Inf|Enh|2009-07-31|include time spent doing ajp_get_endpoint() in err|
|47678|New|Cri|2009-08-11|Unable to allocate shared memory when using isapi_|
|47714|New|Cri|2009-08-20|Reponse mixed between users               |
|47750|New|Maj|2009-08-27|Loss of worker settings when changing via jkstatus|
|47795|New|Maj|2009-09-07|service sticky_session not being set correctly wit|
|47840|Inf|Min|2009-09-14|A broken worker name is written in the log file. |
|48191|New|Maj|2009-11-13|Problem with mod_jk 1.2.28 - Can not render up the|
|48460|New|Nor|2009-12-30|mod_proxy_ajp document has three misleading portio|
|48490|New|Nor|2010-01-05|Changing a node to stopped in uriworkermap.propert|
|48513|New|Enh|2010-01-09|IIS Quick setup instructions               |
|48564|New|Nor|2010-01-18|Unable to turn off retries for LB worker       |
|48830|New|Nor|2010-03-01|IIS shutdown blocked in endpoint service when serv|
|48891|Opn|Enh|2010-03-11|Missing EOL-style settings in tomcat/jk/trunk   |
|49035|New|Maj|2010-04-01|data lost when post a multipart/form-data form   |
|49063|New|Enh|2010-04-07|Please add JkStripSession status in jk-status work|
|49135|New|Enh|2010-04-16|SPDY Connector for The Tomcat              |
|49469|New|Enh|2010-06-19|Workers status page has negative number of connect|
|49732|Opn|Nor|2010-08-10|reply_timeout can't wait forever.           |
|49822|New|Enh|2010-08-25|Add hash lb worker method                 |
|49903|New|Enh|2010-09-09|Make workers file reloadable               |
|50186|New|Nor|2010-10-31|Wrong documentation of connection_pool_timeout / c|
|50511|Inf|Nor|2010-12-22|WARNING about Internal Dummy Connection of Apache |
|51235|Inf|Maj|2011-05-20|Access Violation in httpd.exe originating in mod_j|
|51767|New|Maj|2011-09-06|isapi_redirect intermittently crashes iis worker p|
|52074|New|Maj|2011-10-23|PATH_INFO not passed from IIS7 to Tomcat7      |
|52270|New|Cri|2011-12-01|isapi rediderctor hangs IIS 7.5 APP POOL       |
|52286|New|Blk|2011-12-05|isapi 1.2.32 fails to reload after worker processe|
|52334|New|Maj|2011-12-14|recover_time is not properly used           |
|52432|New|Nor|2012-01-05|HTTP Error 500.0 from IIS 7.5 when configure tomca|
|52483|New|Enh|2012-01-18|Print JkOptions's options in log file and jkstatus|
+-----+---+---+----------+--------------------------------------------------+
| Total  45 bugs                                       |
+---------------------------------------------------------------------------+

+---------------------------------------------------------------------------+
| Bugzilla Bug ID                                       |
|   +---------------------------------------------------------------------+
|   | Status: UNC=Unconfirmed NEW=New      ASS=Assigned           |
|   |      OPN=Reopened   VER=Verified   (Skipped Closed/Resolved)  |
|   |  +-----------------------------------------------------------------+
|   |  | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major  |
|   |  |       MIN=Minor  NOR=Normal   ENH=Enhancement TRV=Trivial |
|   |  |  +-------------------------------------------------------------+
|   |  |  | Date Posted                                 |
|   |  |  |       +--------------------------------------------------+
|   |  |  |       | Description                         |
|   |  |  |       |                                 |
|48240|New|Nor|2009-11-19|Tomcat-Lite missing @Override markers         |
|48268|New|Nor|2009-11-23|Patch to fix generics in tomcat-lite         |
|48861|New|Nor|2010-03-04|Files without AL headers                 |
|49685|New|Nor|2010-08-02|Unsafe synchronization in class ManagedBean     |
|49686|New|Nor|2010-08-02|Using an instance lock to protect static shared da|
|49953|Opn|Nor|2010-09-17|Missing @Override annotations              |
|50565|New|Min|2011-01-10|Static variables should be accessed in a static wa|
|50566|New|Nor|2011-01-10|Duplicate assignment to connection variable     |
|50571|Inf|Nor|2011-01-11|Tomcat 7 JDBC connection pool exception enhancemen|
|50660|New|Min|2011-01-26|Improve validationQuery error handling        |
|50860|New|Nor|2011-03-03|In case of invalid or empty slqQuery connection ar|
|50864|New|Nor|2011-03-03|Reconfigure pool on the fly using JMX         |
|51198|New|Nor|2011-05-13|Trunk Version : Performance enhancement in Connect|
|51237|New|Nor|2011-05-20|SlowQueryReport interceptor does not log anything |
|51388|New|Enh|2011-06-16|SlowQueryReport should respect Statement.getQueryT|
|51582|New|Maj|2011-07-29|NPE in SlowQueryReport                   |
|51595|New|Nor|2011-08-01|org.apache.tomcat.jdbc.pool.jmx.ConnectionPool sho|
|51879|New|Enh|2011-09-22|Improve access to Native Connection Methods     |
|51893|New|Nor|2011-09-26|JMX notification/Exception for empty/exhausted con|
|52002|New|Nor|2011-10-10|Pool re-opens and re-issues closed connection   |
|52024|New|Enh|2011-10-13|Custom interceptor to support automatic failover o|
|52066|New|Nor|2011-10-20|ConnectionPool.borrowConnection swallows interrupt|
|52318|New|Cri|2011-12-11|Version in tomcat-jdbc POM is conflicted with Vers|
|52327|New|Nor|2011-12-14|DataSourceProxy is not thread-safe           |
|52493|New|Nor|2012-01-21|Add java7 support                      |
|52518|New|Trv|2012-01-24|Documentation enhancements                |
+-----+---+---+----------+--------------------------------------------------+
| Total  26 bugs                                       |
+---------------------------------------------------------------------------+

+---------------------------------------------------------------------------+
| Bugzilla Bug ID                                       |
|   +---------------------------------------------------------------------+
|   | Status: UNC=Unconfirmed NEW=New      ASS=Assigned           |
|   |      OPN=Reopened   VER=Verified   (Skipped Closed/Resolved)  |
|   |  +-----------------------------------------------------------------+
|   |  | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major  |
|   |  |       MIN=Minor  NOR=Normal   ENH=Enhancement TRV=Trivial |
|   |  |  +-------------------------------------------------------------+
|   |  |  | Date Posted                                 |
|   |  |  |       +--------------------------------------------------+
|   |  |  |       | Description                         |
|   |  |  |       |                                 |
|16579|New|Enh|2003-01-30|documentation page layout/style breaks wrapping to|
|18500|New|Enh|2003-03-30|Host aliases to match by regular expression     |
|28039|Opn|Enh|2004-03-30|Cluster Support for SingleSignOn            |
|40728|Inf|Enh|2006-10-11|Catalina MBeans use non-serializable classes    |
|40881|Opn|Enh|2006-11-02|Unable to receive message through TCP channel -> |
|41007|Opn|Enh|2006-11-20|Can't define customized 503 error page        |
|43866|New|Enh|2007-11-14|add support for session attribute propagation with|
|43925|Opn|Enh|2007-11-21|org.apache.jasper.runtime.BodyContentImpl causing |
|44216|New|Enh|2008-01-11|Don't reuse session ID even if emptySessionPath=tr|
|48550|Inf|Enh|2010-01-14|Update examples and default server.xml to use UTF-|
|49395|New|Enh|2010-06-06|manager.findLeaks : display the date when the leak|
|49589|New|Enh|2010-07-12|Tag handlers with constant attribute values are al|
|49785|New|Enh|2010-08-19|Enabling TLS for JNDIRealm                |
|49821|New|Enh|2010-08-25|Tomcat CLI                           |
|50019|New|Enh|2010-09-28|Adding JNDI "lookup-name" support In XML and Resou|
|50175|New|Enh|2010-10-28|Enhance memory leak detection by selectively apply|
|50234|New|Enh|2010-11-08|JspC use servlet 3.0 features              |
|50504|New|Enh|2010-12-21|Allow setting query string character set trough re|
|50670|New|Enh|2011-01-27|Tribes | RpcChannel | Add option to specify extern|
|51181|New|Enh|2011-05-10|Add support for Web Sockets               |
|51195|New|Enh|2011-05-13|"Find leaks" reports a false positive memory/class|
|51423|Inf|Enh|2011-06-23|[Patch] to add a path and a version parameters to |
|51463|New|Enh|2011-07-01|Tomcat.setBaseDir (package org.apache.catalina.st|
|51496|New|Enh|2011-07-11|NSIS - Warn that duplicate service name will resul|
|51497|New|Enh|2011-07-11|Use canonical IPv6 text representation in logs   |
|51526|New|Enh|2011-07-18|Process web application context config with embedd|
|51587|New|Enh|2011-07-29|Implement status and uptime commands         |
|51953|New|Enh|2011-10-04|Proposal: netmask filtering valve and filter    |
|52092|New|Enh|2011-10-26|Please make AsyncFileHandler and OneLineFormatter |
|52234|New|Enh|2011-11-23|More documentation of embedding, please?       |
|52235|New|Enh|2011-11-23|Please do a bit of SEO tuning for the web site   |
|52236|New|Enh|2011-11-23|Idea: support 'overlays' shaped like Maven overlay|
|52323|New|Enh|2011-12-13|Cobertura test code coverage support for build.xml|
|52381|New|Enh|2011-12-22|Please add OSGi metadata                 |
|52386|New|Enh|2011-12-26|Move to a Maven Build                   |
|52444|New|Enh|2012-01-09|Classloading-based ServletContainerInitializer @Ha|
|52448|New|Enh|2012-01-11|Cache jar indexes in WebappClassLoader to speed up|
|52489|New|Enh|2012-01-19|Enhancement request for code signing of war files |
|52500|New|Enh|2012-01-23|Improve client certificate authentication      |
|52548|New|Min|2012-01-28|service.bat fails to set catalina.base and catalin|
+-----+---+---+----------+--------------------------------------------------+
| Total  40 bugs                                       |
+---------------------------------------------------------------------------+

+---------------------------------------------------------------------------+
| Bugzilla Bug ID                                       |
|   +---------------------------------------------------------------------+
|   | Status: UNC=Unconfirmed NEW=New      ASS=Assigned           |
|   |      OPN=Reopened   VER=Verified   (Skipped Closed/Resolved)  |
|   |  +-----------------------------------------------------------------+
|   |  | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major  |
|   |  |       MIN=Minor  NOR=Normal   ENH=Enhancement TRV=Trivial |
|   |  |  +-------------------------------------------------------------+
|   |  |  | Date Posted                                 |
|   |  |  |       +--------------------------------------------------+
|   |  |  |       | Description                         |
|   |  |  |       |                                 |
|45392|New|Nor|2008-07-14|No OCSP support for client SSL verification     |
|46179|Opn|Maj|2008-11-10|apr ssl client authentication              |
|48655|Inf|Nor|2010-02-02|Active multipart downloads prevent tomcat shutdown|
|49038|Inf|Nor|2010-04-02|Crash in tcnative                      |
|51477|Opn|Enh|2011-07-05|Support all protocol combinations in SSLProtocol o|
|51655|New|Nor|2011-08-12|Index page does not say what native does       |
|51813|New|Cri|2011-09-14|Tomcat randomly crashes with [libtcnative-1.so.1+0|
|52119|New|Nor|2011-11-01|Add Diablo JDK to default JDK location search path|
|52153|New|Maj|2011-11-08|periodic JVM crash (access violation) on buffer fl|
|52231|New|Nor|2011-11-23|Ant Tasks need to reflect changes in manager comma|
|52319|New|Maj|2011-12-12|Tomcat 6 crashes with [libapr-1.so.0+0x196da] sig|
|52544|New|Maj|2012-01-27|tcnative-1.dll crash with RapidSSL certificate und|
+-----+---+---+----------+--------------------------------------------------+
| Total  12 bugs                                       |
+---------------------------------------------------------------------------+