Re: svn commit: r1723410 - in /tomcat/trunk: java/org/apache/catalina/manager/host/HostManagerServlet.java test/org/apache/catalina/core/TestStandardContextResources.java test/org/apache/catalina/star

[Mark Thomas]

On 07/01/2016 07:22, Violeta Georgieva wrote:
> Hi Mark,
> 
> 2016-01-06 22:06 GMT+02:00 :
>>
>> Author: markt
>> Date: Wed Jan  6 20:06:51 2016
>> New Revision: 1723410
>>
>> URL: http://svn.apache.org/viewvc?rev=1723410=rev
>> Log:
>> Avoid wheel re-invention. Use the available utility class for copying
> between streams.
> 
> Wouldn't it be better to use directly java.nio.file.Files (where it is
> possible) instead of our own utilities?

It would. Thanks. As you can probably tell, I'm a fan of clean-up that
reduces the size of the code base. I went looking for that (or something
like it) but couldn't find it.

It is Java 7+ so we can use it in trunk and 8.x.

Not all of the uses of IOTools work on files so I don't think we'll be
able to remove it entirely just yet. I think I saw something along these
lines being discussed for Java 9. So maybe in Tomcat 10...

Mark


> 
> Regards,
> Violeta
> 
>> Modified:
>>
> tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
>>
> tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java
>> tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
>>
>> Modified:
> tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
>> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java?rev=1723410=1723409=1723410=diff
>>
> ==
>> ---
> tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
> (original)
>> +++
> tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
> Wed Jan  6 20:06:51 2016
>> @@ -39,6 +39,7 @@ import org.apache.catalina.Wrapper;
>>  import org.apache.catalina.core.ContainerBase;
>>  import org.apache.catalina.core.StandardHost;
>>  import org.apache.catalina.startup.HostConfig;
>> +import org.apache.catalina.util.IOTools;
>>  import org.apache.tomcat.util.ExceptionUtils;
>>  import org.apache.tomcat.util.res.StringManager;
>>
>> @@ -386,16 +387,9 @@ public class HostManagerServlet
>>  OutputStream os = new FileOutputStream(
>>  new File(configBaseFile, "manager.xml"))) {
>>  byte buffer[] = new byte[512];
>> -int len = buffer.length;
>> -while (true) {
>> -len = is.read(buffer);
>> -if (len == -1)
>> -break;
>> -os.write(buffer, 0, len);
>> -}
>> +IOTools.flow(is, os, buffer);
>>  } catch (IOException e) {
>> -writer.println(smClient.getString(
>> -"hostManagerServlet.managerXml"));
>> +
>  writer.println(smClient.getString("hostManagerServlet.managerXml"));
>>  return;
>>  }
>>  }
>>
>> Modified:
> tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java
>> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java?rev=1723410=1723409=1723410=diff
>>
> ==
>> ---
> tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java
> (original)
>> +++
> tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java
> Wed Jan  6 20:06:51 2016
>> @@ -41,6 +41,7 @@ import org.apache.catalina.startup.Const
>>  import org.apache.catalina.startup.ContextConfig;
>>  import org.apache.catalina.startup.Tomcat;
>>  import org.apache.catalina.startup.TomcatBaseTest;
>> +import org.apache.catalina.util.IOTools;
>>  import org.apache.tomcat.util.buf.ByteChunk;
>>  import org.apache.tomcat.util.descriptor.web.WebXml;
>>
>> @@ -255,10 +256,7 @@ public class TestStandardContextResource
>>
>>  try (InputStream input = url.openStream();
>>  OutputStream output = resp.getOutputStream()) {
>> -byte[] buffer = new byte[4000];
>> -for (int len; (len = input.read(buffer)) > 0;) {
>> -output.write(buffer, 0, len);
>> -}
>> +IOTools.flow(input, output);
>>  }
>>  }
>>  }
>>
>> Modified:
> tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
>> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java?rev=1723410=1723409=1723410=diff
>>
> ==
>> --- tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
> (original)
>> +++ tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java Wed
> Jan  6 20:06:51 2016
>> @@ -61,6 +61,7 @@ import org.apache.catalina.core.AprLifec
>>  import org.apache.catalina.core.StandardServer;
>>  import org.apache.catalina.session.ManagerBase;
>>  

[GUMP@vmgump]: Project tomcat-tc7.0.x-test-apr (in module tomcat-7.0.x) failed

[Bill Barker]

To whom it may engage...

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

Project tomcat-tc7.0.x-test-apr 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-tc7.0.x-test-apr :  Tomcat 7.x, a web server implementing Java 
Servlet 3.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-apr/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on tomcat-tc7.0.x-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-tc7.0.x-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-7.0.x/output/logs-APR
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-APR/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-apr/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr.html
Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 41 mins 12 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x 
-Dtest.temp=output/test-tmp-APR 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160107.jar
 
-Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar
 -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps 
-Dtest.excludePerformance=true 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x 
-Dexecute.test.apr=true -Dexecute.test.bio=false 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/wo
 
rkspace/apache-commons/daemon/dist/bin/commons-daemon-20160107-native-src.tar.gz
 -Dtest.reports=output/logs-APR 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160107-native-src.tar.gz
 -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20160107/lib 
-Dexecute.test.nio=false -Dtest.accesslog=true 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20160107.jar
 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-7.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/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-junit4.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-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output

svn commit: r1723484 - in /tomcat/trunk/java/org/apache/catalina/core: ApplicationFilterConfig.java LocalStrings.properties

[violetagg]

Author: violetagg
Date: Thu Jan  7 09:02:22 2016
New Revision: 1723484

URL: http://svn.apache.org/viewvc?rev=1723484=rev
Log:
Corrected the log message

Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties

Modified: 
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java?rev=1723484=1723483=1723484=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java Thu 
Jan  7 09:02:22 2016
@@ -326,7 +326,9 @@ public final class ApplicationFilterConf
 Throwable t = ExceptionUtils
 .unwrapInvocationTargetException(e);
 ExceptionUtils.handleThrowable(t);
-
context.getLogger().error("ApplicationFilterConfig.preDestroy", t);
+context.getLogger().error(
+sm.getString("applicationFilterConfig.preDestroy",
+filterDef.getFilterName(), 
filterDef.getFilterClass()), t);
 }
 }
 }

Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=1723484=1723483=1723484=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties Thu Jan  
7 09:02:22 2016
@@ -45,6 +45,7 @@ applicationDispatcher.specViolation.resp
 applicationFilterConfig.jmxRegisterFail=JMX registration failed for filter of 
type [{0}] and name [{1}]
 applicationFilterConfig.jmxUnregister=JMX de-registration complete for filter 
of type [{0}] and name [{1}]
 applicationFilterConfig.jmxUnregisterFail=JMX de-registration failed for 
filter of type [{0}] and name [{1}]
+applicationFilterConfig.preDestroy=Failed the call to preDestroy for the 
filter named [{0}] of type [{1}]
 applicationFilterConfig.release=Failed to destroy the filter named [{0}] of 
type [{1}]
 applicationFilterRegistration.nullInitParam=Unable to set initialisation 
parameter for filter due to null name and/or value. Name [{0}], Value [{1}]
 applicationFilterRegistration.nullInitParams=Unable to set initialisation 
parameters for filter due to null name and/or value. Name [{0}], Value [{1}]



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1723488 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/connector/mbeans-descriptors.xml webapps/docs/changelog.xml

[kkolinko]

Author: kkolinko
Date: Thu Jan  7 09:12:53 2016
New Revision: 1723488

URL: http://svn.apache.org/viewvc?rev=1723488=rev
Log:
Fix definition of localPort attribute of CoyoteConnector mbean. It is 
read-only, Connector class has no setter for this property.
For https://issues.apache.org/bugzilla/show_bug.cgi?id=52028  (Review of 
r1207695)

Merged r1723486 from tomcat/trunk.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)

tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan  7 09:12:53 2016
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657
 
609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1
 
666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,168555
 

svn commit: r1723493 - in /tomcat/trunk/java/org/apache/catalina: manager/host/HostManagerServlet.java servlets/CGIServlet.java startup/HostConfig.java webresources/DirResourceSet.java

[markt]

Author: markt
Date: Thu Jan  7 09:31:50 2016
New Revision: 1723493

URL: http://svn.apache.org/viewvc?rev=1723493=rev
Log:
Use java.nio.file.Files where possible

Modified:
tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java
tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
tomcat/trunk/java/org/apache/catalina/webresources/DirResourceSet.java

Modified: 
tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java?rev=1723493=1723492=1723493=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java 
Thu Jan  7 09:31:50 2016
@@ -17,11 +17,11 @@
 package org.apache.catalina.manager.host;
 
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStream;
 import java.io.PrintWriter;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.StringTokenizer;
 
 import javax.servlet.ServletException;
@@ -39,7 +39,6 @@ import org.apache.catalina.Wrapper;
 import org.apache.catalina.core.ContainerBase;
 import org.apache.catalina.core.StandardHost;
 import org.apache.catalina.startup.HostConfig;
-import org.apache.catalina.util.IOTools;
 import org.apache.tomcat.util.ExceptionUtils;
 import org.apache.tomcat.util.res.StringManager;
 
@@ -383,11 +382,9 @@ public class HostManagerServlet
 "hostManagerServlet.configBaseCreateFail", name));
 return;
 }
