svn commit: r1789748 - in /tomcat/tc8.0.x/trunk: ./ build.properties.default build.xml java/org/apache/tomcat/buildutil/SignCode.java webapps/docs/changelog.xml

2017-03-31 Thread markt
Author: markt
Date: Fri Mar 31 20:38:23 2017
New Revision: 1789748

URL: http://svn.apache.org/viewvc?rev=1789748=rev
Log:
Update for API changes (client cert is now required) for Symantec code signing 
service

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/build.properties.default
tomcat/tc8.0.x/trunk/build.xml
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/buildutil/SignCode.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 31 20:38:23 2017
@@ -1,2 +1,2 @@
 
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1782037,1782240,1782386-1782387,1785669,1786845,1788249,1788324,1788905,1789216,1789335
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,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,1657
 
592,1657607,1657609,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-1
 
666387,1666494,1666496,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,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-168452
 

svn commit: r1789747 - in /tomcat/tc8.5.x/trunk: ./ build.properties.default build.xml java/org/apache/tomcat/buildutil/SignCode.java webapps/docs/changelog.xml

2017-03-31 Thread markt
Author: markt
Date: Fri Mar 31 20:37:14 2017
New Revision: 1789747

URL: http://svn.apache.org/viewvc?rev=1789747=rev
Log:
Update for API changes (client cert is now required) for Symantec code signing 
service

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/build.properties.default
tomcat/tc8.5.x/trunk/build.xml
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/buildutil/SignCode.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 31 20:37:14 2017
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
 
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
 
756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-1762053,1762123,1762168,176217
 

svn commit: r1789745 - /tomcat/trunk/build.xml

2017-03-31 Thread markt
Author: markt
Date: Fri Mar 31 20:26:29 2017
New Revision: 1789745

URL: http://svn.apache.org/viewvc?rev=1789745=rev
Log:
Installer signing needs client cert too

Modified:
tomcat/trunk/build.xml

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1789745=1789744=1789745=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Fri Mar 31 20:26:29 2017
@@ -2095,6 +2095,8 @@ skip.installer property in build.propert
 classpath="${tomcat.classes}" />
 



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



svn commit: r1789744 - in /tomcat/trunk: build.xml java/org/apache/tomcat/buildutil/SignCode.java webapps/docs/changelog.xml

2017-03-31 Thread markt
Author: markt
Date: Fri Mar 31 20:18:32 2017
New Revision: 1789744

URL: http://svn.apache.org/viewvc?rev=1789744=rev
Log:
Complete fixes to code signing task
- update URL
- make the debug log that was actually useful configurable

Modified:
tomcat/trunk/build.xml
tomcat/trunk/java/org/apache/tomcat/buildutil/SignCode.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1789744=1789743=1789744=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Fri Mar 31 20:18:32 2017
@@ -2059,7 +2059,7 @@ skip.installer property in build.propert
 classpath="${tomcat.classes}" />
 http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/buildutil/SignCode.java?rev=1789744=1789743=1789744=diff
==
--- tomcat/trunk/java/org/apache/tomcat/buildutil/SignCode.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/buildutil/SignCode.java Fri Mar 31 
20:18:32 2017
@@ -25,14 +25,12 @@ import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 import java.util.zip.ZipOutputStream;
 
 import javax.xml.soap.MessageFactory;
-import javax.xml.soap.MimeHeader;
 import javax.xml.soap.SOAPBody;
 import javax.xml.soap.SOAPConnection;
 import javax.xml.soap.SOAPConnectionFactory;