-try (InputStream is = 
getServletContext().getResourceAsStream("/manager.xml");
-OutputStream os = new FileOutputStream(
-new File(configBaseFile, "manager.xml"))) {
-byte buffer[] = new byte[512];
-IOTools.flow(is, os, buffer);
+try (InputStream is = 
getServletContext().getResourceAsStream("/manager.xml")) {
+Path dest = (new File(configBaseFile, "manager.xml")).toPath();
+Files.copy(is, dest);
 } catch (IOException e) {
 
writer.println(smClient.getString("hostManagerServlet.managerXml"));
 return;

Modified: tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java?rev=1723493=1723492=1723493=diff
==
--- tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java Thu Jan  7 
09:31:50 2016
@@ -21,13 +21,13 @@ package org.apache.catalina.servlets;
 import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.Enumeration;
@@ -1166,9 +1166,7 @@ public final class CGIServlet extends Ht
 }
 
 // create directories
-String dirPath = destPath.toString().substring(
-0,destPath.toString().lastIndexOf('/'));
-File dir = new File(dirPath);
+File dir = f.getParentFile();
 if (!dir.mkdirs() && !dir.isDirectory()) {
 if (debug >= 2) {
 log("expandCGIScript: failed to create directories for '" +
@@ -1188,19 +1186,13 @@ public final class CGIServlet extends Ht
 if (!f.createNewFile()) {
 return;
 }
-FileOutputStream fos = new FileOutputStream(f);
 
 try {
-// copy data
-IOTools.flow(is, fos);
+Files.copy(is, f.toPath());
 } finally {
-try {
-is.close();
-} catch (IOException e) {
-log("Could not close is.", e);
-}
-fos.close();
+is.close();
 }
+
 if (debug >= 2) {
 log("expandCGIScript: expanded '" + srcPath + "' to '" 
+ destPath + "'");
 }

Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
URL: 

buildbot failure in ASF Buildbot on tomcat-trunk

[buildbot]

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/879

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1723500
Blamelist: markt

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1723494 - /tomcat/trunk/java/org/apache/catalina/util/IOTools.java

[markt]

Author: markt
Date: Thu Jan  7 09:33:45 2016
New Revision: 1723494

URL: http://svn.apache.org/viewvc?rev=1723494=rev
Log:
Deprecate unused code.

Modified:
tomcat/trunk/java/org/apache/catalina/util/IOTools.java

Modified: tomcat/trunk/java/org/apache/catalina/util/IOTools.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/IOTools.java?rev=1723494=1723493=1723494=diff
==
--- tomcat/trunk/java/org/apache/catalina/util/IOTools.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/IOTools.java Thu Jan  7 09:33:45 
2016
@@ -67,7 +67,10 @@ public class IOTools {
  * @param is input stream the input stream to read from.
  * @param os output stream the output stream to write to.
  * @param buf the byte array to use as a buffer
+ *
+ * @deprecated Unused. Will be removed in 9.0.x
  */
+@Deprecated
 public static void flow( InputStream is, OutputStream os, byte[] buf )
 throws IOException {
 int numRead;



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[GUMP@vmgump]: Project tomcat-trunk-test-apr (in module tomcat-trunk) failed

[Bill Barker]

To whom it may engage...

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

Project tomcat-trunk-test-apr 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-apr :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -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.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/logs-APR
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs]



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 59 mins 10 secs
Command Line: /usr/lib/jvm/java-8-oracle/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/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar
 -Dtest.reports=output/logs-APR 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160107-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-trunk/dest-20160107/lib 
-Dtest.relaxTiming=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160107.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160107-native-src.tar.gz
 -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -
 Dexecute.test.nio=false 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20160107/bin/openssl
 -Dexecute.test.apr=true -Dtest.excludePerformance=true 
-Dexecute.test.nio2=false 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/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-junit4.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.ja
 
r:/srv/gump/public/workspace/tomcat-trunk/output/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/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-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/catalina-storeconfig.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

svn commit: r1723487 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/ApplicationFilterConfig.java java/org/apache/catalina/core/LocalStrings.properties

[violetagg]

Author: violetagg
Date: Thu Jan  7 09:09:47 2016
New Revision: 1723487

URL: http://svn.apache.org/viewvc?rev=1723487=rev
Log:
Merged revision 1723484 from tomcat/trunk:
Corrected the log message

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan  7 09:09:47 2016
@@ -1,2 +1,2 @@
 
/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553
 
-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702
 
744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
 

svn commit: r1723485 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/core/ApplicationFilterConfig.java java/org/apache/catalina/core/LocalStrings.properties

[violetagg]

Author: violetagg
Date: Thu Jan  7 09:07:31 2016
New Revision: 1723485

URL: http://svn.apache.org/viewvc?rev=1723485=rev
Log:
Merged revision 1723484 from tomcat/trunk:
Corrected the log message

Modified:
tomcat/tc8.0.x/trunk/   (props changed)

tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan  7 09:07:31 2016
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657
 
609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1
 
666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,168555
 

svn commit: r1723486 - in /tomcat/trunk: java/org/apache/catalina/connector/mbeans-descriptors.xml webapps/docs/changelog.xml

[kkolinko]

Author: kkolinko
Date: Thu Jan  7 09:08:58 2016
New Revision: 1723486

URL: http://svn.apache.org/viewvc?rev=1723486=rev
Log:
Fix definition of localPort attribute of CoyoteConnector mbean. It is 
read-only, Connector class has no setter for this property.
For https://issues.apache.org/bugzilla/show_bug.cgi?id=52028  (Review of 
r1207695)

Modified:
tomcat/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml?rev=1723486=1723485=1723486=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml 
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml Thu 
Jan  7 09:08:58 2016
@@ -84,7 +84,8 @@
 
 
+ type="int"
+writeable="false"/>
 
 http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1723486=1723485=1723486=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Jan  7 09:08:58 2016
@@ -175,6 +175,10 @@
 Ensure that the proper file encoding if specified will be used when
 a readme file is served by DefaultServlet. (violetagg)
   
+  
+Fix declaration of localPort attribute of Connector MBean:
+it is read-only. (kkolinko)
+  
 
   
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1723498 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/util/UriUtil.java

[markt]

Author: markt
Date: Thu Jan  7 09:41:46 2016
New Revision: 1723498

URL: http://svn.apache.org/viewvc?rev=1723498=rev
Log:
Create a new UriUtil class that contains only those parts of 
o.a.tomcat.util.URI that a) are required by Tomcat and b) aren't provided by 
the JRE.

Added:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/UriUtil.java
  - copied unchanged from r1723316, 
tomcat/trunk/java/org/apache/catalina/util/UriUtil.java
Modified:
tomcat/tc8.0.x/trunk/   (props changed)

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan  7 09:41:46 2016
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657
 
609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1
 
666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,168555
 

svn commit: r1723500 - /tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java

[markt]

Author: markt
Date: Thu Jan  7 09:51:29 2016
New Revision: 1723500

URL: http://svn.apache.org/viewvc?rev=1723500=rev
Log:
Add class that replaced URL

Modified:
tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java

Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java?rev=1723500=1723499=1723500=diff
==
--- tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java Thu 
Jan  7 09:51:29 2016
@@ -153,6 +153,7 @@ public final class SecurityClassLoad {
 final String basePackage = "org.apache.catalina.util.";
 loader.loadClass(basePackage + "ParameterMap");
 loader.loadClass(basePackage + "RequestUtil");
+loader.loadClass(basePackage + "UriUtil");
 }
 
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1723504 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/ha/tcp/ java/org/apache/catalina/tribes/group/ java/org/apache/catalina/tribes/group/interceptors/ java/org/apache/catalina

[markt]

Author: markt
Date: Thu Jan  7 10:12:08 2016
New Revision: 1723504

URL: http://svn.apache.org/viewvc?rev=1723504=rev
Log:
MessageDispatch15Interceptor was used to add Java 5 features to 
MessageDispatchInterceptor. Since the minimum Java version is now >=5 (and has 
been since Tomcat 6) there is no need for the separate implementation.
Merge the Java 5 features into MessageDispatchInterceptor and deprecate 
MessageDispatch15Interceptor and associated now unused code

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Interceptor.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/util/LinkObject.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/util/SingleRemoveSynchronizedAddLock.java

tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/demos/ChannelCreator.java

tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/demos/CoordinationDemo.java

tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java

tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestMulticastPackages.java

tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestUdpPackages.java

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan  7 10:12:08 2016
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657
 
609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1
 

[GUMP@vmgump]: Project tomcat-tc7.0.x-test-bio (in module tomcat-7.0.x) failed

[Bill Barker]

To whom it may engage...

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

Project tomcat-tc7.0.x-test-bio has an issue affecting its community 
integration.
This issue affects 1 projects,
 and has been outstanding for 2 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-tc7.0.x-test-bio :  Tomcat 7.x, a web server implementing Java 
Servlet 3.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-bio/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on tomcat-tc7.0.x-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-tc7.0.x-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-7.0.x/output/logs-BIO
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-BIO/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-bio/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-bio.html
Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-bio (Type: Build)
Work ended in a state of : Failed
Elapsed: 43 mins 54 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x 
-Dtest.temp=output/test-tmp-BIO 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160107.jar
 
-Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar
 -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps 
-Dtest.excludePerformance=true 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x 
-Dexecute.test.apr=false -Dexecute.test.bio=true 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/wo
 
rkspace/apache-commons/daemon/dist/bin/commons-daemon-20160107-native-src.tar.gz
 -Dtest.reports=output/logs-BIO 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160107-native-src.tar.gz
 -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dexecute.test.nio=false -Dtest.accesslog=true 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20160107.jar
 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-7.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/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-junit4.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-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper-el.jar:/srv/gump/public

buildbot failure in ASF Buildbot on tomcat-8-trunk

[buildbot]

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

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1723508
Blamelist: markt

BUILD FAILED: failed compile

Sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1723489 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/connector/mbeans-descriptors.xml webapps/docs/changelog.xml

[kkolinko]

Author: kkolinko
Date: Thu Jan  7 09:16:05 2016
New Revision: 1723489

URL: http://svn.apache.org/viewvc?rev=1723489=rev
Log:
Fix definition of localPort attribute of CoyoteConnector mbean. It is 
read-only, Connector class has no setter for this property.
For https://issues.apache.org/bugzilla/show_bug.cgi?id=52028  (Review of 
r1207695)

Merged r1723488 from tomcat/tc8.0.x/trunk.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan  7 09:16:05 2016
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553
 
-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702
 
744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
 

svn commit: r1723506 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/connector/CoyoteAdapter.java java/org/apache/catalina/connector/Request.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Jan  7 10:19:14 2016
New Revision: 1723506

URL: http://svn.apache.org/viewvc?rev=1723506=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58809
Correctly recycle the cookies when mapping requests for parallel deployment

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Request.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan  7 10:19:14 2016
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657
 
609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1
 
666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,168555
 

[GUMP@vmgump]: Project tomcat-trunk-test-nio2 (in module tomcat-trunk) failed

[Bill Barker]

To whom it may engage...

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

Project tomcat-trunk-test-nio2 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-nio2 :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio2/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -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.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/logs-NIO2
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs]



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio2/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio2.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-nio2 (Type: Build)
Work ended in a state of : Failed
Elapsed: 54 mins 45 secs
Command Line: /usr/lib/jvm/java-8-oracle/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/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar
 -Dtest.reports=output/logs-NIO2 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160107-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.relaxTiming=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160107.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160107-native-src.tar.gz
 -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true 
-Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl
 -master/dest-20160107/bin/openssl -Dexecute.test.apr=false 
-Dtest.excludePerformance=true -Dexecute.test.nio2=true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/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-junit4.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.ja
 
r:/srv/gump/public/workspace/tomcat-trunk/output/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/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-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/catalina-storeconfig.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

svn commit: r1723495 - /tomcat/trunk/java/org/apache/catalina/util/IOTools.java

[markt]

Author: markt
Date: Thu Jan  7 09:36:08 2016
New Revision: 1723495

URL: http://svn.apache.org/viewvc?rev=1723495=rev
Log:
Remove deprecated code.

Modified:
tomcat/trunk/java/org/apache/catalina/util/IOTools.java

Modified: tomcat/trunk/java/org/apache/catalina/util/IOTools.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/IOTools.java?rev=1723495=1723494=1723495=diff
==
--- tomcat/trunk/java/org/apache/catalina/util/IOTools.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/IOTools.java Thu Jan  7 09:36:08 
2016
@@ -60,31 +60,22 @@ public class IOTools {
 flow( reader, writer, buf );
 }
 
+
 /**
- * Read input from input stream and write it to output stream
- * until there is no more input from input stream.
+ * Read input from input stream and write it to output stream until there 
is
+ * no more input from input stream using a new buffer of the default size
+ * (4kB).
  *
  * @param is input stream the input stream to read from.
  * @param os output stream the output stream to write to.
- * @param buf the byte array to use as a buffer
  *
- * @deprecated Unused. Will be removed in 9.0.x
+ * @throws IOException If an I/O error occurs during the copy
  */
-@Deprecated
-public static void flow( InputStream is, OutputStream os, byte[] buf )
-throws IOException {
+public static void flow(InputStream is, OutputStream os) throws 
IOException {
+byte[] buf = new byte[DEFAULT_BUFFER_SIZE];
 int numRead;
 while ( (numRead = is.read(buf) ) >= 0) {
 os.write(buf, 0, numRead);
 }
 }
-
-/**
- * @see #flow( java.io.InputStream, java.io.OutputStream, byte[] )
- */
-public static void flow( InputStream is, OutputStream os )
-throws IOException {
-byte[] buf = new byte[DEFAULT_BUFFER_SIZE];
-flow( is, os, buf );
-}
 }



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1723501 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/connector/ java/org/apache/catalina/security/ java/org/apache/catalina/valves/rewrite/ java/org/apache/tomcat/util/net/

[markt]

Author: markt
Date: Thu Jan  7 09:59:18 2016
New Revision: 1723501

URL: http://svn.apache.org/viewvc?rev=1723501=rev
Log:
Replace use of o.a.t.u.URL with URIUtil
Deprecate o.a.t.u.URL

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Response.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/security/SecurityClassLoad.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/URL.java

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan  7 09:59:18 2016
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657
 
609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1
 
666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,168555
 

[Bug 58809] Session info missing in request when using parallel deployment

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58809

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #2 from Mark Thomas  ---
Fixed in 8.0.x for 8.0.31 onwards.

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

buildbot success in ASF Buildbot on tomcat-trunk

[buildbot]

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/880

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1723528
Blamelist: remm

Build succeeded!

Sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1723545 - in /tomcat/tc6.0.x/trunk/java/org/apache/coyote: AbstractProtocol.java ajp/AjpAprProtocol.java ajp/AjpProtocol.java http11/Http11AprProtocol.java http11/Http11NioProtocol.java h

[kkolinko]

Author: kkolinko
Date: Thu Jan  7 13:55:25 2016
New Revision: 1723545

URL: http://svn.apache.org/viewvc?rev=1723545=rev
Log:
Extract common code from Protocol.getName() methods. No functional change.

This is in preparation for the fix for BZ 52028 (support for port number 0).

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/AbstractProtocol.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/Http11NioProtocol.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Protocol.java

Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1723545=1723544=1723545=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java Thu Jan  
7 13:55:25 2016
@@ -16,6 +16,9 @@
  */
 package org.apache.coyote;
 
+import java.net.InetAddress;
+import java.net.URLEncoder;
+
 import org.apache.tomcat.util.net.AbstractEndpoint;
 
 public abstract class AbstractProtocol implements ProtocolHandler {
@@ -28,4 +31,21 @@ public abstract class AbstractProtocol i
 public void setMaxHeaderCount(int maxHeaderCount) {
 getEndpoint().setMaxHeaderCount(maxHeaderCount);
 }
+
+/**
+ * An utility method, used to implement getName() in subclasses.
+ */
+protected String createName(String prefix, InetAddress address, int port) {
+StringBuilder name = new StringBuilder(prefix);
+name.append('-');
+if (address != null) {
+String strAddr = address.toString();
+if (strAddr.startsWith("/")) {
+strAddr = strAddr.substring(1);
+}
+name.append(URLEncoder.encode(strAddr)).append('-');
+}
+name.append(port);
+return name.toString();
+}
 }

Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java?rev=1723545=1723544=1723545=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java Thu Jan 
 7 13:55:25 2016
@@ -232,14 +232,7 @@ public class AjpAprProtocol extends Abst
 
 // *
 public String getName() {
-String encodedAddr = "";
-if (getAddress() != null) {
-encodedAddr = "" + getAddress();
-if (encodedAddr.startsWith("/"))
-encodedAddr = encodedAddr.substring(1);
-encodedAddr = URLEncoder.encode(encodedAddr) + "-";
-}
-return ("ajp-" + encodedAddr + endpoint.getPort());
+return createName("ajp", getAddress(), endpoint.getPort());
 }
 
 /**

Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProtocol.java?rev=1723545=1723544=1723545=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProtocol.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProtocol.java Thu Jan  7 
13:55:25 2016
@@ -231,14 +231,7 @@ public class AjpProtocol extends Abstrac
 
 // *
 public String getName() {
-String encodedAddr = "";
-if (getAddress() != null) {
-encodedAddr = "" + getAddress();
-if (encodedAddr.startsWith("/"))
-encodedAddr = encodedAddr.substring(1);
-encodedAddr = URLEncoder.encode(encodedAddr) + "-";
-}
-return ("ajp-" + encodedAddr + endpoint.getPort());
+return createName("ajp", getAddress(), endpoint.getPort());
 }
 
 /**

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1723545=1723544=1723545=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java 
Thu Jan  7 13:55:25 2016
@@ -178,14 +178,7 @@ public class Http11AprProtocol extends A
 }
 
 public String getName() {
-String encodedAddr = "";
-if (getAddress() != null) {
-encodedAddr = "" + getAddress();
-if 

svn propchange: r1723572 - svn:log

[kkolinko]

Author: kkolinko
Revision: 1723572
Modified property: svn:log

Modified: svn:log at Thu Jan  7 15:17:59 2016
--
--- svn:log (original)
+++ svn:log Thu Jan  7 15:17:59 2016
@@ -1,2 +1,2 @@
 Rebase branch onto current tc6.0.x/trunk
-This means a ctach-up merge of all revisions up to r1723551.
+This means a catch-up merge of all revisions up to r1723551.


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1723575 - /tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/TomcatBaseTest.java

[kkolinko]

Author: kkolinko
Date: Thu Jan  7 15:28:11 2016
New Revision: 1723575

URL: http://svn.apache.org/viewvc?rev=1723575=rev
Log:
Update TomcatBaseTest, as BZ 52028 fix has been committed.
For https://bz.apache.org/bugzilla/show_bug.cgi?id=52028

Modified:

tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/TomcatBaseTest.java

Modified: 
tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/TomcatBaseTest.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/TomcatBaseTest.java?rev=1723575=1723574=1723575=diff
==
--- 
tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/TomcatBaseTest.java
 (original)
+++ 
tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/startup/TomcatBaseTest.java
 Thu Jan  7 15:28:11 2016
@@ -82,9 +82,8 @@ public abstract class TomcatBaseTest ext
  * Sub-classes need to know port so they can connect
  */
 public int getPort() {
-//FIXME: Implement support for port number "0" and getLocalPort() method.
 // return tomcat.getConnector().getLocalPort();
-return tomcat.findConnectors()[0].getPort();
+return tomcat.findConnectors()[0].getLocalPort();
 }
 
 /**
@@ -94,9 +93,6 @@ public abstract class TomcatBaseTest ext
 return accessLogEnabled;
 }
 
-  //FIXME: implement support for post number 0.
-private static volatile int portIncrement = 0;
-
 @Before
 @Override
 public void setUp() throws Exception {
@@ -127,10 +123,7 @@ public abstract class TomcatBaseTest ext
 connector.setAttribute("address",
 InetAddress.getByName("localhost").getHostAddress());
 // Use random free port
-//FIXME
-//  connector.setPort(0);
-connector.setPort(8080 + portIncrement);
-portIncrement++;
+connector.setPort(0);
 // Mainly set to reduce timeouts during async tests
 connector.setAttribute("connectionTimeout", "3000");
 tomcat.addConnector(connector);



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1723528 - in /tomcat/trunk/java/org/apache/catalina: ./ ant/

[remm]

Author: remm
Date: Thu Jan  7 12:25:44 2016
New Revision: 1723528

URL: http://svn.apache.org/viewvc?rev=1723528=rev
Log:
Javadoc fixes.

Modified:
tomcat/trunk/java/org/apache/catalina/Context.java
tomcat/trunk/java/org/apache/catalina/Host.java
tomcat/trunk/java/org/apache/catalina/Session.java
tomcat/trunk/java/org/apache/catalina/SessionEvent.java
tomcat/trunk/java/org/apache/catalina/SessionIdGenerator.java
tomcat/trunk/java/org/apache/catalina/Store.java
tomcat/trunk/java/org/apache/catalina/StoreManager.java
tomcat/trunk/java/org/apache/catalina/TomcatPrincipal.java
tomcat/trunk/java/org/apache/catalina/User.java
tomcat/trunk/java/org/apache/catalina/UserDatabase.java
tomcat/trunk/java/org/apache/catalina/Valve.java
tomcat/trunk/java/org/apache/catalina/WebResource.java
tomcat/trunk/java/org/apache/catalina/WebResourceRoot.java
tomcat/trunk/java/org/apache/catalina/Wrapper.java
tomcat/trunk/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java

Modified: tomcat/trunk/java/org/apache/catalina/Context.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Context.java?rev=1723528=1723527=1723528=diff
==
--- tomcat/trunk/java/org/apache/catalina/Context.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Context.java Thu Jan  7 12:25:44 2016
@@ -439,7 +439,7 @@ public interface Context extends Contain
 
 
 /**
- * Return the login configuration descriptor for this web application.
+ * @return the login configuration descriptor for this web application.
  */
 public LoginConfig getLoginConfig();
 