@@ -65,7 +63,8 @@ public class SignCode extends Task {
 
 static {
 try {
-SIGNING_SERVICE_URL = new 
URL("https://api.ws.symantec.com/webtrust/SigningService;);
+SIGNING_SERVICE_URL = new URL(
+
"https://api-appsec-cws.ws.symantec.com/webtrust/SigningService;);
 } catch (MalformedURLException e) {
 throw new IllegalArgumentException(e);
 }
@@ -85,6 +84,7 @@ public class SignCode extends Task {
 private String applicationName;
 private String applicationVersion;
 private String signingService;
+private boolean debug;
 
 public void addFileset(FileSet fileset) {
 filesets.add(fileset);
@@ -131,6 +131,11 @@ public class SignCode extends Task {
 }
 
 
+public void setDebug(String debug) {
+this.debug = Boolean.parseBoolean(debug);
+}
+
+
 @Override
 public void execute() throws BuildException {
 
@@ -204,11 +209,10 @@ public class SignCode extends Task {
 log("Sending singing request to server and waiting for response");
 SOAPMessage response = connection.call(message, SIGNING_SERVICE_URL);
 
-// Temporary debug code
-Iterator iter = response.getMimeHeaders().getAllHeaders();
-while (iter.hasNext()) {
-MimeHeader mh = (MimeHeader) iter.next();
-log("Response header: Name: [" + mh.getName() + "], Value: [" + 
mh.getValue() + "]");
+if (debug) {
+ByteArrayOutputStream baos = new ByteArrayOutputStream(2 * 1024);
+response.writeTo(baos);
+log(baos.toString("UTF-8"));
 }
 
 log("Processing response");

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1789744=1789743=1789744=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Mar 31 20:18:32 2017
@@ -85,6 +85,11 @@
 Review i18n property files, remove unencessary escaping and 
consistently
 use [...] to delimit inserted values. (markt)
   
+  
+Update the custom Ant task that integrates with the Symantec code
+signing service to use the now mandatory 2-factor authentication.
+(markt)
+  
 
   
 



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



svn commit: r1789735 - /tomcat/trunk/java/org/apache/tomcat/buildutil/SignCode.java

2017-03-31 Thread markt
Author: markt
Date: Fri Mar 31 19:18:08 2017
New Revision: 1789735

URL: http://svn.apache.org/viewvc?rev=1789735=rev
Log:
Add debug to try and figure out what is going wrong

Modified:
tomcat/trunk/java/org/apache/tomcat/buildutil/SignCode.java

Modified: tomcat/trunk/java/org/apache/tomcat/buildutil/SignCode.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/buildutil/SignCode.java?rev=1789735=1789734=1789735=diff
==
--- tomcat/trunk/java/org/apache/tomcat/buildutil/SignCode.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/buildutil/SignCode.java Fri Mar 31 
19:18:08 2017
@@ -25,12 +25,14 @@ import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 import java.util.zip.ZipOutputStream;
 
 import javax.xml.soap.MessageFactory;
+import javax.xml.soap.MimeHeader;
 import javax.xml.soap.SOAPBody;
 import javax.xml.soap.SOAPConnection;
 import javax.xml.soap.SOAPConnectionFactory;
@@ -202,6 +204,13 @@ public class SignCode extends Task {
 log("Sending singing request to server and waiting for response");
 SOAPMessage response = connection.call(message, SIGNING_SERVICE_URL);
 
+// Temporary debug code
+Iterator iter = response.getMimeHeaders().getAllHeaders();
+while (iter.hasNext()) {
+MimeHeader mh = (MimeHeader) iter.next();
+log("Response header: Name: [" + mh.getName() + "], Value: [" + 
mh.getValue() + "]");
+}
+
 log("Processing response");
 SOAPElement responseBody = response.getSOAPBody();
 



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



svn commit: r1789733 - in /tomcat/trunk: build.properties.default build.xml java/org/apache/tomcat/buildutil/SignCode.java

2017-03-31 Thread markt
Author: markt
Date: Fri Mar 31 19:05:33 2017
New Revision: 1789733

URL: http://svn.apache.org/viewvc?rev=1789733=rev
Log:
Update for API changes (client cert is now required) for Symantec code signing 
service

Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/build.xml
tomcat/trunk/java/org/apache/tomcat/buildutil/SignCode.java

Modified: tomcat/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1789733=1789732=1789733=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Fri Mar 31 19:05:33 2017
@@ -71,6 +71,8 @@ do.codesigning=false
 codesigning.user=request-via-pmc
 codesigning.pwd=request-via-pmc
 codesigning.partnercode=request-via-pmc
+codesigning.keyStore=request-via-pmc
+codesigning.keyStorePassword=request-via-pmc
 codesigning.service=Microsoft Windows Signing
 
 # - Settings to use when downloading files -

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1789733=1789732=1789733=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Fri Mar 31 19:05:33 2017
@@ -2059,6 +2059,8 @@ skip.installer property in build.propert
 classpath="${tomcat.classes}" />
 

Modified: tomcat/trunk/java/org/apache/tomcat/buildutil/SignCode.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/buildutil/SignCode.java?rev=1789733=1789732=1789733=diff
==
--- tomcat/trunk/java/org/apache/tomcat/buildutil/SignCode.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/buildutil/SignCode.java Fri Mar 31 
19:05:33 2017
@@ -78,6 +78,8 @@ public class SignCode extends Task {
 private String userName;
 private String password;
 private String partnerCode;
+private String keyStore;
+private String keyStorePassword;
 private String applicationName;
 private String applicationVersion;
 private String signingService;
@@ -102,6 +104,16 @@ public class SignCode extends Task {
 }
 
 
+public void setKeyStore(String keyStore) {
+this.keyStore = keyStore;
+}
+
+
+public void setKeyStorePassword(String keyStorePassword) {
+this.keyStorePassword = keyStorePassword;
+}
+
+
 public void setApplicationName(String applicationName) {
 this.applicationName = applicationName;
 }
@@ -136,6 +148,10 @@ public class SignCode extends Task {
 }
 }
 
+// Set up the TLS client
+System.setProperty("javax.net.ssl.keyStore", keyStore);
+System.setProperty("javax.net.ssl.keyStorePassword", keyStorePassword);
+
 try {
 String signingSetID = makeSigningRequest(filesToSign);
 downloadSignedFiles(filesToSign, signingSetID);



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



Re: [VOTE] Release Apache Tomcat 6.0.52

2017-03-31 Thread Violeta Georgieva
Hi,

2017-03-31 20:53 GMT+03:00 Rainer Jung :
>
> Am 31.03.2017 um 16:09 schrieb Violeta Georgieva:
>>
>> Hi,
>>
>> 2017-03-31 0:55 GMT+03:00 Rainer Jung :
>>>
>>>
>>
>> I do not see problems on Windows OS, I'm going to test on Ubuntu
>> One question: Do you experience this issue only with 6.0.52? What about
>> 0.6.51?
>
>
> I have to try it. It did not happen in 6.0.50. I'll try with 51 and let
you know but probably only tomorrow.

I succeeded to reproduce it on Windows and Ubuntu.
It is happening only with this version 6.0.52.

I'm working on a patch.

Regards,
Violeta

>> Thanks a lot,
>
>
> Thanks to you!
>
>
> Rainer
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>


Re: [VOTE] Release Apache Tomcat 6.0.52

2017-03-31 Thread Rainer Jung

Am 31.03.2017 um 16:09 schrieb Violeta Georgieva:

Hi,

2017-03-31 0:55 GMT+03:00 Rainer Jung :




I do not see problems on Windows OS, I'm going to test on Ubuntu
One question: Do you experience this issue only with 6.0.52? What about
0.6.51?


I have to try it. It did not happen in 6.0.50. I'll try with 51 and let 
you know but probably only tomorrow.



Thanks a lot,


Thanks to you!

Rainer

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



Re: Host header validation

2017-03-31 Thread Mark Thomas
On 31/03/17 14:41, Mark Thomas wrote:
> On 31/03/17 09:43, Katya Todorova wrote:



>> I've created a separate pull request for leading zeros issue since I think
>> it requires additional discussion whether to be submitted or not. Although
>> this fix honors the specification, it leads to different behavior in case
>> of IPv4 address and IPv6 address with IPv4 part. This may cause confusion:
>> https://github.com/apache/tomcat/pull/49
> 
> Thanks for separating this out. It gives folks time to go and read the
> specification and form an opinion.

I've taken a look.

The spec is clear that leading zeros are not permitted in IPv4 addresses
as used in the authority component of a URI (or when the IPv4 address
appears as part of the IPv6 address).

However, I don't see the harm in allowing them and doing so makes the
parsing/validation simpler and therefore faster. Therefore, I'm leaning
towards being lenient and allowing leading zeros in IPv4 address components.

Mark

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



[GitHub] tomcat issue #50: update the download of objenesis

2017-03-31 Thread markt-asf
Github user markt-asf commented on the issue:

https://github.com/apache/tomcat/pull/50
  
This change was made to trunk over 6 months ago.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

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



[GitHub] tomcat pull request #50: update the download of objenesis

2017-03-31 Thread markt-asf
Github user markt-asf closed the pull request at:

https://github.com/apache/tomcat/pull/50


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

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



[GitHub] tomcat issue #50: update the download of objenesis

2017-03-31 Thread violetagg
Github user violetagg commented on the issue:

https://github.com/apache/tomcat/pull/50
  
Hi,

Are you sure that your repository is up-to-date?
The current revision is 
https://github.com/violetagg/tomcat/blob/trunk/build.properties.default#L189

Regards,
Violeta


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

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



svn commit: r1789689 - /tomcat/trunk/res/maven/mvn-pub.xml

2017-03-31 Thread markt
Author: markt
Date: Fri Mar 31 14:13:21 2017
New Revision: 1789689

URL: http://svn.apache.org/viewvc?rev=1789689=rev
Log:
Revert accidental commit

Modified:
tomcat/trunk/res/maven/mvn-pub.xml

Modified: tomcat/trunk/res/maven/mvn-pub.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/mvn-pub.xml?rev=1789689=1789688=1789689=diff
==
--- tomcat/trunk/res/maven/mvn-pub.xml (original)
+++ tomcat/trunk/res/maven/mvn-pub.xml Fri Mar 31 14:13:21 2017
@@ -49,18 +49,35 @@
 
 
 
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
+
+  
+  
+  
+  
+  
+  
+
+
+  
+  
+  
+  
+  
+  
+
+
+  
+  
+  
+  
+  
+  
+  
+  
+
 
 
 
@@ -114,14 +131,26 @@
 
 
 
-
-  
-  
-
-
-  
-  
-
+
+  
+  
+  
+  
+  
+  
+
+
+  
+  
+  
+  
+  
+  
+  
+  
+
 
 
   
@@ -169,18 +198,35 @@
 
 
 
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
+
+  
+  
+  
+  
+  
+  
+
+
+  
+  
+  
+  
+  
+  
+
+
+  
+  
+  
+  
+  
+  
+  
+  
+
 
 
 
@@ -216,7 +262,7 @@
 
   
 
-  
+  
 
 
 
   
 
-  
-
-  
-
-  
+  
 
   
 
@@ -370,19 +412,4 @@
 
   
 
-  
-
-
-  
-  
-  
-  
-  
-  
-  
-  
-
-  
-
 



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



Re: svn commit: r1789685 - in /tomcat/trunk: java/org/apache/tomcat/util/http/parser/HttpParser.java res/maven/mvn-pub.xml test/org/apache/tomcat/util/http/parser/TestHttpParserHost.java webapps/docs/

2017-03-31 Thread Mark Thomas
On 31/03/17 14:45, Violeta Georgieva wrote:
> Hi Mark,
> 
> 2017-03-31 16:37 GMT+03:00 :
>>
>> Author: markt
>> Date: Fri Mar 31 13:37:32 2017
>> New Revision: 1789685
>>
>> URL: http://svn.apache.org/viewvc?rev=1789685=rev
>> Log:
>> Correct various edge cases in the new HTTP Host header validation parser.
>> Patch provided by Katya Todorova.
>> This closes #48
>>
>> Fix IPv6/IPv4 parsing for host header:
>> - chars other than : should not be allowed in IPv6 address after ]
>> - ::: should not present in IPv6 address
>> - IPv4 part of IPv6 address was not correctly parsed (1 symbol of
> IPv4 part was ignored)
>> - tests added to cover IPv4/6 parsing
>> - parsed test class fixed not to throw NPE when an exception is
> expected but not thrown
>>
>> Modified:
>> tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
>> tomcat/trunk/res/maven/mvn-pub.xml
>>
> tomcat/trunk/test/org/apache/tomcat/util/http/parser/TestHttpParserHost.java
>> tomcat/trunk/webapps/docs/changelog.xml
>>
>> Modified:
> tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
>> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java?rev=1789685=1789684=1789685=diff
>>
> ==
>> --- tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
> (original)
>> +++ tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
> Fri Mar 31 13:37:32 2017
>> @@ -553,45 +553,50 @@ public class HttpParser {
>>  int h16Size = 0;
>>  int pos = 1;
>>  boolean parsedDoubleColon = false;
>> -boolean previousWasColon = false;
>> +int precedingColonsCount = 0;
>>
>>  do {
>>  c = reader.read();
>> -if (h16Count == 0 && previousWasColon && c != ':') {
>> +if (h16Count == 0 && precedingColonsCount == 1 && c != ':') {
>>  // Can't start with a single :
>>  throw new IllegalArgumentException();
>>  }
>>  if (HttpParser.isHex(c)) {
>>  if (h16Size == 0) {
>>  // Start of a new h16 block
>> -previousWasColon = false;
>> +precedingColonsCount = 0;
>>  h16Count++;
>> -reader.mark(4);
>>  }
>>  h16Size++;
>>  if (h16Size > 4) {
>>  throw new IllegalArgumentException();
>>  }
>>  } else if (c == ':') {
>> -if (previousWasColon) {
>> -// End of ::
>> -if (parsedDoubleColon) {
>> -// Only allowed one :: sequence
>> -throw new IllegalArgumentException();
>> -}
>> -parsedDoubleColon = true;
>> -previousWasColon = false;
>> -// :: represents at least one h16 block
>> -h16Count++;
>> +if (precedingColonsCount >=2 ) {
>> +// ::: is not allowed
>> +throw new IllegalArgumentException();
>>  } else {
>> -previousWasColon = true;
>> +if(precedingColonsCount == 1) {
>> +// End of ::
>> +if (parsedDoubleColon ) {
>> +// Only allowed one :: sequence
>> +throw new IllegalArgumentException();
>> +}
>> +parsedDoubleColon = true;
>> +// :: represents at least one h16 block
>> +h16Count++;
>> +}
>> +precedingColonsCount++;
>> +// mark if the next symbol is hex before the actual
> read
>> +reader.mark(4);
>>  }
>>  h16Size = 0;
>>  } else if (c == ']') {
>> -if (previousWasColon) {
>> +if (precedingColonsCount == 1) {
>>  // Can't end on a single ':'
>>  throw new IllegalArgumentException();
>>  }
>> +pos++;
>>  break;
>>  } else if (c == '.') {
>>  if (h16Count == 7 || h16Count < 7 && parsedDoubleColon) {
>> @@ -617,9 +622,12 @@ public class HttpParser {
>>
>>  c = reader.read();
>>  if (c == ':') {
>> -return pos + 1;
>> +return pos;
>>  } else {
>> -return -1;
>> +if(c == -1) {
>> +return -1;
>> +}
>> +throw new IllegalArgumentException();
>>  }
>>  }
>>
>>
>> Modified: tomcat/trunk/res/maven/mvn-pub.xml
> 
> Isn't the change 

Re: [VOTE] Release Apache Tomcat 6.0.52

2017-03-31 Thread Violeta Georgieva
Hi,

2017-03-31 0:55 GMT+03:00 Rainer Jung :
>

I do not see problems on Windows OS, I'm going to test on Ubuntu
One question: Do you experience this issue only with 6.0.52? What about
0.6.51?

Thanks a lot,
Violeta

> Using gdb I see:
>
> Case 1:
>
> #7  impl_pollset_remove (pollset=0xeebf68, descriptor=0xb377f6a4) at
poll/unix/port.c:283
> fd = 
> ep = 
> rv = 0
> res = 
> err = 0
> found = 
> #8  0xfaddfcdc in apr_pollset_remove (pollset=0xeebf68,
descriptor=descriptor@entry=0xb377f6a4) at poll/unix/pollset.c:343
> No locals.
> #9  0xfaed4b88 in Java_org_apache_tomcat_jni_Poll_maintain (e=0x659884,
o=, pollset=, set=0xb377f82c,
remove=) at src/poll.c:484
> fd = {p = 0x0, desc_type = APR_POLL_SOCKET, reqevents = 5,
rtnevents = 0, desc = {f = 0x0, s = 0x0}, client_data = 0xe527b8}
> s = 
> p = 0x1157648
> i = 0
> num = 1
> now = 
> ep = 
> ip = 
>
> (gdb) print *pollset
> $1 = {pool = 0xeebf28, nelts = 0, nalloc = 8193, flags = 6, wakeup_pipe =
{0x1157558, 0x11575a8}, wakeup_pfd = {p = 0xeebf28, desc_type =
APR_POLL_FILE, reqevents = 1,
> rtnevents = -16516, desc = {f = 0x1157558, s = 0x1157558},
client_data = 0xeebf7c}, p = 0xeebfa0, provider = 0xfadf8838}
> (gdb) print *descriptor
> $2 = {p = 0x0, desc_type = APR_POLL_SOCKET, reqevents = 5, rtnevents = 0,
desc = {f = 0x0, s = 0x0}, client_data = 0xe527b8}
> (gdb) print *pollset->pool
> $3 = {parent = 0x6557d0, child = 0x0, sibling = 0x0, ref = 0x13b8c60,
cleanups = 0x1157638, free_cleanups = 0x0, allocator = 0x319d68,
subprocesses = 0x0, abort_fn = 0,
>   user_data = 0x0, tag = 0x0, active = 0xde0a50, self = 0xeebf10,
self_first_avail = 0xeebf68 "", pre_cleanups = 0x0}
>
>
> So we crash here:
>
> 282 if (descriptor->desc_type == APR_POLL_SOCKET) {
> => 283 fd = descriptor->desc.s->socketdes;
> 284 }
> ...
>
> because descriptor->desc.s is NULL.
>
>
> Case 2:
>
> #8  0xfadd8980 in allocator_free (node=0xb8f170, allocator=0x2d8238) at
memory/unix/apr_pools.c:370
> freelist = 0x0
> max_index = 
> max_free_index = 
> next = 
> index = 
> current_free_index = 
> #9  apr_pool_destroy (pool=0xb8f188) at memory/unix/apr_pools.c:856
> active = 0xb8f170
> allocator = 0x2d8238
>
> (gdb) print *node
> $2 = {next = 0x0, ref = 0xb8f170, index = 0, free_index = 1465,
first_avail = 0x0, endp = 0xb91170 ""}
> (gdb) print *allocator
> $1 = {max_index = 7756680, max_free_index = 1601139303,
current_free_index = 0, mutex = 0x6368655f, owner = 0x0, free =
{0x61745f6a, 0x0, 0x72726f72, 0x5f737472, 0x6572726f,
> 0x7200, 0x4, 0x7a8, 0x, 0x0, 0x6, 0xb91b20, 0x7,
0x765b88, 0x, 0x0, 0x9, 0x, 0x, 0xa}}
> (gdb) print *allocator->mutex
> Cannot access memory at address 0x6368655f
>
>
> So we crash here:
>
>  369 if (allocator->mutex)
> =>  370 apr_thread_mutex_lock(allocator->mutex);
>
> since the mutex is already invalid.
>
>
> Case 3:
>
> #8  0xfadd8980 in allocator_free (node=0x5bd138, allocator=0xd7f138) at
memory/unix/apr_pools.c:370
> freelist = 0x0
> max_index = 
> max_free_index = 
> next = 
> index = 
> current_free_index = 
> #9  apr_pool_destroy (pool=0x5bd150) at memory/unix/apr_pools.c:856
> active = 0x5bd138
> allocator = 0xd7f138
>
> (gdb) print *node
> $1 = {next = 0x6d1bd8, ref = 0x5bd138, index = 0, free_index = 65,
first_avail = 0xf24cf8 "", endp = 0x5bf138 ""}
> (gdb) print *allocator
> $2 = {max_index = 16381824, max_free_index = 1601139303,
current_free_index = 6773064, mutex = 0x6368655f, owner = 0x87cf60, free =
{0x61745f6a, 0x0, 0x72726f72, 0x5f737472,
> 0x6572726f, 0x72000c0c, 0xc0c0c01, 0x30, 0x1010100, 0x0, 0x0,
0x675948, 0x59b70002, 0x706e10, 0x1204b600, 0x0, 0x5b60006, 0xb700072a,
0x1bb50008, 0xd7f130}}
> (gdb) print *allocator->mutex
> Cannot access memory at address 0x6368655f
>
>
> So the same as Case 2.
>
>
> Case 4:
>
> Not easily analyzable with gdb.
>
> Regards,
>
> Rainer
>
>
>
>
> Am 30.03.2017 um 23:37 schrieb Rainer Jung:
>>
>> Am 28.03.2017 um 21:38 schrieb Violeta Georgieva:
>>>
>>> The proposed Apache Tomcat 6.0.52 release is now available for voting.
>>>
>>> Note: This is the last Tomcat 6 release.
>>>
>>> It can be obtained from:
>>> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-6/v6.0.52/
>>> The Maven staging repo is:
>>> https://repository.apache.org/content/repositories/orgapachetomcat-1129/
>>> The svn tag is:
>>> http://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_52/
>>>
>>> The proposed 6.0.52 release is:
>>> [ ] Broken - do not release
>>> [ ] Stable - go ahead and release as 6.0.52 Stable
>>
>>
>> I see JVM crashes in APR:
>>
>> org.apache.catalina.connector.TestSendFile
>>  testSendFile
>> org.apache.catalina.core.TestApplicationContext
>>  

[Bug 60944] Tomcat Production Issue connections in CLOSE_WAIT

2017-03-31 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=60944

--- Comment #2 from Adil A  ---
It is production environment so I have to do it in QA,Cert and then PROD so if
it is confirmed its version issue I can change it. 

I also had same issue in tomcat 8 version in other prod environment we have and
below is the version I'm running.

Server version: Apache Tomcat/8.0.37
Server built:   Sep 1 2016 10:01:52 UTC
Server number:  8.0.37.0
OS Name:Linux
OS Version: 2.6.32-642.4.2.el6.x86_64
Architecture:   amd64
JVM Version:1.8.0_102-b14
JVM Vendor: Oracle Corporation

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



Re: svn commit: r1789685 - in /tomcat/trunk: java/org/apache/tomcat/util/http/parser/HttpParser.java res/maven/mvn-pub.xml test/org/apache/tomcat/util/http/parser/TestHttpParserHost.java webapps/docs/

2017-03-31 Thread Violeta Georgieva
Hi Mark,

2017-03-31 16:37 GMT+03:00 :
>
> Author: markt
> Date: Fri Mar 31 13:37:32 2017
> New Revision: 1789685
>
> URL: http://svn.apache.org/viewvc?rev=1789685=rev
> Log:
> Correct various edge cases in the new HTTP Host header validation parser.
> Patch provided by Katya Todorova.
> This closes #48
>
> Fix IPv6/IPv4 parsing for host header:
> - chars other than : should not be allowed in IPv6 address after ]
> - ::: should not present in IPv6 address
> - IPv4 part of IPv6 address was not correctly parsed (1 symbol of
IPv4 part was ignored)
> - tests added to cover IPv4/6 parsing
> - parsed test class fixed not to throw NPE when an exception is
expected but not thrown
>
> Modified:
> tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
> tomcat/trunk/res/maven/mvn-pub.xml
>
tomcat/trunk/test/org/apache/tomcat/util/http/parser/TestHttpParserHost.java
> tomcat/trunk/webapps/docs/changelog.xml
>
> Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
> URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java?rev=1789685=1789684=1789685=diff
>
==
> --- tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
(original)
> +++ tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
Fri Mar 31 13:37:32 2017
> @@ -553,45 +553,50 @@ public class HttpParser {
>  int h16Size = 0;
>  int pos = 1;
>  boolean parsedDoubleColon = false;
> -boolean previousWasColon = false;
> +int precedingColonsCount = 0;
>
>  do {
>  c = reader.read();
> -if (h16Count == 0 && previousWasColon && c != ':') {
> +if (h16Count == 0 && precedingColonsCount == 1 && c != ':') {
>  // Can't start with a single :
>  throw new IllegalArgumentException();
>  }
>  if (HttpParser.isHex(c)) {
>  if (h16Size == 0) {
>  // Start of a new h16 block
> -previousWasColon = false;
> +precedingColonsCount = 0;
>  h16Count++;
> -reader.mark(4);
>  }
>  h16Size++;
>  if (h16Size > 4) {
>  throw new IllegalArgumentException();
>  }
>  } else if (c == ':') {
> -if (previousWasColon) {
> -// End of ::
> -if (parsedDoubleColon) {
> -// Only allowed one :: sequence
> -throw new IllegalArgumentException();
> -}
> -parsedDoubleColon = true;
> -previousWasColon = false;
> -// :: represents at least one h16 block
> -h16Count++;
> +if (precedingColonsCount >=2 ) {
> +// ::: is not allowed
> +throw new IllegalArgumentException();
>  } else {
> -previousWasColon = true;
> +if(precedingColonsCount == 1) {
> +// End of ::
> +if (parsedDoubleColon ) {
> +// Only allowed one :: sequence
> +throw new IllegalArgumentException();
> +}
> +parsedDoubleColon = true;
> +// :: represents at least one h16 block
> +h16Count++;
> +}
> +precedingColonsCount++;
> +// mark if the next symbol is hex before the actual
read
> +reader.mark(4);
>  }
>  h16Size = 0;
>  } else if (c == ']') {
> -if (previousWasColon) {
> +if (precedingColonsCount == 1) {
>  // Can't end on a single ':'
>  throw new IllegalArgumentException();
>  }
> +pos++;
>  break;
>  } else if (c == '.') {
>  if (h16Count == 7 || h16Count < 7 && parsedDoubleColon) {
> @@ -617,9 +622,12 @@ public class HttpParser {
>
>  c = reader.read();
>  if (c == ':') {
> -return pos + 1;
> +return pos;
>  } else {
> -return -1;
> +if(c == -1) {
> +return -1;
> +}
> +throw new IllegalArgumentException();
>  }
>  }
>
>
> Modified: tomcat/trunk/res/maven/mvn-pub.xml

Isn't the change in mvn-pub.xml for some other issue?

Regards,
Violeta

> URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/mvn-pub.xml?rev=1789685=1789684=1789685=diff
>

Re: Host header validation

2017-03-31 Thread Mark Thomas
On 31/03/17 09:43, Katya Todorova wrote:
>> You can either create a pull request on github or create a Bugzilla
>> issue and attach a patch.
> 
> 
>> Mark
>>
> 
> I've created a separate pull request for leading zeros issue since I think
> it requires additional discussion whether to be submitted or not. Although
> this fix honors the specification, it leads to different behavior in case
> of IPv4 address and IPv6 address with IPv4 part. This may cause confusion:
> https://github.com/apache/tomcat/pull/49

Thanks for separating this out. It gives folks time to go and read the
specification and form an opinion.

> The rest of identified host parser issues are fixed here:
> https://github.com/apache/tomcat/pull/48

Applied. Many thanks.

If you'd like to work on this further then can I suggest you take a look
at Konstantin's comments:

http://markmail.org/message/vp5voob7elspflax

Other possibilities are:

- performance improvements for the Host header validation

- improving code coverage generally for any of the HTTP parsing code

- any that attracts your interest

Kind regards,

Mark

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



[GitHub] tomcat pull request #48: Fix http parser

2017-03-31 Thread asfgit
Github user asfgit closed the pull request at:

https://github.com/apache/tomcat/pull/48


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

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



svn commit: r1789685 - in /tomcat/trunk: java/org/apache/tomcat/util/http/parser/HttpParser.java res/maven/mvn-pub.xml test/org/apache/tomcat/util/http/parser/TestHttpParserHost.java webapps/docs/chan

2017-03-31 Thread markt
Author: markt
Date: Fri Mar 31 13:37:32 2017
New Revision: 1789685

URL: http://svn.apache.org/viewvc?rev=1789685=rev
Log:
Correct various edge cases in the new HTTP Host header validation parser.
Patch provided by Katya Todorova.
This closes #48

Fix IPv6/IPv4 parsing for host header:
- chars other than : should not be allowed in IPv6 address after ]
- ::: should not present in IPv6 address
- IPv4 part of IPv6 address was not correctly parsed (1 symbol of IPv4 part 
was ignored)
- tests added to cover IPv4/6 parsing 
- parsed test class fixed not to throw NPE when an exception is expected 
but not thrown 

Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
tomcat/trunk/res/maven/mvn-pub.xml
tomcat/trunk/test/org/apache/tomcat/util/http/parser/TestHttpParserHost.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java?rev=1789685=1789684=1789685=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java Fri 
Mar 31 13:37:32 2017
@@ -553,45 +553,50 @@ public class HttpParser {
 int h16Size = 0;
 int pos = 1;
 boolean parsedDoubleColon = false;
-boolean previousWasColon = false;
+int precedingColonsCount = 0;
 
 do {
 c = reader.read();
-if (h16Count == 0 && previousWasColon && c != ':') {
+if (h16Count == 0 && precedingColonsCount == 1 && c != ':') {
 // Can't start with a single :
 throw new IllegalArgumentException();
 }
 if (HttpParser.isHex(c)) {
 if (h16Size == 0) {
 // Start of a new h16 block
-previousWasColon = false;
+precedingColonsCount = 0;
 h16Count++;
-reader.mark(4);
 }
 h16Size++;
 if (h16Size > 4) {
 throw new IllegalArgumentException();
 }
 } else if (c == ':') {
-if (previousWasColon) {
-// End of ::
-if (parsedDoubleColon) {
-// Only allowed one :: sequence
-throw new IllegalArgumentException();
-}
-parsedDoubleColon = true;
-previousWasColon = false;
-// :: represents at least one h16 block
-h16Count++;
+if (precedingColonsCount >=2 ) {
+// ::: is not allowed
+throw new IllegalArgumentException();
 } else {
-previousWasColon = true;
+if(precedingColonsCount == 1) {
+// End of ::
+if (parsedDoubleColon ) {
+// Only allowed one :: sequence
+throw new IllegalArgumentException();
+}
+parsedDoubleColon = true;
+// :: represents at least one h16 block
+h16Count++;
+}
+precedingColonsCount++;
+// mark if the next symbol is hex before the actual read
+reader.mark(4);
 }
 h16Size = 0;
 } else if (c == ']') {
-if (previousWasColon) {
+if (precedingColonsCount == 1) {
 // Can't end on a single ':'
 throw new IllegalArgumentException();
 }
+pos++;
 break;
 } else if (c == '.') {
 if (h16Count == 7 || h16Count < 7 && parsedDoubleColon) {
@@ -617,9 +622,12 @@ public class HttpParser {
 
 c = reader.read();
 if (c == ':') {
-return pos + 1;
+return pos;
 } else {
-return -1;
+if(c == -1) {
+return -1;
+}
+throw new IllegalArgumentException();
 }
 }
 

Modified: tomcat/trunk/res/maven/mvn-pub.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/mvn-pub.xml?rev=1789685=1789684=1789685=diff
==
--- tomcat/trunk/res/maven/mvn-pub.xml (original)
+++ tomcat/trunk/res/maven/mvn-pub.xml Fri Mar 31 13:37:32 2017
@@ -49,35 +49,18 @@
 
 
 
-
-  
-  
-  
-  
-  
-  
-
-
-  
-  
-  
-  
-  
-  
-
-
-  

[ANN] Apache Tomcat 8.5.13 available

2017-03-31 Thread Mark Thomas
The Apache Tomcat team announces the immediate availability of Apache
Tomcat 8.5.13.

Tomcat 8.x users should normally be using 8.5.x releases in preference
to 8.0.x releases.

Apache Tomcat 8 is an open source software implementation of the Java
Servlet, JavaServer Pages, Java Unified Expression Language, Java
WebSocket and Java Authentication Service Provider Interface for
Containers technologies.

Apache Tomcat 8.5.x is intended to replace 8.0.x and includes new
features pulled forward from the 9.0.x branch. The notable changes since
8.5.12 include:

- Various HTTP/2 improvements

- Fixes for sendfile related issues that could cause subsequent requests
  to experience IllegalStateExceptions

- Servlet 4.0 early access updates


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

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

Migration guides from Apache Tomcat 5.x, 6.x, 7.x and 8.0.x:
http://tomcat.apache.org/migration.html

Enjoy!

- The Apache Tomcat team

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



svn commit: r1789678 - in /tomcat/site/trunk: docs/index.html xdocs/index.xml

2017-03-31 Thread markt
Author: markt
Date: Fri Mar 31 13:20:11 2017
New Revision: 1789678

URL: http://svn.apache.org/viewvc?rev=1789678=rev
Log:
Correct link

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

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1789678=1789677=1789678=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Fri Mar 31 13:20:11 2017
@@ -278,7 +278,7 @@ compared to 8.5.12 include:
 
 
 Full details of these changes, and all the other changes, are available in the
-Tomcat 8.5
+Tomcat 8.5
 changelog.
 
 

Modified: tomcat/site/trunk/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/index.xml?rev=1789678=1789677=1789678=diff
==
--- tomcat/site/trunk/xdocs/index.xml (original)
+++ tomcat/site/trunk/xdocs/index.xml Fri Mar 31 13:20:11 2017
@@ -55,7 +55,7 @@ compared to 8.5.12 include:
 
 
 Full details of these changes, and all the other changes, are available in the
-Tomcat 8.5
+Tomcat 8.5
 changelog.
 
 



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



svn commit: r1789677 - in /tomcat/site/trunk/docs/tomcat-8.5-doc: ./ api/ api/org/apache/catalina/ api/org/apache/catalina/ant/ api/org/apache/catalina/ant/jmx/ api/org/apache/catalina/authenticator/

2017-03-31 Thread markt
Author: markt
Date: Fri Mar 31 13:19:00 2017
New Revision: 1789677

URL: http://svn.apache.org/viewvc?rev=1789677=rev
Log:
Update docs for 8.5.13 release


[This commit notification would consist of 71 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

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



svn commit: r1789676 - in /tomcat/site/trunk: ./ docs/ xdocs/

2017-03-31 Thread markt
Author: markt
Date: Fri Mar 31 13:09:18 2017
New Revision: 1789676

URL: http://svn.apache.org/viewvc?rev=1789676=rev
Log:
Update site for 8.5.13 release excluding docs

Modified:
tomcat/site/trunk/build.properties.default
tomcat/site/trunk/docs/doap_Tomcat.rdf
tomcat/site/trunk/docs/download-80.html
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/migration-85.html
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/xdocs/doap_Tomcat.rdf
tomcat/site/trunk/xdocs/download-80.xml
tomcat/site/trunk/xdocs/index.xml
tomcat/site/trunk/xdocs/migration-85.xml
tomcat/site/trunk/xdocs/oldnews.xml
tomcat/site/trunk/xdocs/whichversion.xml

Modified: tomcat/site/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/build.properties.default?rev=1789676=1789675=1789676=diff
==
--- tomcat/site/trunk/build.properties.default (original)
+++ tomcat/site/trunk/build.properties.default Fri Mar 31 13:09:18 2017
@@ -39,7 +39,7 @@ tomcat.loc=http://www.apache.org/dist/to
 tomcat60=6.0.51
 tomcat70=7.0.76
 tomcat80=8.0.42
-tomcat85=8.5.12
+tomcat85=8.5.13
 tomcat90=9.0.0.M19
 
 # - Download destination -

Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=1789676=1789675=1789676=diff
==
--- tomcat/site/trunk/docs/doap_Tomcat.rdf (original)
+++ tomcat/site/trunk/docs/doap_Tomcat.rdf Fri Mar 31 13:09:18 2017
@@ -60,8 +60,8 @@
 
   
 Latest Stable 8.5.x Release
-2017-03-13
-8.5.12
+2017-03-30
+8.5.13
   
 
 

Modified: tomcat/site/trunk/docs/download-80.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-80.html?rev=1789676=1789675=1789676=diff
==
--- tomcat/site/trunk/docs/download-80.html (original)
+++ tomcat/site/trunk/docs/download-80.html Fri Mar 31 13:09:18 2017
@@ -230,7 +230,7 @@
 Quick Navigation
 
 
-[define v]8.5.12[end]
+[define v]8.5.13[end]
 [define w]8.0.42[end]
 https://www.apache.org/dist/tomcat/tomcat-8/KEYS;>KEYS |
 [v] |

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1789676=1789675=1789676=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Fri Mar 31 13:09:18 2017
@@ -253,6 +253,43 @@ project logo are trademarks of the Apach
 
 
 
+
+2017-03-30 Tomcat 8.5.13 Released
+
+
+
+The Apache Tomcat Project is proud to announce the release of version 8.5.13
+of Apache Tomcat. Apache Tomcat 8.5.x is intended to replace 8.0.x and includes
+new features pulled forward from Tomcat 9.0.x. The minimum Java version and
+implemented specification versions remain unchanged. The notable changes
+compared to 8.5.12 include:
+
+
+
+Various HTTP/2 improvements
+
+Fixes for sendfile related issues that could cause subsequent requests to
+experience IllegalStateExceptions
+
+Servlet 4.0 early access updates
+
+
+
+
+
+Full details of these changes, and all the other changes, are available in the
+Tomcat 8.5
+changelog.
+
+
+
+
+
+Download
+
+
+
+
 
 2017-03-30 Tomcat 9.0.0.M19 (alpha) 
Released
 
@@ -391,44 +428,6 @@ Full details of these changes, and all t
 changelog.
 
 
-
-
-
-Download
-
-
-
-
-
-2017-03-13 Tomcat 8.5.12 Released
-
-
-
-The Apache Tomcat Project is proud to announce the release of version 8.5.12
-of Apache Tomcat. Apache Tomcat 8.5.x is intended to replace 8.0.x and includes
-new features pulled forward from Tomcat 9.0.x. The minimum Java version and
-implemented specification versions remain unchanged. The notable changes
-compared to 8.5.11 include:
-
-
-
-Updates to the early access version of the Servlet 4.0 API to align it with
-the most recent discussions in the Servlet EG
-
-Support for Java 9 during annotation scanning
-
-Update Tomcat Native to 1.2.12 to pick up the latest Windows binaries built
-with OpenSSL 1.0.2k
-
-
-
-
-
-Full details of these changes, and all the other changes, are available in the
-Tomcat 8.5
-changelog.
-
-
 
 
 

Modified: tomcat/site/trunk/docs/migration-85.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-85.html?rev=1789676=1789675=1789676=diff
==
--- tomcat/site/trunk/docs/migration-85.html (original)
+++ tomcat/site/trunk/docs/migration-85.html Fri Mar 31 13:09:18 2017
@@ -671,7 +671,8 @@ of Apache Tomcat.
   "8.5.8":"1767971",
   "8.5.9":"1772784",
   "8.5.11":"1778198",
-  "8.5.12":"1786041"
+  

svn commit: r1789674 - /tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

2017-03-31 Thread markt
Author: markt
Date: Fri Mar 31 13:05:08 2017
New Revision: 1789674

URL: http://svn.apache.org/viewvc?rev=1789674=rev
Log:
Add release date

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

Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1789674=1789673=1789674=diff
==
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Fri Mar 31 13:05:08 2017
@@ -90,7 +90,7 @@
 
   
 
-
+
   
 
   



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



Re: [GitHub] tomcat pull request #50: update the download of objenesis

2017-03-31 Thread Violeta Georgieva
On Fri, Mar 31, 2017 at 3:59 PM lqjack  wrote:

> GitHub user lqjack opened a pull request:
>
> https://github.com/apache/tomcat/pull/50
>
> update the download of objenesis
>
> FYI
>
> You can merge this pull request into a Git repository by running:
>
> $ git pull https://github.com/lqjack/tomcat trunk
>
> Alternatively you can review and apply these changes as the patch at:
>
> https://github.com/apache/tomcat/pull/50.patch
>
> To close this pull request, make a commit to your master/trunk branch
> with (at least) the following in the commit message:
>
> This closes #50
>
> 
> commit d19447a3b3e0a7b2bfa6a9b761e224de76f9e795
> Author: lqjaclee 
> Date:   2017-03-31T12:57:19Z
>
> update the download of objenesis
>
> 
>
>
> ---
> If your project is set up for it, you can reply to this email and have your
> reply appear on GitHub as well. If your project does not have this feature
> enabled and wishes so, or if the feature is enabled but not working, please
> contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
> with INFRA.
> ---
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>


[GitHub] tomcat pull request #50: update the download of objenesis

2017-03-31 Thread lqjack
GitHub user lqjack opened a pull request:

https://github.com/apache/tomcat/pull/50

update the download of objenesis

FYI

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/lqjack/tomcat trunk

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/tomcat/pull/50.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #50


commit d19447a3b3e0a7b2bfa6a9b761e224de76f9e795
Author: lqjaclee 
Date:   2017-03-31T12:57:19Z

update the download of objenesis




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

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



svn commit: r1789656 - in /tomcat/site/trunk/docs/tomcat-9.0-doc: ./ api/ api/org/apache/catalina/ api/org/apache/catalina/ant/ api/org/apache/catalina/ant/jmx/ api/org/apache/catalina/authenticator/

2017-03-31 Thread markt
Author: markt
Date: Fri Mar 31 10:39:17 2017
New Revision: 1789656

URL: http://svn.apache.org/viewvc?rev=1789656=rev
Log:
Update docs for 9.0.0.M19 release


[This commit notification would consist of 77 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

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



[ANN] Apache Tomcat 9.0.0.M19 available

2017-03-31 Thread Mark Thomas
The Apache Tomcat team announces the immediate availability of Apache
Tomcat 9.0.0.M19.

Apache Tomcat 9 is an open source software implementation of the Java
Servlet, JavaServer Pages, Java Unified Expression Language, Java
WebSocket and JASPIC technologies.

Apache Tomcat 9.0.0.M19 is a milestone release of the 9.0.x branch and
has been made to provide users with early access to the new features in
Apache Tomcat 9.0.x so that they may provide feedback. The notable
changes compared to 9.0.0.M18 include:

- Various HTTP/2 improvements

- Fixes for sendfile related issues that could cause subsequent requests
  to experience IllegalStateExceptions

- Servlet 4.0 updates


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

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

Migration guides from Apache Tomcat 5.x, 6.x, 7.x and 8.x:
http://tomcat.apache.org/migration.html

Enjoy!

- The Apache Tomcat team

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



svn commit: r1789655 - /tomcat/trunk/webapps/docs/changelog.xml

2017-03-31 Thread markt
Author: markt
Date: Fri Mar 31 10:37:14 2017
New Revision: 1789655

URL: http://svn.apache.org/viewvc?rev=1789655=rev
Log:
Add release date

Modified:
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1789655=1789654=1789655=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Mar 31 10:37:14 2017
@@ -84,7 +84,7 @@
 
   
 
-
+
   
 
   



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



svn commit: r1789653 - in /tomcat/site/trunk: ./ docs/ xdocs/

2017-03-31 Thread markt
Author: markt
Date: Fri Mar 31 10:28:53 2017
New Revision: 1789653

URL: http://svn.apache.org/viewvc?rev=1789653=rev
Log:
Update site for 9.0.0.M190 release excluding docs

Modified:
tomcat/site/trunk/build.properties.default
tomcat/site/trunk/docs/download-90.html
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/migration-9.html
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/xdocs/download-90.xml
tomcat/site/trunk/xdocs/index.xml
tomcat/site/trunk/xdocs/migration-9.xml
tomcat/site/trunk/xdocs/oldnews.xml
tomcat/site/trunk/xdocs/whichversion.xml

Modified: tomcat/site/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/build.properties.default?rev=1789653=1789652=1789653=diff
==
--- tomcat/site/trunk/build.properties.default (original)
+++ tomcat/site/trunk/build.properties.default Fri Mar 31 10:28:53 2017
@@ -40,7 +40,7 @@ tomcat60=6.0.51
 tomcat70=7.0.76
 tomcat80=8.0.42
 tomcat85=8.5.12
-tomcat90=9.0.0.M18
+tomcat90=9.0.0.M19
 
 # - Download destination -
 tomcat-site-docs.home=${base.path}/tomcat-site-docs/

Modified: tomcat/site/trunk/docs/download-90.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-90.html?rev=1789653=1789652=1789653=diff
==
--- tomcat/site/trunk/docs/download-90.html (original)
+++ tomcat/site/trunk/docs/download-90.html Fri Mar 31 10:28:53 2017
@@ -230,7 +230,7 @@
 Quick Navigation
 
 
-[define v]9.0.0.M18[end]
+[define v]9.0.0.M19[end]
 https://www.apache.org/dist/tomcat/tomcat-9/KEYS;>KEYS |
 [v] |
 Browse |

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1789653=1789652=1789653=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Fri Mar 31 10:28:53 2017
@@ -253,6 +253,43 @@ project logo are trademarks of the Apach
 
 
 
+
+2017-03-30 Tomcat 9.0.0.M19 (alpha) 
Released
+
+
+
+The Apache Tomcat Project is proud to announce the release of version 9.0.0.M19
+(alpha) of Apache Tomcat. The is a milestone release of the 9.0.x branch and 
has
+been made to provide users with early access to the new features in Apache
+Tomcat 9.0.x so that they may provide feedback. The notable changes compared to
+9.0.0.M18 include:
+
+
+
+Various HTTP/2 improvements
+
+Fixes for sendfile related issues that could cause subsequent requests to
+experience IllegalStateExceptions
+
+Servlet 4.0 updates
+
+
+
+
+
+Full details of these changes, and all the other changes, are available in the
+Tomcat 9
+changelog.
+
+
+
+
+
+Download
+
+
+
+
 
 2017-03-16 Tomcat 6.0.51 Released
 
@@ -399,47 +436,6 @@ changelog.
 
 
 
-
-
-2017-03-13 Tomcat 9.0.0.M18 (alpha) 
Released
-
-
-
-The Apache Tomcat Project is proud to announce the release of version 9.0.0.M18
-(alpha) of Apache Tomcat. The is a milestone release of the 9.0.x branch and 
has
-been made to provide users with early access to the new features in Apache
-Tomcat 9.0.x so that they may provide feedback. The notable changes compared to
-9.0.0.M17 include:
-
-
-
-Updates to the early access version of the Servlet 4.0 API to align it with
-the most recent discussions in the Servlet EG
-
-Support for Java 9 during annotation scanning
-
-Enable ALPN (and hence HTTP/2) for NIO and NIO2 connectors when using JSSE
-for TLS on Java 9
-
-Update Tomcat Native to 1.2.12 to pick up the latest Windows binaries built
-with OpenSSL 1.0.2k
-
-
-
-
-
-Full details of these changes, and all the other changes, are available in the
-Tomcat 9
-changelog.
-
-
-
-
-
-Download
-
-
-
 
 
 2017-02-21 Tomcat Native 1.2.12 
Released

Modified: tomcat/site/trunk/docs/migration-9.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-9.html?rev=1789653=1789652=1789653=diff
==
--- tomcat/site/trunk/docs/migration-9.html (original)
+++ tomcat/site/trunk/docs/migration-9.html Fri Mar 31 10:28:53 2017
@@ -824,7 +824,8 @@ of Apache Tomcat.
   "9.0.0.M13":"1767969",
   "9.0.0.M15":"1772668",
   "9.0.0.M17":"1778197",
-  "9.0.0.M18":"1785983"
+  "9.0.0.M18":"1785983",
+  "9.0.0.M19":"1788896"
 };
 
 formSubmit.action = "http://svn.apache.org/viewvc/tomcat/trunk/; +
@@ -865,8 +866,9 @@ of Apache Tomcat.
 9.0.0.M11
 9.0.0.M13
 9.0.0.M15
-9.0.0.M17
-9.0.0.M18
+9.0.0.M17
+9.0.0.M18
+9.0.0.M19
 , new version:
 
 9.0.0.M1
@@ -880,7 +882,8 @@ of Apache Tomcat.
 9.0.0.M13
 9.0.0.M15
 9.0.0.M17
-9.0.0.M18
+9.0.0.M18
+9.0.0.M19
 trunk 

[Bug 60944] Tomcat Production Issue connections in CLOSE_WAIT

2017-03-31 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=60944

--- Comment #1 from Violeta Georgieva  ---
Hi,

You run 4 years old Tomcat version.
Is it possible to test with the latest Tomcat 7 release - 7.0.76?

Regards,
Violeta

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



Re: Host header validation

2017-03-31 Thread Katya Todorova
> You can either create a pull request on github or create a Bugzilla
> issue and attach a patch.


> Mark
>

I've created a separate pull request for leading zeros issue since I think
it requires additional discussion whether to be submitted or not. Although
this fix honors the specification, it leads to different behavior in case
of IPv4 address and IPv6 address with IPv4 part. This may cause confusion:
https://github.com/apache/tomcat/pull/49

The rest of identified host parser issues are fixed here:
https://github.com/apache/tomcat/pull/48

Kind regards,
Katya


[GitHub] tomcat pull request #49: Fix parser to fail if leading zeros in IPv4 part of...

2017-03-31 Thread katya-stoycheva
GitHub user katya-stoycheva opened a pull request:

https://github.com/apache/tomcat/pull/49

Fix parser to fail if leading zeros in IPv4 part of IPv6 address

Leading zeros are not causing failure if in IPv4 addresses though.

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/katya-stoycheva/tomcat leading-zeros-ipv4

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/tomcat/pull/49.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #49


commit 071ab90eecda2ff1dc751f0557dca6ead93c41f4
Author: Katya Todorova 
Date:   2017-03-31T08:28:00Z

Fix parser to fail if leading zeros are presented in IPv4 part of IPv6 
address. Leading zeros are not causing failure if in IPv4 addresses though.




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

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



[GitHub] tomcat pull request #48: Fix http parser

2017-03-31 Thread katya-stoycheva
GitHub user katya-stoycheva opened a pull request:

https://github.com/apache/tomcat/pull/48

Fix http parser

Fix IPv6/IPv4 parsing for host header:
- chars other than : should not be allowed in IPv6 address after ]
- ::: should not present in IPv6 address
- IPv4 part of IPv6 address was not correctly parsed (1 symbol of IPv4 part 
was ignored)
- tests added to cover IPv4/6 parsing 
- parsed test class fixed not to throw NPE when an exception is expected 
but not thrown 

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/katya-stoycheva/tomcat fix-http-parser

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/tomcat/pull/48.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #48


commit 9d1787b8c7cac6e1448f5446b6e766a8efa82ec5
Author: Todorova, Katya 
Date:   2017-03-30T13:25:08Z

Check no additional symbols after ] in IPv6 hosts

commit f14d497d9e36dfc4e3c8a904e5608341f44e7f15
Author: Katya Todorova 
Date:   2017-03-30T13:48:46Z

Check ::: is not presented in IPv6 host

commit a3e64260605d0e7eb967638c3621e639d39fb33e
Author: Katya Todorova 
Date:   2017-03-30T13:59:33Z

Fix parser read position when reading IPv4 part of IPv6 host

commit 775e3ad85f1c12708250c9f16930bbe6e6b3cfe9
Author: Katya Todorova 
Date:   2017-03-30T14:26:05Z

Add more test cases to increase code coverage

commit da5a06c67beb9cbb2b72b04ff991b82623654c82
Author: Katya Todorova 
Date:   2017-03-30T14:26:54Z

Fix NPE in test class when an exception is expected but not thrown




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

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