@@ -453,7 +453,7 @@ public interface Context extends Contain
 
 
 /**
- * Return the naming resources associated with this web application.
+ * @return the naming resources associated with this web application.
  */
 public NamingResourcesImpl getNamingResources();
 
@@ -467,7 +467,7 @@ public interface Context extends Contain
 
 
 /**
- * Return the context path for this web application.
+ * @return the context path for this web application.
  */
 public String getPath();
 
@@ -481,7 +481,7 @@ public interface Context extends Contain
 
 
 /**
- * Return the public identifier of the deployment descriptor DTD that is
+ * @return the public identifier of the deployment descriptor DTD that is
  * currently being parsed.
  */
 public String getPublicId();
@@ -497,7 +497,7 @@ public interface Context extends Contain
 
 
 /**
- * Return the reloadable flag for this web application.
+ * @return the reloadable flag for this web application.
  */
 public boolean getReloadable();
 
@@ -511,7 +511,7 @@ public interface Context extends Contain
 
 
 /**
- * Return the override flag for this web application.
+ * @return the override flag for this web application.
  */
 public boolean getOverride();
 
@@ -525,7 +525,7 @@ public interface Context extends Contain
 
 
 /**
- * Return the privileged flag for this web application.
+ * @return the privileged flag for this web application.
  */
 public boolean getPrivileged();
 
@@ -539,13 +539,13 @@ public interface Context extends Contain
 
 
 /**
- * Return the servlet context for which this Context is a facade.
+ * @return the Servlet context for which this Context is a facade.
  */
 public ServletContext getServletContext();
 
 
 /**
- * Return the default session timeout (in minutes) for this
+ * @return the default session timeout (in minutes) for this
  * web application.
  */
 public int getSessionTimeout();
@@ -580,7 +580,7 @@ public interface Context extends Contain
 public void setSwallowAbortedUploads(boolean swallowAbortedUploads);
 
 /**
- * Return the value of the swallowOutput flag.
+ * @return the value of the swallowOutput flag.
  */
 public boolean getSwallowOutput();
 
@@ -596,7 +596,7 @@ public interface Context extends Contain
 
 
 /**
- * Return the Java class name of the Wrapper implementation used
+ * @return the Java class name of the Wrapper implementation used
  * for servlets registered in this Context.
  */
 public String getWrapperClass();
@@ -699,7 +699,7 @@ public interface Context extends Contain
 public void setJarScanner(JarScanner jarScanner);
 
 /**
- * Obtain the {@link Authenticator} that is used by this context or
+ * @return the {@link Authenticator} that is used by this context or
  * null if none is used.
  */
 public Authenticator getAuthenticator();
@@ -707,21 +707,29 @@ public interface Context extends Contain
 /**
  * Set whether or not the effective web.xml for this context should be
  * logged on context start.
+ *
+ * @param logEffectiveWebXml set to true to log the complete
+ *   

svn commit: r1723551 - in /tomcat/tc6.0.x/trunk: java/org/apache/catalina/connector/ java/org/apache/coyote/ java/org/apache/coyote/memory/ java/org/apache/jk/common/ java/org/apache/jk/server/ java/o

[kkolinko]

Author: kkolinko
Date: Thu Jan  7 14:04:28 2016
New Revision: 1723551

URL: http://svn.apache.org/viewvc?rev=1723551=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=52028
Add support for automatic binding to a free port by a connector
if the special value of zero is used for the port. This is
mainly useful in embedded and testing scenarios.

This includes backport of the following revisions from Tomcat 7:
r1207695 r1208115 r1208148 r1723441 r1723489

Handling of port number 0 in Jk AJP connector (ChannelSocket, ChannelNioSocket) 
was changed.
Old behaviour was to disable the connector.
New behaviour is to bind to a random port number.
To disable the connector one can now use a negative port number. I doubt that 
this "disable" feature was actually used by anyone. Also binding to a random 
port is not so much different from disabling.

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

tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml
tomcat/tc6.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java

tomcat/tc6.0.x/trunk/java/org/apache/coyote/memory/MemoryProtocolHandler.java
tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelNioSocket.java
tomcat/tc6.0.x/trunk/java/org/apache/jk/common/ChannelSocket.java
tomcat/tc6.0.x/trunk/java/org/apache/jk/server/JkCoyoteHandler.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/ajp.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml

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?rev=1723551=1723550=1723551=diff
==
--- 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 Thu 
Jan  7 14:04:28 2016
@@ -659,7 +659,9 @@ public class Connector
 }
 
 /**
- * Return the port number on which we listen for requests.
+ * Return the port number on which this connector is configured to listen
+ * for requests. The special value of 0 means select a random free port
+ * when the socket is bound.
  */
 public int getPort() {
 
@@ -682,6 +684,16 @@ public class Connector
 
 
 /**
+ * Return the port number on which this connector is listening to requests.
+ * If the special value for {@link #port} of zero is used then this method
+ * will report the actual port bound.
+ */
+public int getLocalPort() {
+return ((Integer) getProperty("localPort")).intValue();
+}
+
+
+/**
  * Return the Coyote protocol handler in use.
  */
 public String getProtocol() {
@@ -1067,7 +1079,13 @@ public class Connector
 sb.append(":type=");
 sb.append(type);
 sb.append(",port=");
-sb.append(getPort());
+int port = getPort();
+if (port > 0) {
+sb.append(port);
+} else {
+sb.append("auto-");
+sb.append(getProperty("nameIndex"));
+}
 if (addressObj != null) {
 String address = addressObj.toString();
 if (address.length() > 0) {
@@ -1384,7 +1402,13 @@ public class Connector
 StringBuilder sb = new StringBuilder("Connector[");
 sb.append(getProtocol());
 sb.append('-');
-sb.append(getPort());
+int port = getPort();
+if (port > 0) {
+sb.append(port);
+} else {
+sb.append("auto-");
+sb.append(getProperty("nameIndex"));
+}
 sb.append(']');
 return sb.toString();
 }

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml?rev=1723551=1723550=1723551=diff
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml 
(original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml 
Thu Jan  7 14:04:28 2016
@@ -110,6 +110,11 @@
   description="Alias name of this connector's keypair and supporting 
certificate chain"
  type="java.lang.String"/>
 
+
+
 
@@ -143,7 +148,7 @@
  type="int"/>
 
 
 
 

Re: svn commit: r1723506 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/connector/CoyoteAdapter.java java/org/apache/catalina/connector/Request.java webapps/docs/changelog.xml

[Mark Thomas]

On 07/01/2016 13:05, Konstantin Kolinko wrote:
> 2016-01-07 13:19 GMT+03:00  :
>> Author: markt
>> Date: Thu Jan  7 10:19:14 2016
>> New Revision: 1723506
>>
>> URL: http://svn.apache.org/viewvc?rev=1723506=rev
>> Log:
>> Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58809
>> Correctly recycle the cookies when mapping requests for parallel deployment



>> Modified: 
>> tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Request.java
>> URL: 
>> http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Request.java?rev=1723506=1723505=1723506=diff
>> ==
>> --- tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Request.java 
>> (original)
>> +++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Request.java Thu 
>> Jan  7 10:19:14 2016



>> @@ -554,6 +552,16 @@ public class Request
>>  }
>>
>>
>> +protected void recycleCookieInfo(boolean recycleCoyote) {
>> +cookiesParsed = false;
> 
> Setting "cookiesParsed = false" means that processing of HTTP headers
> will be repeated.
> 
> This second processing is possible only if
> org.apache.tomcat.util.http.ServerCookie.PRESERVE_COOKIE_HEADER
> system property is "true", but it is false by default.
> 
> http://tomcat.apache.org/tomcat-8.0-doc/config/systemprops.html
> 
> 
> As this feature is needed, I think that setting has to be hard-coded as 
> "true".

Only an issue if using quoted cookie values with escaped double quotes
in the value (which I suspect is pretty rare outside of our tests).
There is a similar issue in 9.0.x as well.

Rather than always copy the entire cookie header (which could be
expensive) I'll look at copying the value only if necessary in
LegacyCookieProcessor.unescapeDoubleQuotes()

I agree the option will have to be removed / made NO-OP.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1723556 - in /tomcat/trunk: java/org/apache/tomcat/util/http/LegacyCookieProcessor.java webapps/docs/config/cookie-processor.xml

[markt]

Author: markt
Date: Thu Jan  7 14:20:01 2016
New Revision: 1723556

URL: http://svn.apache.org/viewvc?rev=1723556=rev
Log:
Remove unused code

Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java
tomcat/trunk/webapps/docs/config/cookie-processor.xml

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java?rev=1723556=1723555=1723556=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java 
Thu Jan  7 14:20:01 2016
@@ -186,31 +186,6 @@ public final class LegacyCookieProcessor
 }
 
 
-/**
- * @return Always returns true
- *
- * @deprecated No longer used. Cookie headers are now always preserved. 
Will
- * be removed in Tomcat 9.0.x.
- */
-@Deprecated
-public boolean getPreserveCookieHeader() {
-return true;
-}
-
-
-/**
- * NO-OP.
- *
- * @param preserveCookieHeader Ignored
- *
- * @deprecated No longer used. Cookie headers are now always preserved. 
Will
- * be removed in Tomcat 9.0.x.
- */
-@Deprecated
-public void setPreserveCookieHeader(boolean preserveCookieHeader) {
-}
-
-
 public boolean getForwardSlashIsSeparator() {
 return httpSeparatorFlags.get('/');
 }

Modified: tomcat/trunk/webapps/docs/config/cookie-processor.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/cookie-processor.xml?rev=1723556=1723555=1723556=diff
==
--- tomcat/trunk/webapps/docs/config/cookie-processor.xml (original)
+++ tomcat/trunk/webapps/docs/config/cookie-processor.xml Thu Jan  7 14:20:01 
2016
@@ -154,12 +154,6 @@
 
   
 
-  
-This attribute is no longer used. From Tomcat 8.0.31, Tomcat will
-always preserve the cookie header returned by
-HttpServletRequest.getHeader().
-  
-
 
 
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: svn commit: r1723506 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/connector/CoyoteAdapter.java java/org/apache/catalina/connector/Request.java webapps/docs/changelog.xml

[Konstantin Kolinko]

2016-01-07 13:19 GMT+03:00  :
> Author: markt
> Date: Thu Jan  7 10:19:14 2016
> New Revision: 1723506
>
> URL: http://svn.apache.org/viewvc?rev=1723506=rev
> Log:
> Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58809
> Correctly recycle the cookies when mapping requests for parallel deployment
>
> Modified:
> tomcat/tc8.0.x/trunk/   (props changed)
> tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
> tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Request.java
> tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml


> Modified: 
> tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
> URL: 
> http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=1723506=1723505=1723506=diff
> ==
> --- 
> tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java 
> (original)
> +++ 
> tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java 
> Thu Jan  7 10:19:14 2016
> @@ -951,8 +951,8 @@ public class CoyoteAdapter implements Ad
>  // Recycle cookies and session info in case 
> the
>  // correct context is configured with 
> different
>  // settings
> -req.getCookies().recycle();
>  request.recycleSessionInfo();
> +request.recycleCookieInfo(true);
>  }
>  break;
>  }
>
> Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Request.java
> URL: 
> http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Request.java?rev=1723506=1723505=1723506=diff
> ==
> --- tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Request.java 
> (original)
> +++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Request.java Thu 
> Jan  7 10:19:14 2016
> @@ -477,8 +477,6 @@ public class Request
>  parts = null;
>  }
>  partsParseException = null;
> -cookiesParsed = false;
> -cookiesConverted = false;
>  locales.clear();
>  localesParsed = false;
>  secure = false;
> @@ -492,9 +490,9 @@ public class Request
>  attributes.clear();
>  sslAttributesParsed = false;
>  notes.clear();
> -cookies = null;
>
>  recycleSessionInfo();
> +recycleCookieInfo(false);
>
>  if (Globals.IS_SECURITY_ENABLED || Connector.RECYCLE_FACADES) {
>  parameterMap = new ParameterMap<>();
> @@ -554,6 +552,16 @@ public class Request
>  }
>
>
> +protected void recycleCookieInfo(boolean recycleCoyote) {
> +cookiesParsed = false;

Setting "cookiesParsed = false" means that processing of HTTP headers
will be repeated.

This second processing is possible only if
org.apache.tomcat.util.http.ServerCookie.PRESERVE_COOKIE_HEADER
system property is "true", but it is false by default.

http://tomcat.apache.org/tomcat-8.0-doc/config/systemprops.html


As this feature is needed, I think that setting has to be hard-coded as "true".


> +cookiesConverted = false;
> +cookies = null;
> +if (recycleCoyote) {
> +getCoyoteRequest().getCookies().recycle();
> +}
> +}
> +
> +
>  public boolean read() throws IOException {
>  return (inputBuffer.realReadBytes(null, 0, 0) > 0);
>  }
>

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1723554 - /tomcat/trunk/test/org/apache/tomcat/util/http/TestCookieParsing.java

[markt]

Author: markt
Date: Thu Jan  7 14:19:22 2016
New Revision: 1723554

URL: http://svn.apache.org/viewvc?rev=1723554=rev
Log:
Update the test now cookie headers are always preserved.

Modified:
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookieParsing.java

Modified: tomcat/trunk/test/org/apache/tomcat/util/http/TestCookieParsing.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/TestCookieParsing.java?rev=1723554=1723553=1723554=diff
==
--- tomcat/trunk/test/org/apache/tomcat/util/http/TestCookieParsing.java 
(original)
+++ tomcat/trunk/test/org/apache/tomcat/util/http/TestCookieParsing.java Thu 
Jan  7 14:19:22 2016
@@ -49,7 +49,6 @@ public class TestCookieParsing extends T
 
 private static final String[] COOKIES_WITH_QUOTES = new String[] {
 "name=\"val\\\"ue\"" };
-private static final String COOKIES_WITH_QUOTES_MODIFIED = 
"name=\"val\"uee\"";
 
 @Test
 public void testLegacyWithEquals() throws Exception {
@@ -181,26 +180,10 @@ public class TestCookieParsing extends T
 
 @Test
 public void testLegacyPreserveHeader() throws Exception {
-doTestLegacyPreserveHeader(true);
-}
-
-
-@Test
-public void testLegacyNoPreserveHeader() throws Exception {
-doTestLegacyPreserveHeader(false);
-}
-
-
-private void doTestLegacyPreserveHeader(boolean preserveHeader) throws 
Exception {
 LegacyCookieProcessor legacyCookieProcessor = new 
LegacyCookieProcessor();
-legacyCookieProcessor.setPreserveCookieHeader(preserveHeader);
 
 String expected;
-if (preserveHeader) {
-expected = concat(COOKIES_WITH_QUOTES);
-} else {
-expected = COOKIES_WITH_QUOTES_MODIFIED;
-}
+expected = concat(COOKIES_WITH_QUOTES);
 TestCookieParsingClient client = new TestCookieParsingClient(
 legacyCookieProcessor, true, COOKIES_WITH_QUOTES, expected);
 client.doRequest();



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 52028] Embeded Tomcat using a Connector with a random port (port 0)

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=52028

--- Comment #3 from Konstantin Kolinko  ---
Backported to Tomcat 6 (r1723545, r1723551) and will be in 6.0.45 onwards.

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[GUMP@vmgump]: Project tomcat-tc7.0.x-test-nio (in module tomcat-7.0.x) failed

[Bill Barker]

To whom it may engage...

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

Project tomcat-tc7.0.x-test-nio has an issue affecting its community 
integration.
This issue affects 1 projects,
 and has been outstanding for 4 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-tc7.0.x-test-nio :  Tomcat 7.x, a web server implementing Java 
Servlet 3.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-nio/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on tomcat-tc7.0.x-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-tc7.0.x-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-7.0.x/output/logs-NIO
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-NIO/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-nio/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio.html
Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio (Type: Build)
Work ended in a state of : Failed
Elapsed: 39 mins 51 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x 
-Dtest.temp=output/test-tmp-NIO 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160107.jar
 
-Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar
 -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps 
-Dtest.excludePerformance=true 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x 
-Dexecute.test.apr=false -Dexecute.test.bio=false 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/w
 
orkspace/apache-commons/daemon/dist/bin/commons-daemon-20160107-native-src.tar.gz
 -Dtest.reports=output/logs-NIO 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160107-native-src.tar.gz
 -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dexecute.test.nio=true -Dtest.accesslog=true 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20160107.jar
 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-7.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/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-junit4.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-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper-el.jar:/srv/gump/public

svn commit: r1723552 - in /tomcat/trunk: java/org/apache/tomcat/util/http/LegacyCookieProcessor.java webapps/docs/config/cookie-processor.xml

[markt]

Author: markt
Date: Thu Jan  7 14:16:28 2016
New Revision: 1723552

URL: http://svn.apache.org/viewvc?rev=1723552=rev
Log:
Refactor the legacy cookie processor so the cookie header is always preserved.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java
tomcat/trunk/webapps/docs/config/cookie-processor.xml

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java?rev=1723552=1723551=1723552=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java 
Thu Jan  7 14:16:28 2016
@@ -93,8 +93,6 @@ public final class LegacyCookieProcessor
 
 private boolean allowHttpSepsInV0 = false;
 
-private boolean preserveCookieHeader = STRICT_SERVLET_COMPLIANCE;
-
 private boolean alwaysAddExpires = !STRICT_SERVLET_COMPLIANCE;
 
 private final BitSet httpSeparatorFlags = new BitSet(128);
@@ -188,13 +186,28 @@ public final class LegacyCookieProcessor
 }
 
 
+/**
+ * @return Always returns true
+ *
+ * @deprecated No longer used. Cookie headers are now always preserved. 
Will
+ * be removed in Tomcat 9.0.x.
+ */
+@Deprecated
 public boolean getPreserveCookieHeader() {
-return preserveCookieHeader;
+return true;
 }
 
 
+/**
+ * NO-OP.
+ *
+ * @param preserveCookieHeader Ignored
+ *
+ * @deprecated No longer used. Cookie headers are now always preserved. 
Will
+ * be removed in Tomcat 9.0.x.
+ */
+@Deprecated
 public void setPreserveCookieHeader(boolean preserveCookieHeader) {
-this.preserveCookieHeader = preserveCookieHeader;
 }
 
 
@@ -256,17 +269,7 @@ public final class LegacyCookieProcessor
 log.debug("Cookies: Parsing b[]: " + 
cookieValue.toString());
 }
 ByteChunk bc = cookieValue.getByteChunk();
-if (getPreserveCookieHeader()) {
-int len = bc.getLength();
-if (len > 0) {
-byte[] buf = new byte[len];
-System.arraycopy(bc.getBytes(), bc.getOffset(), buf, 
0, len);
-processCookieHeader(buf, 0, len, serverCookies);
-}
-} else {
-processCookieHeader(bc.getBytes(), bc.getOffset(), 
bc.getLength(),
-serverCookies);
-}
+processCookieHeader(bc.getBytes(), bc.getOffset(), 
bc.getLength(), serverCookies);
 }
 
 // search from the next position
@@ -824,19 +827,25 @@ public final class LegacyCookieProcessor
 return;
 }
 
-int src = bc.getStart();
-int end = bc.getEnd();
-int dest = src;
-byte[] buffer = bc.getBuffer();
+// Take a copy of the buffer so the original cookie header is not
+// modified by this unescaping.
+byte[] original = bc.getBuffer();
+int len = bc.getLength();
+
+byte[] copy = new byte[len];
+System.arraycopy(original, bc.getStart(), copy, 0, len);
+
+int src = 0;
+int dest = 0;
 
-while (src < end) {
-if (buffer[src] == '\\' && src < end && buffer[src+1]  == '"') {
+while (src < len) {
+if (copy[src] == '\\' && src < len && copy[src+1]  == '"') {
 src++;
 }
-buffer[dest] = buffer[src];
+copy[dest] = copy[src];
 dest ++;
 src ++;
 }
-bc.setEnd(dest);
+bc.setBytes(copy, 0, dest);
 }
 }

Modified: tomcat/trunk/webapps/docs/config/cookie-processor.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/cookie-processor.xml?rev=1723552=1723551=1723552=diff
==
--- tomcat/trunk/webapps/docs/config/cookie-processor.xml (original)
+++ tomcat/trunk/webapps/docs/config/cookie-processor.xml Thu Jan  7 14:16:28 
2016
@@ -155,13 +155,9 @@
   
 
   
-If this is true Tomcat will ensure that cookie
-processing does not modify cookie header returned by
-HttpServletRequest.getHeader(). If
-org.apache.catalina.STRICT_SERVLET_COMPLIANCE is set to
-true, the default of this setting will be
-true, else the default value will be false.
-
+This attribute is no longer used. From Tomcat 8.0.31, Tomcat will
+always preserve the cookie header returned by
+HttpServletRequest.getHeader().
   
 
 



-
To unsubscribe, 

svn commit: r1723576 - in /tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/connector: ./ TestConnector.java

[kkolinko]

Author: kkolinko
Date: Thu Jan  7 15:30:36 2016
New Revision: 1723576

URL: http://svn.apache.org/viewvc?rev=1723576=rev
Log:
Add testcase for BZ 52028
For https://bz.apache.org/bugzilla/show_bug.cgi?id=52028

Added:

tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/connector/

tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/connector/TestConnector.java
  - copied, changed from r1723488, 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestConnector.java

Copied: 
tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/connector/TestConnector.java
 (from r1723488, 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestConnector.java)
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/connector/TestConnector.java?p2=tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/connector/TestConnector.java=tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestConnector.java=1723488=1723576=1723576=diff
==
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestConnector.java 
(original)
+++ 
tomcat/tc6.0.x/branches/tomcat6-testing_20160106/test/org/apache/catalina/connector/TestConnector.java
 Thu Jan  7 15:30:36 2016
@@ -16,19 +16,12 @@
  */
 package org.apache.catalina.connector;
 
-import java.net.SocketTimeoutException;
+import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-import org.junit.Test;
-
-import org.apache.catalina.Context;
-import org.apache.catalina.Wrapper;
-import org.apache.catalina.startup.TesterServlet;
-import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.Embedded;
 import org.apache.catalina.startup.TomcatBaseTest;
-import org.apache.tomcat.util.buf.ByteChunk;
 
 /**
  * Test cases for {@link Connector}.
@@ -36,61 +29,17 @@ import org.apache.tomcat.util.buf.ByteCh
 public class TestConnector extends TomcatBaseTest {
 
 @Test
-public void testStop() throws Exception {
-Tomcat tomcat = getTomcatInstance();
-
-// No file system docBase required
-Context root = tomcat.addContext("", null);
-Wrapper w =
-Tomcat.addServlet(root, "tester", new TesterServlet());
-w.setAsyncSupported(true);
-root.addServletMapping("/", "tester");
-
-Connector connector = tomcat.getConnector();
-
-tomcat.start();
-
-ByteChunk bc = new ByteChunk();
-int rc = getUrl("http://localhost:; + getPort() + "/", bc, null, null);
-
-assertEquals(200, rc);
-assertEquals("OK", bc.toString());
-
-rc = -1;
-bc.recycle();
-
-connector.stop();
-
-try {
-rc = getUrl("http://localhost:; + getPort() + "/", bc, 1000,
-null, null);
-} catch (SocketTimeoutException ste) {
-// May also see this with NIO
-// Make sure the test passes if we do
-rc = 503;
-}
-assertEquals(503, rc);
-}
-
-
-@Test
 public void testPort() throws Exception {
-Tomcat tomcat = getTomcatInstance();
+Embedded tomcat = getTomcatInstance();
 
-Connector connector1 = tomcat.getConnector();
+// Connector connector1 = tomcat.getConnector();
+Connector connector1 = tomcat.findConnectors()[0];
 connector1.setPort(0);
 
-Connector connector2 = new Connector();
-connector2.setPort(0);
-
-tomcat.getService().addConnector(connector2);
-
 tomcat.start();
 
 int localPort1 = connector1.getLocalPort();
-int localPort2 = connector2.getLocalPort();
 
 assertTrue(localPort1 > 0);
-assertTrue(localPort2 > 0);
 }
 }



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[GUMP@vmgump]: Project tomcat-trunk-test-apr (in module tomcat-trunk) failed

[Bill Barker]

To whom it may engage...

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

Project tomcat-trunk-test-apr 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-apr :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -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.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/logs-APR
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs]



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 54 mins 15 secs
Command Line: /usr/lib/jvm/java-8-oracle/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/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar
 -Dtest.reports=output/logs-APR 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160107-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-trunk/dest-20160107/lib 
-Dtest.relaxTiming=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160107.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160107-native-src.tar.gz
 -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -
 Dexecute.test.nio=false 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20160107/bin/openssl
 -Dexecute.test.apr=true -Dtest.excludePerformance=true 
-Dexecute.test.nio2=false 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/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-junit4.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.ja
 
r:/srv/gump/public/workspace/tomcat-trunk/output/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/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-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/catalina-storeconfig.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

svn commit: r1723586 - in /tomcat/trunk/java/org/apache/catalina: ant/jmx/ authenticator/ connector/ util/

[remm]

Author: remm
Date: Thu Jan  7 16:47:50 2016
New Revision: 1723586

URL: http://svn.apache.org/viewvc?rev=1723586=rev
Log:
Javadoc fixes.

Modified:
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorConditionBase.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
tomcat/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/connector/Response.java
tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java

Modified: 
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorConditionBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorConditionBase.java?rev=1723586=1723585=1723586=diff
==
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorConditionBase.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorConditionBase.java 
Thu Jan  7 16:47:50 2016
@@ -150,8 +150,8 @@ public abstract class JMXAccessorConditi
  * from jmxOpen Task).
  *
  * @return active JMXConnection
- * @throws MalformedURLException
- * @throws IOException
+ * @throws MalformedURLException Invalid URL for JMX server
+ * @throws IOException Connection error
  */
 protected MBeanServerConnection getJMXConnection()
 throws MalformedURLException, IOException {

Modified: 
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java?rev=1723586=1723585=1723586=diff
==
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java 
Thu Jan  7 16:47:50 2016
@@ -113,14 +113,6 @@ public class JMXAccessorCreateTask exten
 
 // -- protected Methods
 
-/**
- * Execute the specified command, based on the configured properties. The
- * input stream will be closed upon completion of this task, whether it was
- * executed successfully or not.
- *
- * @exception Exception
- *if an error occurs
- */
 @Override
 public String jmxExecute(MBeanServerConnection jmxServerConnection)
 throws Exception {
@@ -132,19 +124,19 @@ public class JMXAccessorCreateTask exten
 throw new BuildException(
 "Must specify a 'className' for get");
 }
-return jmxCreate(jmxServerConnection, getName());
+jmxCreate(jmxServerConnection, getName());
+return null;
  }
 
 /**
- * create new Mbean and when set from ClassLoader Objectname
- * @param jmxServerConnection
- * @param name
- * @return The value of the given named attribute
- * @throws Exception
+ * Create new Mbean and when set from ClassLoader Objectname.
+ *
+ * @param jmxServerConnection Connection to the JMX server 
+ * @param name MBean name
+ * @throws Exception Error crating MBean
  */
-protected String jmxCreate(MBeanServerConnection jmxServerConnection,
+protected void jmxCreate(MBeanServerConnection jmxServerConnection,
 String name) throws Exception {
-String error = null;
 Object argsA[] = null;
 String sigA[] = null;
 if (args != null) {
@@ -182,7 +174,6 @@ public class JMXAccessorCreateTask exten
 else
 jmxServerConnection.createMBean(className, new 
ObjectName(name),argsA,sigA);
 }
-return error;
 }
 
 }

Modified: tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java?rev=1723586=1723585=1723586=diff

svn commit: r1723585 - in /tomcat/trunk/java/org/apache/tomcat/util/buf: ByteChunk.java CharChunk.java

[remm]

Author: remm
Date: Thu Jan  7 16:47:09 2016
New Revision: 1723585

URL: http://svn.apache.org/viewvc?rev=1723585=rev
Log:
Javadoc fixes.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java?rev=1723585=1723584=1723585=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java Thu Jan  7 
16:47:09 2016
@@ -90,6 +90,11 @@ public final class ByteChunk implements
 /**
  * Send the bytes ( usually the internal conversion buffer ).
  * Expect 8k output if the buffer is full.
+ *
+ * @param cbuf bytes that will be written
+ * @param off offset in the bytes array
+ * @param len length that will be written
+ * @throws IOException If an I/O occurs while writing the bytes
  */
 public void realWriteBytes(byte cbuf[], int off, int len)
 throws IOException;

Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java?rev=1723585=1723584=1723585=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java Thu Jan  7 
16:47:09 2016
@@ -50,8 +50,14 @@ public final class CharChunk implements
  *  grow the buffer ( up to the limit ) or send it to a channel.
  */
 public static interface CharOutputChannel {
-/** Send the bytes ( usually the internal conversion buffer ).
- *  Expect 8k output if the buffer is full.
+/**
+ * Send the bytes ( usually the internal conversion buffer ).
+ * Expect 8k output if the buffer is full.
+ *
+ * @param cbuf characters that will be written
+ * @param off offset in the characters array
+ * @param len length that will be written
+ * @throws IOException If an I/O occurs while writing the characters
  */
 public void realWriteChars(char cbuf[], int off, int len)
 throws IOException;



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1723578 - /tomcat/tc6.0.x/branches/tomcat6-testing_20160106/BRANCH-README.txt

[kkolinko]

Author: kkolinko
Date: Thu Jan  7 15:36:13 2016
New Revision: 1723578

URL: http://svn.apache.org/viewvc?rev=1723578=rev
Log:
Update BRANCH-README.txt with the current status.

Modified:
tomcat/tc6.0.x/branches/tomcat6-testing_20160106/BRANCH-README.txt

Modified: tomcat/tc6.0.x/branches/tomcat6-testing_20160106/BRANCH-README.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/branches/tomcat6-testing_20160106/BRANCH-README.txt?rev=1723578=1723577=1723578=diff
==
--- tomcat/tc6.0.x/branches/tomcat6-testing_20160106/BRANCH-README.txt 
(original)
+++ tomcat/tc6.0.x/branches/tomcat6-testing_20160106/BRANCH-README.txt Thu Jan  
7 15:36:13 2016
@@ -19,7 +19,9 @@ Current status / Completed:
  consider this class as non-public API at this moment.
 
 
- 2. TestTomcat class has several tests that run successfully and prove the 
concept.
+ 2. There are several test classes that run successfully and prove the concept.
+
+ TestTomcat, TestConnector.
 
  Caveat: The testSingleWebapp() test assumes that examples web application
  has been built and copied into output\build\webapps\examples\
@@ -27,6 +29,10 @@ Current status / Completed:
  Make sure to run Ant build before running the test from within an IDE.
 
 
+ 3. Support for starting Tomcat with a random port number (port number 0)
+ has been implemented. (r1723545 + r1723551, BZ 52028).
+
+
 Known issues / FIXME:
 
  1. I am using org.apache.catalina.startup.Embedded class as the tool that
@@ -41,19 +47,7 @@ Known issues / FIXME:
 instance.   
[Started]
 
 
- 2. Tomcat 6 has no support for starting the server with port number 0  
[Not Started]
-(auto-selecting a free port number).
-
-Current workaround in TomcatBaseTest.setUp() is to use a counter and a
-hardcoded port number of 8080 + counter. See "portIncrement" field in
-TomcatBaseTest class.
-
-I expect to backport support for port number 0 from Tomcat 7.
-
-In Tomcat 7 this is implemented by
-  r1207695 (2011-11-28, BZ 52028), +r1208115, +r1208148.
-
- 3. Tomcat 6 has class org.apache.catalina.ServerFactory that contains a
+ 2. Tomcat 6 has class org.apache.catalina.ServerFactory that contains a
 singleton reference to a Server instance. This field has to be cleared
 after a test run.
 
@@ -67,7 +61,7 @@ Known issues / FIXME:
 Discussed in http://tomcat.markmail.org/thread/ko7ip7obvyaftwe4 
[Not Started]
 
 
- 4. The Engine has no assigned name. Logs print [null] as the name.
+ 3. The Engine has no assigned name. Logs print [null] as the name.
 
 The defaultHost attribute on Engine has not been set. A warning is
 printed in the logs:
@@ -81,7 +75,7 @@ Known issues / FIXME:
 
 Further work / TODO:
 
- 5. Add support for running the tests with Ant.
+ 4. Add support for running the tests with Ant.
 
   *  Add  to the main build.xml file.   
[Not Started]
 
@@ -93,12 +87,12 @@ Further work / TODO:
 
   *  Update BUILDING.txt.   
[Not Started]
 
- 6. Backport support for running with a null docBase (without docBase). 
[Not Started]
+ 5. Backport support for running with a null docBase (without docBase). 
[Not Started]
 
 In Tomcat 7 this is implemented by
   r1681953 (2015-05-27, BZ 57154)
 
- 7. Backport other tests from Tomcat 7. 
[In progress]
+ 6. Backport other tests from Tomcat 7. 
[In progress]
 
 
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release Apache Tomcat Native 1.2.4

[Huxing Zhang]

+1 (non-binding) to release.

Testing environment:
RHEL 6.2, JDK 1.6.0_22, 1.7.0_67, jdk 1.8.0_51, apr 1.5.2, OpenSSL 1.0.2e 3 Dec 
2015

Test results:
* tomcat-native-1.2.4-src.tar.gz md5 sum: valid
* tcnative 1.2.4 binary build with openssl 1.0.2e: success
* run tcnative ant test: success
* Apr test cases run on Tomcat 7.0.67: success 
* Apr test cases run on Tomcat 8 trunk(r1723440): success 
* Apr test cases run on Tomcat 9 trunk(r1723437): success 

--
From:Mark Thomas 
Time:2016 Jan 5 (Tue) 23:46
To:Tomcat Developers List 
Subject:[VOTE] Release Apache Tomcat Native 1.2.4


Version 1.2.4 includes the following change:

- Renegotiation improvements

The proposed release artefacts can be found at [1],
and the build was done using tag [2].

The Apache Tomcat Native 1.2.4 is
 [ ] Stable, go ahead and release
 [ ] Broken because of ...

Thanks,

Mark


[1]
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/native/1.2.4/
[2] https://svn.apache.org/repos/asf/tomcat/native/tags/TOMCAT_NATIVE_1_2_4

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[GUMP@vmgump]: Project tomcat-tc7.0.x-test-apr (in module tomcat-7.0.x) failed

[Bill Barker]

To whom it may engage...

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

Project tomcat-tc7.0.x-test-apr 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-tc7.0.x-test-apr :  Tomcat 7.x, a web server implementing Java 
Servlet 3.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-apr/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on tomcat-tc7.0.x-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-tc7.0.x-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-7.0.x/output/logs-APR
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-APR/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-apr/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr.html
Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 43 mins
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x 
-Dtest.temp=output/test-tmp-APR 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160107.jar
 
-Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar
 -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps 
-Dtest.excludePerformance=true 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x 
-Dexecute.test.apr=true -Dexecute.test.bio=false 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/wo
 
rkspace/apache-commons/daemon/dist/bin/commons-daemon-20160107-native-src.tar.gz
 -Dtest.reports=output/logs-APR 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160107-native-src.tar.gz
 -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20160107/lib 
-Dexecute.test.nio=false -Dtest.accesslog=true 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20160107.jar
 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-7.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/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-junit4.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-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib

svn commit: r1723622 - in /tomcat/trunk/java/org/apache/catalina/ant/jmx: JMXAccessorCreateTask.java JMXAccessorGetTask.java JMXAccessorInvokeTask.java JMXAccessorQueryTask.java JMXAccessorSetTask.jav

[kkolinko]

Author: kkolinko
Date: Thu Jan  7 20:07:58 2016
New Revision: 1723622

URL: http://svn.apache.org/viewvc?rev=1723622=rev
Log:
Fix javadoc (followup to r1723586)

Modified:
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java

Modified: 
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java?rev=1723622=1723621=1723622=diff
==
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java 
Thu Jan  7 20:07:58 2016
@@ -129,11 +129,11 @@ public class JMXAccessorCreateTask exten
  }
 
 /**
- * Create new Mbean and when set from ClassLoader Objectname.
+ * Create new MBean from ClassLoader identified by an ObjectName.
  *
- * @param jmxServerConnection Connection to the JMX server 
+ * @param jmxServerConnection Connection to the JMX server
  * @param name MBean name
- * @throws Exception Error crating MBean
+ * @throws Exception Error creating MBean
  */
 protected void jmxCreate(MBeanServerConnection jmxServerConnection,
 String name) throws Exception {

Modified: tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java?rev=1723622=1723621=1723622=diff
==
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java Thu 
Jan  7 20:07:58 2016
@@ -98,7 +98,7 @@ public class JMXAccessorGetTask extends
 /**
  * Get property value.
  *
- * @param jmxServerConnection The JMX connection name
+ * @param jmxServerConnection Connection to the JMX server
  * @param name The MBean name
  * @return The error message if any
  * @throws Exception An error occurred

Modified: 
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java?rev=1723622=1723621=1723622=diff
==
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java 
Thu Jan  7 20:07:58 2016
@@ -148,7 +148,7 @@ public class JMXAccessorInvokeTask exten
 /**
  * Invoke specified operation.
  *
- * @param jmxServerConnection The JMX connection name
+ * @param jmxServerConnection Connection to the JMX server
  * @param name The MBean name
  * @return null (no error message to report other than exception)
  * @throws Exception An error occurred

Modified: 
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java?rev=1723622=1723621=1723622=diff
==
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java Thu 
Jan  7 20:07:58 2016
@@ -98,7 +98,7 @@ public class JMXAccessorQueryTask extend
  * Call Mbean server for some mbeans with same domain, attributes.
  *  with attributebinding=true you can save all attributes from 
all found objects
  *
- * @param jmxServerConnection The JMX connection name
+ * @param jmxServerConnection Connection to the JMX server
  * @param qry The query
  * @return null (no error message to report other than exception)
  */

Modified: tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java?rev=1723622=1723621=1723622=diff
==
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java Thu 
Jan  7 20:07:58 2016
@@ -145,7 +145,7 @@ public class JMXAccessorSetTask extends
 /**
  * Set property value.
  *
- * 

[Bug 58821] NPE in at org.apache.coyote.http11.InternalNioOutputBuffer.flushBuffer(InternalNioOutputBuffer.java:234)

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58821

--- Comment #2 from Julie  ---
More from the same log 

TomcatLog Servlet.service() for servlet [default] in context with path [/]
threw exception
java.lang.NullPointerException
 at
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:246)
 at
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)
 at
org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:219)
 at
org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:106)
 at
org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:501)
 at
org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:142)
 at
org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:79)
 at
org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:88)
 at
org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:537)
 at
org.apache.coyote.http11.AbstractHttp11Processor.process(AbstractHttp11Processor.java:1085)
 at
org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process(AbstractProtocol.java:658)
 at
org.apache.coyote.http11.Http11NioProtocol$Http11ConnectionHandler.process(Http11NioProtocol.java:222)
 at
org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1556)
 at
org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.run(NioEndpoint.java:1513)
 at
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
 at
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
 at
org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61)
 at java.lang.Thread.run(Thread.java:745)

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 58821] NPE in at org.apache.coyote.http11.InternalNioOutputBuffer.flushBuffer(InternalNioOutputBuffer.java:234)

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58821

--- Comment #5 from Konstantin Kolinko  ---
Set system property [1]
 org.apache.catalina.connector.RECYCLE_FACADES=true

and re-test with a more recent version (the current version is 8.0.30)



[1] http://tomcat.apache.org/tomcat-8.0-doc/config/systemprops.html#Security

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1723611 - /tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

[kkolinko]

Author: kkolinko
Date: Thu Jan  7 18:42:43 2016
New Revision: 1723611

URL: http://svn.apache.org/viewvc?rev=1723611=rev
Log:
Fix changelog broken by a typo in r1723506 (BZ 58809)

Tomcat 8 buildbot was failing at compile step thanks to this typo.

Modified:
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1723611=1723610=1723611=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Thu Jan  7 18:42:43 2016
@@ -115,7 +115,7 @@
 it is read-only. (kkolinko)
   
   
-58809/bug>: Correctly recycle cookies when mapping requests for
+58809: Correctly recycle cookies when mapping requests for
 parallel deployment. As a side-effect of this fix, the system property
 
org.apache.tomcat.util.http.ServerCookie.PRESERVE_COOKIE_HEADER
 is no longer used. From this release, Tomcat will always preserve the



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 58821] New: NPE in at org.apache.coyote.http11.InternalNioOutputBuffer.flushBuffer(InternalNioOutputBuffer.java:234)

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58821

Bug ID: 58821
   Summary: NPE in at
org.apache.coyote.http11.InternalNioOutputBuffer.flush
Buffer(InternalNioOutputBuffer.java:234)
   Product: Tomcat 8
   Version: 8.0.15
  Hardware: All
OS: All
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: julie...@gmail.com

WE are using tomcat 8.0.15 in our product. Under traffic we see below
exceptions in our logs 

TomcatLog  Error finishing response
java.lang.NullPointerException 
 at
org.apache.coyote.http11.InternalNioOutputBuffer.flushBuffer(InternalNioOutputBuffer.java:234)
 
 at
org.apache.coyote.http11.InternalNioOutputBuffer.addToBB(InternalNioOutputBuffer.java:189)
 
 at
org.apache.coyote.http11.InternalNioOutputBuffer.commit(InternalNioOutputBuffer.java:177)
 
 at
org.apache.coyote.http11.AbstractHttp11Processor.action(AbstractHttp11Processor.java:739)
 
 at org.apache.coyote.Response.action(Response.java:179) 
 at
org.apache.coyote.http11.AbstractOutputBuffer.endRequest(AbstractOutputBuffer.java:369)
 
 at
org.apache.coyote.http11.AbstractHttp11Processor.endRequest(AbstractHttp11Processor.java:1773)
 
 at
org.apache.coyote.http11.AbstractHttp11Processor.process(AbstractHttp11Processor.java:1142)
 
 at
org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process(AbstractProtocol.java:658)
 
 at
org.apache.coyote.http11.Http11NioProtocol$Http11ConnectionHandler.process(Http11NioProtocol.java:222)
 
 at
org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1556)
 
 at
org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.run(NioEndpoint.java:1513)
 
 at
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142) 
 at
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617) 
 at
org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61)
 
 at java.lang.Thread.run(Thread.java:745) 


and 
TomcatLog Error processing request
java.lang.NullPointerException 
 at
org.apache.catalina.connector.Request.notifyAttributeAssigned(Request.java:1492)
 
 at org.apache.catalina.connector.Request.setAttribute(Request.java:1482) 
 at
org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:154) 
 at
org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:79) 
 at
org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:88)
 
 at
org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:537) 
 at
org.apache.coyote.http11.AbstractHttp11Processor.process(AbstractHttp11Processor.java:1085)
 
 at
org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process(AbstractProtocol.java:658)
 
 at
org.apache.coyote.http11.Http11NioProtocol$Http11ConnectionHandler.process(Http11NioProtocol.java:222)
 
 at
org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1556)
 
 at
org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.run(NioEndpoint.java:1513)
 
 at
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142) 
 at
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617) 
 at
org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61)
 
 at java.lang.Thread.run(Thread.java:745)

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 58821] NPE in at org.apache.coyote.http11.InternalNioOutputBuffer.flushBuffer(InternalNioOutputBuffer.java:234)

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58821

--- Comment #1 from Julie  ---
Also,

TomcatLog Encountered a non-recycled response and recycled it forcedly.
org.apache.catalina.connector.CoyoteAdapter$RecycleRequiredException
 at
org.apache.catalina.connector.CoyoteAdapter.checkRecycled(CoyoteAdapter.java:720)
 at
org.apache.coyote.http11.AbstractHttp11Processor.recycle(AbstractHttp11Processor.java:1798)
 at
org.apache.coyote.http11.Http11NioProtocol$Http11ConnectionHandler.release(Http11NioProtocol.java:239)
 at
org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process(AbstractProtocol.java:733)
 at
org.apache.coyote.http11.Http11NioProtocol$Http11ConnectionHandler.process(Http11NioProtocol.java:222)
 at
org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1556)
 at
org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.run(NioEndpoint.java:1513)
 at
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
 at
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
 at
org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61)
 at java.lang.Thread.run(Thread.java:745)

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 58821] NPE in at org.apache.coyote.http11.InternalNioOutputBuffer.flushBuffer(InternalNioOutputBuffer.java:234)

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58821

--- Comment #4 from Julie  ---
Thanks Chuck(In reply to Chuck Caldarale from comment #3)
> Bugzilla is not a support forum.  Since you have already posted your query
> on the users' mailing list, it will be responded to there.

Thanks Chuck. Appreciate prompt reply .

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 58646] NullPointerException in InternalNioOutputBuffer

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58646

--- Comment #13 from Julie  ---
(In reply to Alexander Malyshev from comment #12)
> Yes, I agree. For some reason I can easily reproduce it with clean tomcat
> 8.0.29, but once I add logging to it to investigate further - it disappears..
> I'll be running more traffic during this week so, hopefully, I'll be able to
> catch it.

Were you able to reproduce the issue with traffic ?

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 58821] NPE in at org.apache.coyote.http11.InternalNioOutputBuffer.flushBuffer(InternalNioOutputBuffer.java:234)

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58821

Chuck Caldarale  changed:

   What|Removed |Added

 Resolution|--- |INVALID
 Status|NEW |RESOLVED

--- Comment #3 from Chuck Caldarale  ---
Bugzilla is not a support forum.  Since you have already posted your query on
the users' mailing list, it will be responded to there.

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 58646] NullPointerException in InternalNioOutputBuffer

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58646

--- Comment #14 from Julie  ---
I am seeing similar errors in my log under traffic. I am using tomcat 8.0.15

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[GUMP@vmgump]: Project tomcat-trunk-validate (in module tomcat-trunk) failed

[Bill Barker]

To whom it may engage...

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

Project tomcat-trunk-validate 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-validate :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on checkstyle exists, no need to add for property 
checkstyle.jar.
 -INFO- Failed with reason build failed



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/gump_work/build_tomcat-trunk_tomcat-trunk-validate.html
Work Name: build_tomcat-trunk_tomcat-trunk-validate (Type: Build)
Work ended in a state of : Failed
Elapsed: 1 min 37 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-6.15-SNAPSHOT.jar
 -Dexecute.validate=true validate 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/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-junit4.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/checkstyle/target/checkstyle-6.15-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20160107.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.4-SNAPSHOT.jar:/srv/gump/public/workspace/commons-lang-trunk/target/commons-lang3-3.5-SNAPSHOT.ja
 
r:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-20160107.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20160107.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-20.0-SNAPSHOT.jar
-
Buildfile: /srv/gump/public/workspace/tomcat-trunk/build.xml

build-prepare:
   [delete] Deleting directory 
/srv/gump/public/workspace/tomcat-trunk/output/build/temp
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/build/temp

compile-prepare:

download-validate:

testexist:
 [echo] Testing  for 
/srv/gump/public/workspace/checkstyle/target/checkstyle-6.15-SNAPSHOT.jar

setproxy:

downloadfile:

validate:
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/res/checkstyle
[checkstyle] Running Checkstyle 6.15-SNAPSHOT on 3039 files
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java:134:
 Line matches the illegal pattern '\s+$'. [RegexpSingleline]

BUILD FAILED
/srv/gump/public/workspace/tomcat-trunk/build.xml:554: Got 1 errors and 0 
warnings.

Total time: 1 minute 36 seconds
-

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

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

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

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org