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

2017-08-02 Thread Rainer Jung

Am 02.08.2017 um 23:33 schrieb ma...@apache.org:

Author: markt
Date: Wed Aug  2 21:33:52 2017
New Revision: 1803929

URL: http://svn.apache.org/viewvc?rev=1803929=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=1803929=1803928=1803929=diff
==
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Wed Aug  2 21:33:52 2017
@@ -111,7 +111,7 @@
 
   
 
-
+
   
 
   


Since you plan to not announce 8.5.19, should we switch this to "not 
released"?


Regards,

Rainer


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



[VOTE] Release Apache Tomcat 8.5.20

2017-08-02 Thread Mark Thomas
The proposed Apache Tomcat 8.5.20 release is now available for voting.

The major changes compared to the 8.5.16 release are:

- Enable TLS connectors to use Java key stores that contain multiple
  keys where each key has a separate password. Based on a patch by Frank
  Taffelt.

- Make asynchronous error handling more robust. In particular ensure
  that onError() is called for any registered AsyncListeners after an
  I/O error on a non-container thread.

- Sync SSL session access for the APR connector to prevent errors when
  accessing the session.


Along with lots of other bug fixes and improvements.


It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.20/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1148/
The svn tag is:
http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_20/

The proposed 8.5.20 release is:
[ ] Broken - do not release
[ ] Stable - go ahead and release as 8.5.20

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



[Bug 57767] Websocket client proprietary configuration

2017-08-02 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=57767

--- Comment #10 from Mark Thomas  ---
Add

execute.validate=true

to your build.properties file and run

ant validate

The configuration files are in res/checkstyle.

Please open a new bugzilla enhancement for adding authentication support. If
you need any pointers, the dev@ list is the place to ask.

Thanks again for your contribution and we are looking forward to the next one.

-- 
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 57767] Websocket client proprietary configuration

2017-08-02 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=57767

--- Comment #9 from J Fernandez  ---
Where can I learn more about CheckStyle? I assume, there is a formatting file
involved. Also, I am interested in adding support for authentication, should I
submit a patch to to this thread? Thanks for your time.

-- 
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: r20733 - in /dev/tomcat/tomcat-8/v8.5.20: ./ bin/ bin/embed/ bin/extras/ src/

2017-08-02 Thread markt
Author: markt
Date: Wed Aug  2 21:57:07 2017
New Revision: 20733

Log:
Upload 8.5.20 for voting

Added:
dev/tomcat/tomcat-8/v8.5.20/
dev/tomcat/tomcat-8/v8.5.20/KEYS
dev/tomcat/tomcat-8/v8.5.20/README.html
dev/tomcat/tomcat-8/v8.5.20/RELEASE-NOTES
dev/tomcat/tomcat-8/v8.5.20/bin/
dev/tomcat/tomcat-8/v8.5.20/bin/README.html
dev/tomcat/tomcat-8/v8.5.20/bin/apache-tomcat-8.5.20-deployer.tar.gz   
(with props)
dev/tomcat/tomcat-8/v8.5.20/bin/apache-tomcat-8.5.20-deployer.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.20/bin/apache-tomcat-8.5.20-deployer.tar.gz.md5
dev/tomcat/tomcat-8/v8.5.20/bin/apache-tomcat-8.5.20-deployer.tar.gz.sha1
dev/tomcat/tomcat-8/v8.5.20/bin/apache-tomcat-8.5.20-deployer.zip   (with 
props)
dev/tomcat/tomcat-8/v8.5.20/bin/apache-tomcat-8.5.20-deployer.zip.asc
dev/tomcat/tomcat-8/v8.5.20/bin/apache-tomcat-8.5.20-deployer.zip.md5
dev/tomcat/tomcat-8/v8.5.20/bin/apache-tomcat-8.5.20-deployer.zip.sha1
dev/tomcat/tomcat-8/v8.5.20/bin/apache-tomcat-8.5.20-fulldocs.tar.gz   
(with props)
dev/tomcat/tomcat-8/v8.5.20/bin/apache-tomcat-8.5.20-fulldocs.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.20/bin/apache-tomcat-8.5.20-fulldocs.tar.gz.md5
dev/tomcat/tomcat-8/v8.5.20/bin/apache-tomcat-8.5.20-fulldocs.tar.gz.sha1
dev/tomcat/tomcat-8/v8.5.20/bin/apache-tomcat-8.5.20-windows-x64.zip   
(with props)
dev/tomcat/tomcat-8/v8.5.20/bin/apache-tomcat-8.5.20-windows-x64.zip.asc
dev/tomcat/tomcat-8/v8.5.20/bin/apache-tomcat-8.5.20-windows-x64.zip.md5
dev/tomcat/tomcat-8/v8.5.20/bin/apache-tomcat-8.5.20-windows-x64.zip.sha1
dev/tomcat/tomcat-8/v8.5.20/bin/apache-tomcat-8.5.20-windows-x86.zip   
(with props)
dev/tomcat/tomcat-8/v8.5.20/bin/apache-tomcat-8.5.20-windows-x86.zip.asc
dev/tomcat/tomcat-8/v8.5.20/bin/apache-tomcat-8.5.20-windows-x86.zip.md5
dev/tomcat/tomcat-8/v8.5.20/bin/apache-tomcat-8.5.20-windows-x86.zip.sha1
dev/tomcat/tomcat-8/v8.5.20/bin/apache-tomcat-8.5.20.exe   (with props)
dev/tomcat/tomcat-8/v8.5.20/bin/apache-tomcat-8.5.20.exe.asc
dev/tomcat/tomcat-8/v8.5.20/bin/apache-tomcat-8.5.20.exe.md5
dev/tomcat/tomcat-8/v8.5.20/bin/apache-tomcat-8.5.20.exe.sha1
dev/tomcat/tomcat-8/v8.5.20/bin/apache-tomcat-8.5.20.tar.gz   (with props)
dev/tomcat/tomcat-8/v8.5.20/bin/apache-tomcat-8.5.20.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.20/bin/apache-tomcat-8.5.20.tar.gz.md5
dev/tomcat/tomcat-8/v8.5.20/bin/apache-tomcat-8.5.20.tar.gz.sha1
dev/tomcat/tomcat-8/v8.5.20/bin/apache-tomcat-8.5.20.zip   (with props)
dev/tomcat/tomcat-8/v8.5.20/bin/apache-tomcat-8.5.20.zip.asc
dev/tomcat/tomcat-8/v8.5.20/bin/apache-tomcat-8.5.20.zip.md5
dev/tomcat/tomcat-8/v8.5.20/bin/apache-tomcat-8.5.20.zip.sha1
dev/tomcat/tomcat-8/v8.5.20/bin/embed/
dev/tomcat/tomcat-8/v8.5.20/bin/embed/apache-tomcat-8.5.20-embed.tar.gz   
(with props)
dev/tomcat/tomcat-8/v8.5.20/bin/embed/apache-tomcat-8.5.20-embed.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.20/bin/embed/apache-tomcat-8.5.20-embed.tar.gz.md5
dev/tomcat/tomcat-8/v8.5.20/bin/embed/apache-tomcat-8.5.20-embed.tar.gz.sha1
dev/tomcat/tomcat-8/v8.5.20/bin/embed/apache-tomcat-8.5.20-embed.zip   
(with props)
dev/tomcat/tomcat-8/v8.5.20/bin/embed/apache-tomcat-8.5.20-embed.zip.asc
dev/tomcat/tomcat-8/v8.5.20/bin/embed/apache-tomcat-8.5.20-embed.zip.md5
dev/tomcat/tomcat-8/v8.5.20/bin/embed/apache-tomcat-8.5.20-embed.zip.sha1
dev/tomcat/tomcat-8/v8.5.20/bin/extras/
dev/tomcat/tomcat-8/v8.5.20/bin/extras/catalina-jmx-remote.jar   (with 
props)
dev/tomcat/tomcat-8/v8.5.20/bin/extras/catalina-jmx-remote.jar.asc
dev/tomcat/tomcat-8/v8.5.20/bin/extras/catalina-jmx-remote.jar.md5
dev/tomcat/tomcat-8/v8.5.20/bin/extras/catalina-jmx-remote.jar.sha1
dev/tomcat/tomcat-8/v8.5.20/bin/extras/catalina-ws.jar   (with props)
dev/tomcat/tomcat-8/v8.5.20/bin/extras/catalina-ws.jar.asc
dev/tomcat/tomcat-8/v8.5.20/bin/extras/catalina-ws.jar.md5
dev/tomcat/tomcat-8/v8.5.20/bin/extras/catalina-ws.jar.sha1
dev/tomcat/tomcat-8/v8.5.20/src/
dev/tomcat/tomcat-8/v8.5.20/src/apache-tomcat-8.5.20-src.tar.gz   (with 
props)
dev/tomcat/tomcat-8/v8.5.20/src/apache-tomcat-8.5.20-src.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.20/src/apache-tomcat-8.5.20-src.tar.gz.md5
dev/tomcat/tomcat-8/v8.5.20/src/apache-tomcat-8.5.20-src.tar.gz.sha1
dev/tomcat/tomcat-8/v8.5.20/src/apache-tomcat-8.5.20-src.zip   (with props)
dev/tomcat/tomcat-8/v8.5.20/src/apache-tomcat-8.5.20-src.zip.asc
dev/tomcat/tomcat-8/v8.5.20/src/apache-tomcat-8.5.20-src.zip.md5
dev/tomcat/tomcat-8/v8.5.20/src/apache-tomcat-8.5.20-src.zip.sha1

Added: dev/tomcat/tomcat-8/v8.5.20/KEYS
==
--- dev/tomcat/tomcat-8/v8.5.20/KEYS (added)
+++ dev/tomcat/tomcat-8/v8.5.20/KEYS Wed Aug  2 21:57:07 2017
@@ -0,0 +1,616 @@
+This file contains the PGP keys of various Apache 

svn commit: r1803930 - in /tomcat/tc8.5.x/tags/TOMCAT_8_5_20: ./ build.properties.default webapps/docs/changelog.xml

2017-08-02 Thread markt
Author: markt
Date: Wed Aug  2 21:34:55 2017
New Revision: 1803930

URL: http://svn.apache.org/viewvc?rev=1803930=rev
Log:
Tag 8.5.20

Added:
tomcat/tc8.5.x/tags/TOMCAT_8_5_20/   (props changed)
  - copied from r1803929, tomcat/tc8.5.x/trunk/
Modified:
tomcat/tc8.5.x/tags/TOMCAT_8_5_20/build.properties.default
tomcat/tc8.5.x/tags/TOMCAT_8_5_20/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_20/
--
bugtraq:append = false

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_20/
--
bugtraq:label = Bugzilla ID (optional)

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_20/
--
--- bugtraq:logregex (added)
+++ bugtraq:logregex Wed Aug  2 21:34:55 2017
@@ -0,0 +1,2 @@
+(https?\://(bz|issues)\.apache\.org/bugzilla/show_bug.cgi\?id=\d+|BZ\s?\d+)
+(\d+)

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_20/
--
bugtraq:message = Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID%

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_20/
--
bugtraq:url = https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID%

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_20/
--
--- svn:ignore (added)
+++ svn:ignore Wed Aug  2 21:34:55 2017
@@ -0,0 +1,8 @@
+.*
+build.properties
+logs
+nbproject
+output
+work
+*.iml
+temp

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_20/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Aug  2 21:34:55 2017
@@ -0,0 +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,1745535,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,1747
 
536,1747924,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-1
 

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

2017-08-02 Thread markt
Author: markt
Date: Wed Aug  2 21:33:52 2017
New Revision: 1803929

URL: http://svn.apache.org/viewvc?rev=1803929=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=1803929=1803928=1803929=diff
==
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Wed Aug  2 21:33:52 2017
@@ -111,7 +111,7 @@
 
   
 
-
+
   
 
   



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



svn commit: r1803928 - /tomcat/tc8.5.x/tags/TOMCAT_8_5_20/

2017-08-02 Thread markt
Author: markt
Date: Wed Aug  2 21:32:59 2017
New Revision: 1803928

URL: http://svn.apache.org/viewvc?rev=1803928=rev
Log:
Need to re-tag

Removed:
tomcat/tc8.5.x/tags/TOMCAT_8_5_20/


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



[VOTE] Release Apache Tomcat 9.0.0.M26

2017-08-02 Thread Mark Thomas
The proposed Apache Tomcat 9.0.0.M26 release is now available for voting.

This is a milestone release for the 9.0.x branch. It should be
noted that, as a milestone release:
- Servlet 4.0 is not finalised
- The EGs have not started work on JSP 2.4, EL 3.1 or WebSocket 1.2/2.0

Note that the 9.0.0.M23 and 9.0.0.M24 release votes were cancelled due
to regressions. The 9.0.0.M25 vote passed but a regression was found
shortly afterwards.

The major changes compared to the 9.0.0.M22 release are:

- Correct a regression in 9.0.0.M22 that prevented Tomcat from shutting
  down cleanly.

- Add LoadBalancerDrainingValve, a Valve designed to reduce the amount
  of time required for a node to drain its authenticated users.

- When generating JSP runtime error messages that quote the relevant JSP
  source code, switch from using the results of the JSP page parsing
  process to using the JSR 045 source map data to identify the correct
  part of the JSP source from the stack trace. This significantly
  reduces the memory footprint of Jasper in development mode, provides a
  small performance improvement for error page generation and enables
  source quotes to continue to be provided after a Tomcat restart.

- Add support for a Tomcat specific deployment descriptor,
  /WEB-INF/tomcat-web.xml

- Add ExtractingRoot, a new WebResourceRoot implementation that extracts
  JARs to the work directory for improved performance when deploying
  packed WAR files.

Along with lots of other bug fixes and improvements.


For full details, see the changelog:
http://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/changelog.xml

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.0.M26/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1147/
The svn tag is:
http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_9_0_0_M26/

The proposed 9.0.0.M26 release is:
[ ] Broken - do not release
[ ] Alpha - go ahead and release as 9.0.0.M26

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



svn commit: r1803927 - in /tomcat/tc8.5.x/tags/TOMCAT_8_5_20: ./ build.properties.default webapps/docs/changelog.xml

2017-08-02 Thread markt
Author: markt
Date: Wed Aug  2 21:28:05 2017
New Revision: 1803927

URL: http://svn.apache.org/viewvc?rev=1803927=rev
Log:
Tagging 8.5.20

Added:
tomcat/tc8.5.x/tags/TOMCAT_8_5_20/   (props changed)
  - copied from r1803926, tomcat/tc8.5.x/trunk/
Modified:
tomcat/tc8.5.x/tags/TOMCAT_8_5_20/build.properties.default
tomcat/tc8.5.x/tags/TOMCAT_8_5_20/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_20/
--
bugtraq:append = false

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_20/
--
bugtraq:label = Bugzilla ID (optional)

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_20/
--
--- bugtraq:logregex (added)
+++ bugtraq:logregex Wed Aug  2 21:28:05 2017
@@ -0,0 +1,2 @@
+(https?\://(bz|issues)\.apache\.org/bugzilla/show_bug.cgi\?id=\d+|BZ\s?\d+)
+(\d+)

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_20/
--
bugtraq:message = Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID%

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_20/
--
bugtraq:url = https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID%

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_20/
--
--- svn:ignore (added)
+++ svn:ignore Wed Aug  2 21:28:05 2017
@@ -0,0 +1,8 @@
+.*
+build.properties
+logs
+nbproject
+output
+work
+*.iml
+temp

Propchange: tomcat/tc8.5.x/tags/TOMCAT_8_5_20/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Aug  2 21:28:05 2017
@@ -0,0 +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,1745535,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,1747
 
536,1747924,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-1
 

RE: Default servlet regressions

2017-08-02 Thread Caldarale, Charles R
> From: Christopher Schultz [mailto:ch...@christopherschultz.net] 
> Subject: Re: Default servlet regressions

> It's nice to know that the EBCDIC->ShiftJIS conversion is now reliable.

We actually do have customers that use that conversion (but perhaps not in
Tomcat).

 - Chuck


THIS COMMUNICATION MAY CONTAIN CONFIDENTIAL AND/OR OTHERWISE PROPRIETARY
MATERIAL and is thus for use only by the intended recipient. If you received
this in error, please contact the sender and delete the e-mail and its
attachments from all computers.



smime.p7s
Description: S/MIME cryptographic signature


Re: Default servlet regressions

2017-08-02 Thread Christopher Schultz
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Mark,

On 8/2/17 4:35 PM, Mark Thomas wrote:
> On 02/08/17 21:23, Christopher Schultz wrote:
>> Mark,
>> 
>> On 7/31/17 12:16 PM, Mark Thomas wrote:
>>> On 30/07/17 19:04, Mark Thomas wrote:
 All,
 
 It looks like there is another regression in the Default 
 Servlet.
 
 While I think I have a patch for this, I'm currently leaning 
 towards doing the following:
 
 - Announcing the 8.5.19 and 9.0.0.M25 releases with a
 warning about the regression.
 
 - Reverting the encoding changes in 8.5.x and earlier.
>> 
>>> This has been done.
>> 
 - Fixing the latest regression for 9.0.0.M26.
>> 
>>> This has been done. But...
>> 
>>> Thinking about this overnight, I thought of some other
>>> possible edge cases. The result is that I have put together a
>>> greatly expanded set of tests - currently 680 - using
>>> parametrization.
>> 
>> You're a machine.
> 
> Nah. I just know how to wrote nested for loops ;)

It's nice to know that the EBCDIC->ShiftJIS conversion is now reliable.

>>> Of these, currently 196 (no that isn't a typo) fail. I'm
>>> currently working my way through them since some failures are
>>> expected (and I need to mark them as such so the tests pass)
>>> but I have found some additional edge cases that need to be
>>> handled.
>> 
>> Thanks for all your hard work on this.
> 
> You are welcome. But - to be frank - I broke this in the first
> place. I feel I should be the one to sort it out. I'm just sorry it
> has taken a handful of releases.

It's a better product for it.

I just finally slew a timezone-related issue that was caused by a
vendor stubbornly refusing to provide time zone information in their
JSON-based API calls (a killing offense IMO) except when it IS there
(fun with SimpleDateFormat! Thanks, Sun/Oracle, for not providing a
way to emit/parse ISO-8601 date strings using SimpleDateFormat until
Java 8 and then making the documentation unreadable so you have to
write unit tests just to find out how it works) and the server is
running in yet another time zone (e.g. UTC).

Sometimes stuff just takes a while. What's a few dozen more lines of
plumbing code between friends? :/

- -chris

- --
"If you ever meet me in person, you'll see I'm not such a miserable
bastard as this thread would indicate." -me
-BEGIN PGP SIGNATURE-
Comment: GPGTools - http://gpgtools.org
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBCAAGBQJZgj27AAoJEBzwKT+lPKRYdcUP/A1FcUv8LnQpFxyGiZWONidZ
IchrEe3pILV5WGIlWA61IBwgmMpQUvOXMuaACpojS+h/NFUQMCzBevoh25m8S/2+
0pzIoQEyZZrK6HXjy0Eog9qREqGcyquBZGhpuD5td3YJQsv+XJ+y11EoPDLuo+GO
tTPLRJ8BIW7jCCWIxL9s8oGybXxkN6/VgPI11UIUu4tLxVs/AYM+j/qe+Sd21Sz/
6RBMHrl1Ac6hQoIQORkqCLN6wp5T85aKenH7L1Hoiv4rVVWPDVohI+aym+HeyxN8
VzfRFQLH89EHDDMADXR6SV0XBjgS2lq7GK+/g6CY4gETEztcNijJOgsb+2IsUmeX
w2E2ZzG9CJDGV45m37hNV2q6FhPX5Ve5wZ9ocHY/AOLwZnI1sxEMEjSy/4cidr13
3cT0wVAmoJcX0LHKrwq698clBjn92yOmr1CFqo2gJqb2YGllRq4HoOTJJ/ALzP8C
eqhc5dGE5ewq4y1kEmivOqtT/aDMpJ5CLx+YAGd7M77o+tsHrRoYHDqHr0fBl+Be
gzWS2mGe2M560muxc6YduHUSaDViYv+mlL3DTEoOd71DDs1ZJGUuOP1ZSbEeAeYS
zJtba1KaJUW8FO2bsW+C+sT0/XVAsNbE2b/MymqUivMLh9F8OQAx81dpSq2olN5L
WoyBR+2P8j3Mi2hZHAfZ
=j1Ba
-END PGP SIGNATURE-

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



svn commit: r20732 - in /dev/tomcat/tomcat-9/v9.0.0.M26: ./ bin/ bin/embed/ bin/extras/ src/

2017-08-02 Thread markt
Author: markt
Date: Wed Aug  2 21:01:02 2017
New Revision: 20732

Log:
Upload 9.0.0.M26 for a release vote

Added:
dev/tomcat/tomcat-9/v9.0.0.M26/
dev/tomcat/tomcat-9/v9.0.0.M26/KEYS
dev/tomcat/tomcat-9/v9.0.0.M26/README.html
dev/tomcat/tomcat-9/v9.0.0.M26/RELEASE-NOTES
dev/tomcat/tomcat-9/v9.0.0.M26/bin/
dev/tomcat/tomcat-9/v9.0.0.M26/bin/README.html
dev/tomcat/tomcat-9/v9.0.0.M26/bin/apache-tomcat-9.0.0.M26-deployer.tar.gz  
 (with props)

dev/tomcat/tomcat-9/v9.0.0.M26/bin/apache-tomcat-9.0.0.M26-deployer.tar.gz.asc

dev/tomcat/tomcat-9/v9.0.0.M26/bin/apache-tomcat-9.0.0.M26-deployer.tar.gz.md5

dev/tomcat/tomcat-9/v9.0.0.M26/bin/apache-tomcat-9.0.0.M26-deployer.tar.gz.sha1
dev/tomcat/tomcat-9/v9.0.0.M26/bin/apache-tomcat-9.0.0.M26-deployer.zip   
(with props)
dev/tomcat/tomcat-9/v9.0.0.M26/bin/apache-tomcat-9.0.0.M26-deployer.zip.asc
dev/tomcat/tomcat-9/v9.0.0.M26/bin/apache-tomcat-9.0.0.M26-deployer.zip.md5
dev/tomcat/tomcat-9/v9.0.0.M26/bin/apache-tomcat-9.0.0.M26-deployer.zip.sha1
dev/tomcat/tomcat-9/v9.0.0.M26/bin/apache-tomcat-9.0.0.M26-fulldocs.tar.gz  
 (with props)

dev/tomcat/tomcat-9/v9.0.0.M26/bin/apache-tomcat-9.0.0.M26-fulldocs.tar.gz.asc

dev/tomcat/tomcat-9/v9.0.0.M26/bin/apache-tomcat-9.0.0.M26-fulldocs.tar.gz.md5

dev/tomcat/tomcat-9/v9.0.0.M26/bin/apache-tomcat-9.0.0.M26-fulldocs.tar.gz.sha1
dev/tomcat/tomcat-9/v9.0.0.M26/bin/apache-tomcat-9.0.0.M26-windows-x64.zip  
 (with props)

dev/tomcat/tomcat-9/v9.0.0.M26/bin/apache-tomcat-9.0.0.M26-windows-x64.zip.asc

dev/tomcat/tomcat-9/v9.0.0.M26/bin/apache-tomcat-9.0.0.M26-windows-x64.zip.md5

dev/tomcat/tomcat-9/v9.0.0.M26/bin/apache-tomcat-9.0.0.M26-windows-x64.zip.sha1
dev/tomcat/tomcat-9/v9.0.0.M26/bin/apache-tomcat-9.0.0.M26-windows-x86.zip  
 (with props)

dev/tomcat/tomcat-9/v9.0.0.M26/bin/apache-tomcat-9.0.0.M26-windows-x86.zip.asc

dev/tomcat/tomcat-9/v9.0.0.M26/bin/apache-tomcat-9.0.0.M26-windows-x86.zip.md5

dev/tomcat/tomcat-9/v9.0.0.M26/bin/apache-tomcat-9.0.0.M26-windows-x86.zip.sha1
dev/tomcat/tomcat-9/v9.0.0.M26/bin/apache-tomcat-9.0.0.M26.exe   (with 
props)
dev/tomcat/tomcat-9/v9.0.0.M26/bin/apache-tomcat-9.0.0.M26.exe.asc
dev/tomcat/tomcat-9/v9.0.0.M26/bin/apache-tomcat-9.0.0.M26.exe.md5
dev/tomcat/tomcat-9/v9.0.0.M26/bin/apache-tomcat-9.0.0.M26.exe.sha1
dev/tomcat/tomcat-9/v9.0.0.M26/bin/apache-tomcat-9.0.0.M26.tar.gz   (with 
props)
dev/tomcat/tomcat-9/v9.0.0.M26/bin/apache-tomcat-9.0.0.M26.tar.gz.asc
dev/tomcat/tomcat-9/v9.0.0.M26/bin/apache-tomcat-9.0.0.M26.tar.gz.md5
dev/tomcat/tomcat-9/v9.0.0.M26/bin/apache-tomcat-9.0.0.M26.tar.gz.sha1
dev/tomcat/tomcat-9/v9.0.0.M26/bin/apache-tomcat-9.0.0.M26.zip   (with 
props)
dev/tomcat/tomcat-9/v9.0.0.M26/bin/apache-tomcat-9.0.0.M26.zip.asc
dev/tomcat/tomcat-9/v9.0.0.M26/bin/apache-tomcat-9.0.0.M26.zip.md5
dev/tomcat/tomcat-9/v9.0.0.M26/bin/apache-tomcat-9.0.0.M26.zip.sha1
dev/tomcat/tomcat-9/v9.0.0.M26/bin/embed/

dev/tomcat/tomcat-9/v9.0.0.M26/bin/embed/apache-tomcat-9.0.0.M26-embed.tar.gz   
(with props)

dev/tomcat/tomcat-9/v9.0.0.M26/bin/embed/apache-tomcat-9.0.0.M26-embed.tar.gz.asc

dev/tomcat/tomcat-9/v9.0.0.M26/bin/embed/apache-tomcat-9.0.0.M26-embed.tar.gz.md5

dev/tomcat/tomcat-9/v9.0.0.M26/bin/embed/apache-tomcat-9.0.0.M26-embed.tar.gz.sha1
dev/tomcat/tomcat-9/v9.0.0.M26/bin/embed/apache-tomcat-9.0.0.M26-embed.zip  
 (with props)

dev/tomcat/tomcat-9/v9.0.0.M26/bin/embed/apache-tomcat-9.0.0.M26-embed.zip.asc

dev/tomcat/tomcat-9/v9.0.0.M26/bin/embed/apache-tomcat-9.0.0.M26-embed.zip.md5

dev/tomcat/tomcat-9/v9.0.0.M26/bin/embed/apache-tomcat-9.0.0.M26-embed.zip.sha1
dev/tomcat/tomcat-9/v9.0.0.M26/bin/extras/
dev/tomcat/tomcat-9/v9.0.0.M26/bin/extras/catalina-jmx-remote.jar   (with 
props)
dev/tomcat/tomcat-9/v9.0.0.M26/bin/extras/catalina-jmx-remote.jar.asc
dev/tomcat/tomcat-9/v9.0.0.M26/bin/extras/catalina-jmx-remote.jar.md5
dev/tomcat/tomcat-9/v9.0.0.M26/bin/extras/catalina-jmx-remote.jar.sha1
dev/tomcat/tomcat-9/v9.0.0.M26/bin/extras/catalina-ws.jar   (with props)
dev/tomcat/tomcat-9/v9.0.0.M26/bin/extras/catalina-ws.jar.asc
dev/tomcat/tomcat-9/v9.0.0.M26/bin/extras/catalina-ws.jar.md5
dev/tomcat/tomcat-9/v9.0.0.M26/bin/extras/catalina-ws.jar.sha1
dev/tomcat/tomcat-9/v9.0.0.M26/src/
dev/tomcat/tomcat-9/v9.0.0.M26/src/apache-tomcat-9.0.0.M26-src.tar.gz   
(with props)
dev/tomcat/tomcat-9/v9.0.0.M26/src/apache-tomcat-9.0.0.M26-src.tar.gz.asc
dev/tomcat/tomcat-9/v9.0.0.M26/src/apache-tomcat-9.0.0.M26-src.tar.gz.md5
dev/tomcat/tomcat-9/v9.0.0.M26/src/apache-tomcat-9.0.0.M26-src.tar.gz.sha1
dev/tomcat/tomcat-9/v9.0.0.M26/src/apache-tomcat-9.0.0.M26-src.zip   (with 
props)
dev/tomcat/tomcat-9/v9.0.0.M26/src/apache-tomcat-9.0.0.M26-src.zip.asc
dev/tomcat/tomcat-9/v9.0.0.M26/src/apache-tomcat-9.0.0.M26-src.zip.md5

svn commit: r1803923 - in /tomcat/trunk: build.properties.default res/maven/mvn.properties.default webapps/docs/changelog.xml

2017-08-02 Thread markt
Author: markt
Date: Wed Aug  2 20:53:05 2017
New Revision: 1803923

URL: http://svn.apache.org/viewvc?rev=1803923=rev
Log:
Increment version for next dev cycle

Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/res/maven/mvn.properties.default
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1803923=1803922=1803923=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Wed Aug  2 20:53:05 2017
@@ -27,7 +27,7 @@ version.major=9
 version.minor=0
 version.build=0
 version.patch=0
-version.suffix=.M26-dev
+version.suffix=.M27-dev
 
 # - Build control flags -
 # Note enabling validation uses Checkstyle which is LGPL licensed

Modified: tomcat/trunk/res/maven/mvn.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/mvn.properties.default?rev=1803923=1803922=1803923=diff
==
--- tomcat/trunk/res/maven/mvn.properties.default (original)
+++ tomcat/trunk/res/maven/mvn.properties.default Wed Aug  2 20:53:05 2017
@@ -39,7 +39,7 @@ maven.asf.release.repo.url=https://repos
 maven.asf.release.repo.repositoryId=apache.releases.https
 
 # Release version info
-maven.asf.release.deploy.version=9.0.0.M26
+maven.asf.release.deploy.version=9.0.0.M27
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1803923=1803922=1803923=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Aug  2 20:53:05 2017
@@ -44,7 +44,9 @@
   They eventually become mixed with the numbered issues. (I.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
+
+
   
 
   



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



Re: svn commit: r1803654 - in /tomcat/site/trunk: docs/migration-85.html xdocs/migration-85.xml

2017-08-02 Thread Christopher Schultz
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Konstantin,

On 8/2/17 8:19 AM, Konstantin Kolinko wrote:
> 2017-08-01 18:34 GMT+03:00  :
>> Author: schultz Date: Tue Aug  1 15:34:35 2017 New Revision:
>> 1803654
>> 
>> URL: http://svn.apache.org/viewvc?rev=1803654=rev Log: Add
>> note about HTTP reason phrase in Migration Guide.
>> 
>> Modified: tomcat/site/trunk/docs/migration-85.html 
>> tomcat/site/trunk/xdocs/migration-85.xml
> 
>> Modified: tomcat/site/trunk/xdocs/migration-85.xml URL:
>> http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-85.xml
?rev=1803654=1803653=1803654=diff
>>
>> 

==
>> --- tomcat/site/trunk/xdocs/migration-85.xml (original) +++
>> tomcat/site/trunk/xdocs/migration-85.xml Tue Aug  1 15:34:35
>> 2017 @@ -36,6 +36,13 @@ of Apache Tomcat.
>> 
>> 
>> 
>> +   + +
>> HTTP reason phrases have been > href="https://bz.apache.org/bugzilla/show_bug.cgi?id=60362;>removed
>> by default, +  but can be re-enabled using the
>> sendReasonPhrase +  configuration
>> attributea>
> 
> 1) Anchor has not href attribute and closing tag is doubled.
> 
> 2) Maybe add this note to Tomcat 9 migration guide as well (as a 
> warning, not a configurable option).

Drat. Thanks for the oversight.

Fixed and committed. I'll add a similar note to Tomcat 9.0 migration.

- -chris
-BEGIN PGP SIGNATURE-
Comment: GPGTools - http://gpgtools.org
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBCAAGBQJZgjoHAAoJEBzwKT+lPKRY7RkQAIvsrEe/SsGwp1J5+0O9OOio
rQT9i00LGm2QCkc8SQDW14vzn72ripdHTgBIe2CGyMD4ba9wENBqq3QNloVoEv69
gKT3yIFokc0tNW/QqX1NV/3c65CP9hD5RPyz8ti3C1bRURS4JpTeQ3wQre7OpKAu
rJvAZHj2kYGhj5nEg0L8VsX9g4GPWio9g4667GTe4r4ftSjrR9+UyfhNNssuyNM1
okDhuoWli5z1UefGffwSEIdNyV9wDxi6NbDLiTTeXM5S3QE1XYjumBQrEfSPKFdy
CGNgBgF2+ZVOvMoOU/BTj9BRGcnLaoOnbZ6XgqpAnwSJqXCsemaiYLkMCmEJx1Gs
NVsvh7UT9aoAOZKfoMiRvUhBRFUhGQGxe9dcjlAGkWuX8jaDWBi1XrydZOfSVydn
VtMyQZFDOrsDwyA9Hyyn/5Ugaxq75t8q4u7LvUsAseyDkZaGsCvsFaoeCzkToff/
o/vMNv5t006KFZI4UeitXUS5jdNaGEixiX3ewELRchiP4GC5btBUw+1VzE8clxeA
V88u9zz0gwW58kUbZ+u+GTZQOF/FjtHQBgff2GxkDk/Z8WsIcqxOJW1xq4Gm/c9B
nnUY7N2ShMbobwXbz87Nail5St3tdzcCynci1qAeedVXUEbO9nlF3bDOdKnt3bow
+xwGegu9qXJENfsh42aJ
=1F+8
-END PGP SIGNATURE-

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



svn commit: r1803922 - /tomcat/site/trunk/docs/migration-85.html

2017-08-02 Thread schultz
Author: schultz
Date: Wed Aug  2 20:45:34 2017
New Revision: 1803922

URL: http://svn.apache.org/viewvc?rev=1803922=rev
Log:
Fix typo and missing URL.

Modified:
tomcat/site/trunk/docs/migration-85.html

Modified: tomcat/site/trunk/docs/migration-85.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-85.html?rev=1803922=1803921=1803922=diff
==
--- tomcat/site/trunk/docs/migration-85.html (original)
+++ tomcat/site/trunk/docs/migration-85.html Wed Aug  2 20:45:34 2017
@@ -314,7 +314,7 @@ of Apache Tomcat.
 
 
   
-configuration attributea
+https://tomcat.apache.org/tomcat-8.5-doc/config/http.html#Common_Attributes;>configuration
 attribute.
 
   
 



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



svn commit: r1803921 - /tomcat/site/trunk/xdocs/migration-85.xml

2017-08-02 Thread schultz
Author: schultz
Date: Wed Aug  2 20:44:25 2017
New Revision: 1803921

URL: http://svn.apache.org/viewvc?rev=1803921=rev
Log:
Fix typo and missing URL.

Modified:
tomcat/site/trunk/xdocs/migration-85.xml

Modified: tomcat/site/trunk/xdocs/migration-85.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-85.xml?rev=1803921=1803920=1803921=diff
==
--- tomcat/site/trunk/xdocs/migration-85.xml (original)
+++ tomcat/site/trunk/xdocs/migration-85.xml Wed Aug  2 20:44:25 2017
@@ -40,7 +40,7 @@ of Apache Tomcat.
 
   HTTP reason phrases have been https://bz.apache.org/bugzilla/show_bug.cgi?id=60362;>removed by 
default,
   but can be re-enabled using the sendReasonPhrase
-  configuration attributea>
+  https://tomcat.apache.org/tomcat-8.5-doc/config/http.html#Common_Attributes;>configuration
 attribute.
 
   
   



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



svn commit: r20731 - in /release/tomcat: tomcat-8/v8.5.19/ tomcat-9/v9.0.0.M25/

2017-08-02 Thread markt
Author: markt
Date: Wed Aug  2 20:43:06 2017
New Revision: 20731

Log:
Drop known bad releases from mirrors

Removed:
release/tomcat/tomcat-8/v8.5.19/
release/tomcat/tomcat-9/v9.0.0.M25/


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



Re: Opportunities for cohesion improvement and refatoring

2017-08-02 Thread Christopher Schultz
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Mark and João,

On 8/2/17 3:38 AM, Mark Thomas wrote:
> On 02/08/2017 00:02, João Paulo Lemes Machado wrote:
>> Hi Mark.
>> 
>> Did you take a look at my suggestion?
> 
> Yes. I don't think the cost is worth the benefit.

+1

So what if the class has 61 properties? If you divide it into a "doer"
class and a "configurator" class, you'll have two classes, one of
which has 61 properties and the other of which can't do anything
without /yet another/ object being available to configure it.

Then again, you're talking to someone who thinks Fluent is an abominatio
n.

- -chris

>> 2017-07-25 15:33 GMT-03:00 João Paulo Lemes Machado
>>  :
>> 
>>> Hi Mark, tanks for the comment.
>>> 
>>> Let me take the DataSourceProxy as example.
>>> 
>>> This class has 142 methods  of which 112 are get () and set ()
>>> methods. We could mark these methods as deprecated and copy
>>> them to a new class: DataSourceProxyConfig, but we would leave
>>> them in the DataSourceProxy class, and they would be removed
>>> gradually.
>>> 
>>> Those parameters and methods would be accessed by an instance
>>> variable of DataSourceProxyConfig in DataSourceProxy.
>>> 
>>> So we will keep the methods in the original class for some time
>>> so that developers who have some assumption about the class can
>>> adapt.
>>> 
>>> However, when choosing the methods we could analyze their
>>> complexity. If it is a simple set () or get () that only sets
>>> or returns a value it would be prioritized.
>>> 
>>> 
>>> 
>>> Methods that have a greater complexity, or that make calls to
>>> other methods would not be extracted at first.
>>> 
>>> 
>>> And if for some reason we can not make these changes (remove
>>> the methods), this strategy can be adopted to prevent these
>>> classes from growing even more. It can also be adopted as a new
>>> practice for creating new classes in the future.
>>> 
>>> 
>>> What do you think?
>>> 
>>> 
>>> 
>>> 
>>> 
>>> 2017-07-25 10:40 GMT-03:00 Mark Thomas :
>>> 
 On 25/07/17 13:55, João Paulo Lemes Machado wrote:
> Hello everyone.
> 
> My name is João Paulo, I am a graduate student the Federal
> University of Uberlandia, Brazil.
> 
> I was analyzing the modularization of some classes of
> Tomcat, and  I identified some opportunities for cohesion
> improvement in the following classes:
> 
> DataSourceProxy ConnectionPool BasicDataSource 
> DelegatingCallableStatement PoolProperties 
> PoolConfiguration
 
 Those look to be from a mix of implementations (Commons DBCP
 and Tomcat's jdbc-pool).
 
 This is the place to discuss changes to Tomcat's jdbc-pool.
 DBCP changes should be discussed on the Apache Commons dev
 mailing list.
 
> Could you please take a look and tell me if it's viable?
 
 Hard to comment without a concrete example.
 
> Maybe some of these classes could benefit from some kind of
> refactoring that we can discuss.
 
 Maybe. What did you have in mind?
 
 Mark
 
 ---
- --

 
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
> 
-BEGIN PGP SIGNATURE-
Comment: GPGTools - http://gpgtools.org
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBCAAGBQJZgjjcAAoJEBzwKT+lPKRYtxEQAMBZIOujH7GHCP77aOe+D9cY
zHmTKfeppTzxD6fCpXFmfnhMLZg7aCf7zHXR/PtMcrwZvyqJdRSOqlBr2LpENx7a
xpJfNUnGZ2FPdfkxXsC12ZO0fs/jya+rIrQRo9F0uVJ6AY11gN9y1piuyZv07A/1
oct/MwXasapAU3OgiDW02HIGYgTHScKrY4GflgbQHH85JnyMJw094y3TX5zxX3M+
er700ht4EL4+W3hZKmS/sE8gss1BCjvV1mzzq0Gs09YFNBaaoM4WWwKks4Euf0pX
saJQY5q/UjJNqE97utUS00qXtVLUeW6h6DMn7Yup/QvX7iRzkR411hHvhvdulM1E
cKH1U3uCqZsV3O3db/9DExzpZGRSoDEPrAc1rRl7zkJW8uj8bXFhYxaeoXvhajQ8
27FuT8ikJe1CGQTw48hXrHRrBBXq4M7j5OkB6b6TFk2tTiI+1m3jtOhZj360lt2H
c6nJYo8tFoBPmOp3APgPa0lTpNoaV9oT1/GQx+/qAm6CwUBOxekzTT8cJ+ZhvZm1
WLY3W1tFvQo+Jw5fYCRjPgres5EUMKzZgCr8Stqtl0oTx5RwnaxJDMbZikdtWp2D
0dga4ezp/D1SrgmVkzUt0ihP9olNa1wkBhkwxsDWPUPlnlfXuRU8dP1CPsIw91rY
j5asNhZy8x6PgLNUzHfT
=Ar0Z
-END PGP SIGNATURE-

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



Re: Default servlet regressions

2017-08-02 Thread Mark Thomas
On 02/08/17 21:23, Christopher Schultz wrote:
> Mark,
> 
> On 7/31/17 12:16 PM, Mark Thomas wrote:
>> On 30/07/17 19:04, Mark Thomas wrote:
>>> All,
>>>
>>> It looks like there is another regression in the Default
>>> Servlet.
>>>
>>> While I think I have a patch for this, I'm currently leaning
>>> towards doing the following:
>>>
>>> - Announcing the 8.5.19 and 9.0.0.M25 releases with a warning
>>> about the regression.
>>>
>>> - Reverting the encoding changes in 8.5.x and earlier.
> 
>> This has been done.
> 
>>> - Fixing the latest regression for 9.0.0.M26.
> 
>> This has been done. But...
> 
>> Thinking about this overnight, I thought of some other possible
>> edge cases. The result is that I have put together a greatly
>> expanded set of tests - currently 680 - using parametrization.
> 
> You're a machine.

Nah. I just know how to wrote nested for loops ;)

>> Of these, currently 196 (no that isn't a typo) fail. I'm currently
>> working my way through them since some failures are expected (and I
>> need to mark them as such so the tests pass) but I have found some
>> additional edge cases that need to be handled.
> 
> Thanks for all your hard work on this.

You are welcome. But - to be frank - I broke this in the first place. I
feel I should be the one to sort it out. I'm just sorry it has taken a
handful of releases.

Mark

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



[Bug 61369] Tomcat 8.5.16 vulnerable to CVE-2016-0793

2017-08-02 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=61369

--- Comment #5 from Christopher Schultz  ---
(In reply to Mark Thomas from comment #3)
> The canonical path check is still required to enforce the required case
> sensitivity.
> 
> The Window APIs, most likely for reasons dating back to how 8.3 filenames
> were stored [1], ignore trailing periods in file names. That explains why
> allowLinking="true" enables this vulnerability. As far as the OS APIs are
> concerned, "/WEB-INF./web.xml" is the same as "/WEB-INF/web.xml" and setting
> allowLinking="true" bypasses the additional checks Tomcat performs to ensure
> an exact match between the requested path and the canonical path.
> 
> Just need confirmation from the OP that allowLinking="true" was being used
> and this issue can be closed.
> 
> [1]
> https://superuser.com/questions/585097/why-does-ntfs-disallow-the-use-of-
> trailing-periods-in-directory-names

I propose the following:

1. On Windows, check for "/WEB-INF." and any other special paths which are
already checked for access.

and/or

2. On Windows, if allowLinking="true", drop a GIANT ERROR to stdout and do a
Thread.sleep(5mins) before proceeding with bringing up the server.

-- 
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: Default servlet regressions

2017-08-02 Thread Christopher Schultz
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Mark,

On 7/31/17 12:16 PM, Mark Thomas wrote:
> On 30/07/17 19:04, Mark Thomas wrote:
>> All,
>> 
>> It looks like there is another regression in the Default
>> Servlet.
>> 
>> While I think I have a patch for this, I'm currently leaning
>> towards doing the following:
>> 
>> - Announcing the 8.5.19 and 9.0.0.M25 releases with a warning
>> about the regression.
>> 
>> - Reverting the encoding changes in 8.5.x and earlier.
> 
> This has been done.
> 
>> - Fixing the latest regression for 9.0.0.M26.
> 
> This has been done. But...
> 
> Thinking about this overnight, I thought of some other possible
> edge cases. The result is that I have put together a greatly
> expanded set of tests - currently 680 - using parametrization.

You're a machine.

> Of these, currently 196 (no that isn't a typo) fail. I'm currently
> working my way through them since some failures are expected (and I
> need to mark them as such so the tests pass) but I have found some
> additional edge cases that need to be handled.

Thanks for all your hard work on this.

- -chris
-BEGIN PGP SIGNATURE-
Comment: GPGTools - http://gpgtools.org
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBCAAGBQJZgjTNAAoJEBzwKT+lPKRYiA8QAMaaWrmy5rfbqinOzUnEtNr1
FFbLmOakhZCE0HMoPBby7uln7nXzwSfYj9AOSP/BQOHu17KFjXo2irsf51aQIZQX
Wy7QnzBhXg8IO2frFKoSh0FVqzyjMEubwqU0jK/end+snLu8lhg/aaiW6/Z2cH7t
AlmOD/z4fVtFdsdkyDVGPVH+DufgZTff6RylqIYI2PFTBAe2JCh7zq8Lcr0TFWYd
+lByx2+Na7F1KD47kEBuCNu0n8+uW8f+hnfkBj8HFj1PANd1tYaF2OvrLJsFwBCJ
NKQbiTFa1D+LmPHa4gZcq89xbaHO+JoTlAtFOetfWIn5RZ2RUwz37FKUfyFGL1T8
1KbxlR/YwDfMFbp867rP95hAxbjLtlddzvh5Da9qhjhlYTinCtd2nme+TecFKtQf
PElx3ySgPtJ8DOTaUD6Xxiz5ZjoeI/X+zcXagEPNf7Q933zsXAlWUlkxqQT+S+ck
sN+Pmi/bmD7KVpxeuXcROTbIHJCtMYv2rIskrQcINe9pZXt8X83yj6ceCefi4r/B
wLii/lMbTyTzqPVpI7HEkftL6X2zG0fM0cxDRvBh6tBZDfNELRX9xlr7vUAABusk
tGsIhXK85JeO9iIis8E7UAXZT1MsaO2Y+e5igRW8/3w3whxfbw8jrrMOmq+xAwR6
NGZjdgwy3faOJUW0+oLa
=VkGG
-END PGP SIGNATURE-

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



svn commit: r1803915 - in /tomcat/tags/TOMCAT_9_0_0_M26: ./ build.properties.default webapps/docs/changelog.xml

2017-08-02 Thread markt
Author: markt
Date: Wed Aug  2 20:22:56 2017
New Revision: 1803915

URL: http://svn.apache.org/viewvc?rev=1803915=rev
Log:
Tag 9.0.0.M26

Added:
tomcat/tags/TOMCAT_9_0_0_M26/   (props changed)
  - copied from r1803914, tomcat/trunk/
Modified:
tomcat/tags/TOMCAT_9_0_0_M26/build.properties.default
tomcat/tags/TOMCAT_9_0_0_M26/webapps/docs/changelog.xml

Propchange: tomcat/tags/TOMCAT_9_0_0_M26/
--
bugtraq:append = false

Propchange: tomcat/tags/TOMCAT_9_0_0_M26/
--
bugtraq:label = Bugzilla ID (optional)

Propchange: tomcat/tags/TOMCAT_9_0_0_M26/
--
--- bugtraq:logregex (added)
+++ bugtraq:logregex Wed Aug  2 20:22:56 2017
@@ -0,0 +1,2 @@
+(https?\://(bz|issues)\.apache\.org/bugzilla/show_bug.cgi\?id=\d+|BZ\s?\d+)
+(\d+)

Propchange: tomcat/tags/TOMCAT_9_0_0_M26/
--
bugtraq:message = Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID%

Propchange: tomcat/tags/TOMCAT_9_0_0_M26/
--
bugtraq:url = https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID%

Propchange: tomcat/tags/TOMCAT_9_0_0_M26/
--
--- svn:ignore (added)
+++ svn:ignore Wed Aug  2 20:22:56 2017
@@ -0,0 +1,8 @@
+.*
+build.properties
+logs
+nbproject
+output
+work
+*.iml
+temp

Propchange: tomcat/tags/TOMCAT_9_0_0_M26/
--
svn:mergeinfo = /tomcat/tc8.5.x/trunk:1802799

Propchange: tomcat/tags/TOMCAT_9_0_0_M26/
--
svnmailer:content-charset = utf-8

Modified: tomcat/tags/TOMCAT_9_0_0_M26/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tags/TOMCAT_9_0_0_M26/build.properties.default?rev=1803915=1803914=1803915=diff
==
--- tomcat/tags/TOMCAT_9_0_0_M26/build.properties.default (original)
+++ tomcat/tags/TOMCAT_9_0_0_M26/build.properties.default Wed Aug  2 20:22:56 
2017
@@ -27,7 +27,7 @@ version.major=9
 version.minor=0
 version.build=0
 version.patch=0
-version.suffix=.M26-dev
+version.suffix=.M26
 
 # - Build control flags -
 # Note enabling validation uses Checkstyle which is LGPL licensed

Modified: tomcat/tags/TOMCAT_9_0_0_M26/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tags/TOMCAT_9_0_0_M26/webapps/docs/changelog.xml?rev=1803915=1803914=1803915=diff
==
--- tomcat/tags/TOMCAT_9_0_0_M26/webapps/docs/changelog.xml (original)
+++ tomcat/tags/TOMCAT_9_0_0_M26/webapps/docs/changelog.xml Wed Aug  2 20:22:56 
2017
@@ -44,7 +44,7 @@
   They eventually become mixed with the numbered issues. (I.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
   
 
   



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



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

2017-08-02 Thread markt
Author: markt
Date: Wed Aug  2 20:21:24 2017
New Revision: 1803914

URL: http://svn.apache.org/viewvc?rev=1803914=rev
Log:
Fix odd UTF-8 character.
jmx -> JMX

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=1803914=1803913=1803914=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Aug  2 20:21:24 2017
@@ -731,8 +731,8 @@
 in order to expose to JMX. (kfujino)
   
   
-Add JMX support for Channel Interceptors. The 
Interceptors
-that implement jmx support are TcpFailureDetector,
+Add JMX support for Channel Interceptors. The Interceptors
+that implement JMX support are TcpFailureDetector,
 ThroughputInterceptor, TcpPingInterceptor,
 StaticMembershipInterceptor,
 MessageDispatchInterceptor and



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



Re: Default servlet regressions

2017-08-02 Thread Mark Thomas
On 31/07/17 17:16, Mark Thomas wrote:
> On 30/07/17 19:04, Mark Thomas wrote:
>> All,
>>
>> It looks like there is another regression in the Default Servlet.
>>
>> While I think I have a patch for this, I'm currently leaning towards
>> doing the following:
>>
>> - Announcing the 8.5.19 and 9.0.0.M25 releases with a warning about the
>>   regression.

Change of plan on this one. I'm not going to announce at all. I'll just
drop them from the mirrors.

>> - Reverting the encoding changes in 8.5.x and earlier.
> 
> This has been done.
> 
>> - Fixing the latest regression for 9.0.0.M26.
> 
> This has been done. But...
> 
> Thinking about this overnight, I thought of some other possible edge
> cases. The result is that I have put together a greatly expanded set of
> tests - currently 680 - using parametrization. Of these, currently 196
> (no that isn't a typo) fail. I'm currently working my way through them
> since some failures are expected (and I need to mark them as such so the
> tests pass) but I have found some additional edge cases that need to be
> handled.

2720 unit tests later (parameterized unit tests are great for really
increasing the number of tests) 9.0.x looks good.

>> - Tagging and releasing 8.5.20 and 9.0.0.M26 early in August (i.e. early
>>   this coming week).

I'm planning to do this shortly. 9.0.x has passed all my pre-tagging
tests so I'll be tagging trunk  very soon.

>> - Take a longer look at the Default servlet code for M27 that will
>>   include some refactoring and API changes I've been considering while
>>   working on the encoding issue.

Still on the TODO list for M27

Mark

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



buildbot success in on tomcat-7-trunk

2017-08-02 Thread buildbot
The Buildbot has detected a restored build on builder tomcat-7-trunk while 
building . Full details are available at:
https://ci.apache.org/builders/tomcat-7-trunk/builds/836

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

Buildslave for this Build: silvanus_ubuntu

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

Build succeeded!

Sincerely,
 -The Buildbot




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



Re: Opportunities for cohesion improvement and refatoring

2017-08-02 Thread Mark Thomas
On 02/08/17 20:18, João Paulo Lemes Machado wrote:
> When you talk about the cost, do you mean backward compatibility?

The time taken to do it, the duplicated code until the deprecated code
can be removed, the cost of downstream users updating their code.

All for a minimal maintenance benefit.

Overall, that isn't something I'm interested in pursuing. That doesn't
mean someone else won't be interested. Just that I'm not.

Mark


> 
> 
> 2017-08-02 4:38 GMT-03:00 Mark Thomas :
> 
>> On 02/08/2017 00:02, João Paulo Lemes Machado wrote:
>>> Hi Mark.
>>>
>>> Did you take a look at my suggestion?
>>
>> Yes. I don't think the cost is worth the benefit.
>>
>> Mark
>>
>>
>>>
>>> 2017-07-25 15:33 GMT-03:00 João Paulo Lemes Machado <
>> lemesmach...@gmail.com>
>>> :
>>>
 Hi Mark, tanks for the comment.

 Let me take the DataSourceProxy as example.

 This class has 142 methods  of which 112 are get () and set () methods.
 We could mark these methods as deprecated and copy them to a new class:
 DataSourceProxyConfig, but we would leave them in the DataSourceProxy
>> class,
 and they would be removed gradually.

 Those parameters and methods would be accessed by an instance variable
>> of
 DataSourceProxyConfig in DataSourceProxy.

 So we will keep the methods in the original class for some time so that
 developers who have some assumption about the class can adapt.

 However, when choosing the methods we could analyze their complexity. If
 it is a simple set () or get () that only sets or returns a value it
>> would
 be prioritized.



 Methods that have a greater complexity, or that make calls to other
 methods would not be extracted at first.


 And if for some reason we can not make these changes (remove the
>> methods),
 this strategy can be adopted to prevent these classes from growing even
 more. It can also be adopted as a new practice for creating new classes
>> in
 the future.


 What do you think?





 2017-07-25 10:40 GMT-03:00 Mark Thomas :

> On 25/07/17 13:55, João Paulo Lemes Machado wrote:
>> Hello everyone.
>>
>> My name is João Paulo, I am a graduate student the Federal University
>> of
>> Uberlandia, Brazil.
>>
>> I was analyzing the modularization of some classes of Tomcat, and  I
>> identified some opportunities for cohesion improvement in the
>> following
>> classes:
>>
>> DataSourceProxy
>> ConnectionPool
>> BasicDataSource
>> DelegatingCallableStatement
>> PoolProperties
>> PoolConfiguration
>
> Those look to be from a mix of implementations (Commons DBCP and
> Tomcat's jdbc-pool).
>
> This is the place to discuss changes to Tomcat's jdbc-pool. DBCP
>> changes
> should be discussed on the Apache Commons dev mailing list.
>
>> Could you please take a look and tell me if it's viable?
>
> Hard to comment without a concrete example.
>
>> Maybe some of these classes could benefit from some kind of
>> refactoring
>> that we can discuss.
>
> Maybe. What did you have in mind?
>
> Mark
>
> -
> 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
>>
>>
> 


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



svn commit: r1803910 - in /tomcat/native/trunk/xdocs: index.xml news/2017.xml news/project.xml project.xml

2017-08-02 Thread csutherl
Author: csutherl
Date: Wed Aug  2 19:29:35 2017
New Revision: 1803910

URL: http://svn.apache.org/viewvc?rev=1803910=rev
Log:
Update current version from 1.2.10 to 1.2.12, Add 2017 news page, Fix XML 
formatting, and add 8.5 doc link

Added:
tomcat/native/trunk/xdocs/news/2017.xml   (with props)
Modified:
tomcat/native/trunk/xdocs/index.xml
tomcat/native/trunk/xdocs/news/project.xml
tomcat/native/trunk/xdocs/project.xml

Modified: tomcat/native/trunk/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/index.xml?rev=1803910=1803909=1803910=diff
==
--- tomcat/native/trunk/xdocs/index.xml (original)
+++ tomcat/native/trunk/xdocs/index.xml Wed Aug  2 19:29:35 2017
@@ -64,16 +64,16 @@ manual is described in more detail below
 
 
 
-5 October 2016 - TC-Native-1.2.10
+26 June 2017 - TC-Native-1.2.12
 released
 The Apache Tomcat team is proud to announce the immediate availability of
-Tomcat Native 1.2.10 Stable.
+Tomcat Native 1.2.12 Stable.
 
 The sources and the binaries for selected platforms are available from the
 Download page.
 
 
-Please see the ChangeLog for a full
+Please see the Changelog for a full
 list of changes.
 
 
@@ -198,10 +198,12 @@ Feb 8, 2015 12:27:41 PM org.apache.catal
 INFO: APR capabilities: IPv6 [true], sendfile [true], accept filters [false], 
random [true].
 Feb 8, 2015 12:27:41 PM org.apache.coyote.http11.Http11AprProtocol init
 INFO: Initializing Coyote HTTP/1.1 on http-8080
+
   
 Refer to the tomcat documentation to configure the connectors
-(See http://tomcat.apache.org/tomcat-8.0-doc/apr.html;>Tomcat 
8.0.x,
-http://tomcat.apache.org/tomcat-7.0-doc/apr.html;>Tomcat 7.0.x
+(See http://tomcat.apache.org/tomcat-8.5-doc/apr.html;>Tomcat 
8.5.x,
+http://tomcat.apache.org/tomcat-8.0-doc/apr.html;>Tomcat 
8.0.x,
+http://tomcat.apache.org/tomcat-7.0-doc/apr.html;>Tomcat 
7.0.x,
 and http://tomcat.apache.org/tomcat-6.0-doc/apr.html;>Tomcat 
6.0.x)
   
 

Added: tomcat/native/trunk/xdocs/news/2017.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/news/2017.xml?rev=1803910=auto
==
Binary file - no diff available.

Propchange: tomcat/native/trunk/xdocs/news/2017.xml
--
svn:mime-type = application/xml

Modified: tomcat/native/trunk/xdocs/news/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/news/project.xml?rev=1803910=1803909=1803910=diff
==
--- tomcat/native/trunk/xdocs/news/project.xml (original)
+++ tomcat/native/trunk/xdocs/news/project.xml Wed Aug  2 19:29:35 2017
@@ -16,34 +16,35 @@
   limitations under the License.
 -->
 http://tomcat.apache.org/;>
+  href="http://tomcat.apache.org/;>
 
-The Apache Tomcat Native - News
+  The Apache Tomcat Native - News
 
-
-  The Apache Tomcat Native - News
-
-
+  
+The Apache Tomcat Native - News
+  
 
+  
 
-
+  
 
 
 
-
+  
 
 
 
-
-
-
-
-
-
-
-
-
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
 
 
-
+  
 

Modified: tomcat/native/trunk/xdocs/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/project.xml?rev=1803910=1803909=1803910=diff
==
--- tomcat/native/trunk/xdocs/project.xml (original)
+++ tomcat/native/trunk/xdocs/project.xml Wed Aug  2 19:29:35 2017
@@ -16,34 +16,34 @@
   limitations under the License.
 -->
 http://tomcat.apache.org/;>
+  href="http://tomcat.apache.org/;>
 
-Apache Tomcat Native Library
+  Apache Tomcat Native Library
 
-
-  Apache Tomcat Native Library
-
-
+  
+Apache Tomcat Native Library
+  
 
+  
 
-
+  
 
 
 
-
+  
 
 
 
-
-
-
-
-
-
-
-
-
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
 
-
-
+  
 



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



svn commit: r1803908 - /tomcat/native/trunk/native/configure.in

2017-08-02 Thread wrowe
Author: wrowe
Date: Wed Aug  2 19:27:58 2017
New Revision: 1803908

URL: http://svn.apache.org/viewvc?rev=1803908=rev
Log:
The tcn include files do not live in builddir, they are not generated.
These live in the srcdir (other aliases would be forward references.)


Modified:
tomcat/native/trunk/native/configure.in

Modified: tomcat/native/trunk/native/configure.in
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/configure.in?rev=1803908=1803907=1803908=diff
==
--- tomcat/native/trunk/native/configure.in (original)
+++ tomcat/native/trunk/native/configure.in Wed Aug  2 19:27:58 2017
@@ -85,7 +85,7 @@ dnl set up the compilation flags and stu
 dnl
 
 TCNATIVE_INCLUDES=""
-TCNATIVE_PRIV_INCLUDES="-I$top_builddir/include"
+TCNATIVE_PRIV_INCLUDES="-I$srcdir/include"
 
 dnl
 dnl Find the APR includes directory and (possibly) the source (base) dir.



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



svn commit: r1803907 - /tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java

2017-08-02 Thread markt
Author: markt
Date: Wed Aug  2 19:26:17 2017
New Revision: 1803907

URL: http://svn.apache.org/viewvc?rev=1803907=rev
Log:
Fix build

Modified:

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java?rev=1803907=1803906=1803907=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java 
(original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java 
Wed Aug  2 19:26:17 2017
@@ -420,7 +420,7 @@ public class WsWebSocketContainer
 }
 
 if (redirectSet == null) {
-redirectSet = new HashSet<>(maxRedirects);
+redirectSet = new HashSet(maxRedirects);
 }
 
 if (!redirectSet.add(redirectLocation) || 
redirectSet.size() > maxRedirects) {



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



Re: Opportunities for cohesion improvement and refatoring

2017-08-02 Thread João Paulo Lemes Machado
When you talk about the cost, do you mean backward compatibility?


2017-08-02 4:38 GMT-03:00 Mark Thomas :

> On 02/08/2017 00:02, João Paulo Lemes Machado wrote:
> > Hi Mark.
> >
> > Did you take a look at my suggestion?
>
> Yes. I don't think the cost is worth the benefit.
>
> Mark
>
>
> >
> > 2017-07-25 15:33 GMT-03:00 João Paulo Lemes Machado <
> lemesmach...@gmail.com>
> > :
> >
> >> Hi Mark, tanks for the comment.
> >>
> >> Let me take the DataSourceProxy as example.
> >>
> >> This class has 142 methods  of which 112 are get () and set () methods.
> >> We could mark these methods as deprecated and copy them to a new class:
> >> DataSourceProxyConfig, but we would leave them in the DataSourceProxy
> class,
> >> and they would be removed gradually.
> >>
> >> Those parameters and methods would be accessed by an instance variable
> of
> >> DataSourceProxyConfig in DataSourceProxy.
> >>
> >> So we will keep the methods in the original class for some time so that
> >> developers who have some assumption about the class can adapt.
> >>
> >> However, when choosing the methods we could analyze their complexity. If
> >> it is a simple set () or get () that only sets or returns a value it
> would
> >> be prioritized.
> >>
> >>
> >>
> >> Methods that have a greater complexity, or that make calls to other
> >> methods would not be extracted at first.
> >>
> >>
> >> And if for some reason we can not make these changes (remove the
> methods),
> >> this strategy can be adopted to prevent these classes from growing even
> >> more. It can also be adopted as a new practice for creating new classes
> in
> >> the future.
> >>
> >>
> >> What do you think?
> >>
> >>
> >>
> >>
> >>
> >> 2017-07-25 10:40 GMT-03:00 Mark Thomas :
> >>
> >>> On 25/07/17 13:55, João Paulo Lemes Machado wrote:
>  Hello everyone.
> 
>  My name is João Paulo, I am a graduate student the Federal University
> of
>  Uberlandia, Brazil.
> 
>  I was analyzing the modularization of some classes of Tomcat, and  I
>  identified some opportunities for cohesion improvement in the
> following
>  classes:
> 
>  DataSourceProxy
>  ConnectionPool
>  BasicDataSource
>  DelegatingCallableStatement
>  PoolProperties
>  PoolConfiguration
> >>>
> >>> Those look to be from a mix of implementations (Commons DBCP and
> >>> Tomcat's jdbc-pool).
> >>>
> >>> This is the place to discuss changes to Tomcat's jdbc-pool. DBCP
> changes
> >>> should be discussed on the Apache Commons dev mailing list.
> >>>
>  Could you please take a look and tell me if it's viable?
> >>>
> >>> Hard to comment without a concrete example.
> >>>
>  Maybe some of these classes could benefit from some kind of
> refactoring
>  that we can discuss.
> >>>
> >>> Maybe. What did you have in mind?
> >>>
> >>> Mark
> >>>
> >>> -
> >>> 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
>
>


buildbot failure in on tomcat-7-trunk

2017-08-02 Thread buildbot
The Buildbot has detected a new failure on builder tomcat-7-trunk while 
building . Full details are available at:
https://ci.apache.org/builders/tomcat-7-trunk/builds/835

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1803906
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



[Bug 57767] Websocket client proprietary configuration

2017-08-02 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=57767

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #8 from Mark Thomas  ---
Thanks for the patch. It has been applied to:
- trunk for 9.0.0.M26 onwards
- 8.5.x for 8.5.20 onwards
- 8.0.x for 8.0.46 onwards
- 7.0.x for 7.0.80 onwards

There were a few minor style things I tweaked. If you enable ChekcStyle and run
the validate target it will catch most of them.

I also moved the configuration properties from System properties the user
properties. Generally, we try to avoid system properties where we can as they
can conflict in some use cases.

I merged the two properties so redirects are disabled by setting the number of
allowed redirects to 0. The default I set to 20 which is consistent with most
current browsers.

It might look like a lot of changes but they were all fairly minor. Thanks
again for the patch.

-- 
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: r1803906 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/websocket/ test/org/apache/tomcat/websocket/ webapps/docs/

2017-08-02 Thread markt
Author: markt
Date: Wed Aug  2 19:07:56 2017
New Revision: 1803906

URL: http://svn.apache.org/viewvc?rev=1803906=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57767
Add support to the WebSocket client for following redirects when attempting to 
establish a WebSocket connection.
Patch provided by J Fernandez.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/Constants.java

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java

tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/web-socket-howto.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug  2 19:07:56 2017
@@ -1,3 +1,3 @@
 
/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,1644525,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,1681703,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,1702
 
739,1702742,1702744,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,1715866,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,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1
 

svn commit: r1803904 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/websocket/ test/org/apache/tomcat/websocket/ webapps/docs/

2017-08-02 Thread markt
Author: markt
Date: Wed Aug  2 19:01:26 2017
New Revision: 1803904

URL: http://svn.apache.org/viewvc?rev=1803904=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57767
Add support to the WebSocket client for following redirects when attempting to 
establish a WebSocket connection.
Patch provided by J Fernandez.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/Constants.java

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java

tomcat/tc8.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.0.x/trunk/webapps/docs/web-socket-howto.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug  2 19:01:26 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,1791528,1791558,1796697-1796698,1797521,1798543,1799162,1800143,1801693,1802805
-/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
 

svn commit: r1803902 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/websocket/ test/org/apache/tomcat/websocket/ webapps/docs/

2017-08-02 Thread markt
Author: markt
Date: Wed Aug  2 18:56:21 2017
New Revision: 1803902

URL: http://svn.apache.org/viewvc?rev=1803902=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57767
Add support to the WebSocket client for following redirects when attempting to 
establish a WebSocket connection.
Patch provided by J Fernandez.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/Constants.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java

tomcat/tc8.5.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.5.x/trunk/webapps/docs/web-socket-howto.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug  2 18:56:21 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,1745535,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,1747
 
536,1747924,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-1
 

svn commit: r1803901 - in /tomcat/trunk: java/org/apache/tomcat/websocket/ test/org/apache/tomcat/websocket/ webapps/docs/

2017-08-02 Thread markt
Author: markt
Date: Wed Aug  2 18:55:44 2017
New Revision: 1803901

URL: http://svn.apache.org/viewvc?rev=1803901=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57767
Add support to the WebSocket client for following redirects when attempting to 
establish a WebSocket connection.
Patch provided by J Fernandez.

Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java
tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/web-socket-howto.xml

Modified: tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java?rev=1803901=1803900=1803901=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java Wed Aug  2 
18:55:44 2017
@@ -73,6 +73,13 @@ public class Constants {
 public static final String IO_TIMEOUT_MS_PROPERTY =
 "org.apache.tomcat.websocket.IO_TIMEOUT_MS";
 public static final long IO_TIMEOUT_MS_DEFAULT = 5000;
+
+// RFC 2068 recommended a limit of 5
+// Most browsers have a default limit of 20
+public static final String MAX_REDIRECTIONS_PROPERTY =
+"org.apache.tomcat.websocket.MAX_REDIRECTIONS";
+public static final int MAX_REDIRECTIONS_DEFAULT = 20;
+
 // HTTP upgrade header names and values
 public static final String HOST_HEADER_NAME = "Host";
 public static final String UPGRADE_HEADER_NAME = "Upgrade";
@@ -80,12 +87,21 @@ public class Constants {
 public static final String ORIGIN_HEADER_NAME = "Origin";
 public static final String CONNECTION_HEADER_NAME = "Connection";
 public static final String CONNECTION_HEADER_VALUE = "upgrade";
+public static final String LOCATION_HEADER_NAME = "Location";
 public static final String WS_VERSION_HEADER_NAME = 
"Sec-WebSocket-Version";
 public static final String WS_VERSION_HEADER_VALUE = "13";
 public static final String WS_KEY_HEADER_NAME = "Sec-WebSocket-Key";
 public static final String WS_PROTOCOL_HEADER_NAME = 
"Sec-WebSocket-Protocol";
 public static final String WS_EXTENSIONS_HEADER_NAME = 
"Sec-WebSocket-Extensions";
 
+/// HTTP redirection status codes
+public static final int MULTIPLE_CHOICES = 300;
+public static final int MOVED_PERMANENTLY = 301;
+public static final int FOUND = 302;
+public static final int SEE_OTHER = 303;
+public static final int USE_PROXY = 305;
+public static final int TEMPORARY_REDIRECT = 307;
+
 // Configuration for Origin header in client
 static final String DEFAULT_ORIGIN_HEADER_VALUE =
 
System.getProperty("org.apache.tomcat.websocket.DEFAULT_ORIGIN_HEADER_VALUE");
@@ -117,8 +133,7 @@ public class Constants {
 
Boolean.getBoolean("org.apache.tomcat.websocket.STREAMS_DROP_EMPTY_MESSAGES");
 
 public static final boolean STRICT_SPEC_COMPLIANCE =
-Boolean.getBoolean(
-"org.apache.tomcat.websocket.STRICT_SPEC_COMPLIANCE");
+
Boolean.getBoolean("org.apache.tomcat.websocket.STRICT_SPEC_COMPLIANCE");
 
 public static final List INSTALLED_EXTENSIONS;
 

Modified: tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties?rev=1803901=1803900=1803901=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties Wed 
Aug  2 18:55:44 2017
@@ -136,3 +136,5 @@ wsWebSocketContainer.pathWrongScheme=The
 wsWebSocketContainer.proxyConnectFail=Failed to connect to the configured 
Proxy [{0}]. The HTTP response code was [{1}]
 wsWebSocketContainer.sessionCloseFail=Session with ID [{0}] did not close 
cleanly
 wsWebSocketContainer.sslEngineFail=Unable to create SSLEngine to support 
SSL/TLS connections
+wsWebSocketContainer.missingLocationHeader=Failed to handle HTTP response code 
[{0}]. Missing Location header in response
+wsWebSocketContainer.redirectThreshold=Cyclic Location header [{0}] detected / 
reached max number of redirects [{1}] of max [{2}]
\ No newline at end of file

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java?rev=1803901=1803900=1803901=diff
==
--- 

[jira] [Created] (MTOMCAT-311) latest 3.0-SNAPSHOT is not on https://repository.apache.org/content/repositories/snapshots/org/apache/tomcat/maven/

2017-08-02 Thread laurent perez (JIRA)
laurent perez created MTOMCAT-311:
-

 Summary: latest 3.0-SNAPSHOT is not on 
https://repository.apache.org/content/repositories/snapshots/org/apache/tomcat/maven/
 Key: MTOMCAT-311
 URL: https://issues.apache.org/jira/browse/MTOMCAT-311
 Project: Apache Tomcat Maven Plugin
  Issue Type: Dependency upgrade
Affects Versions: 3.0
 Environment: ASF
Reporter: laurent perez


Hi Olivier

I'd like to run tomcat8-maven-plugin from 
https://github.com/apache/tomcat-maven-plugin to benefit from a late 
tomcat8.0.x version to build a sample maven project demoing what I believe to 
be a bug in 8.0.x (tomcat, not the plugin). If I confirm the bug I'll have a 
patch for markt.

However there is no tomcat8-maven-plugin on 
https://repository.apache.org/content/repositories/snapshots/org/apache/tomcat/maven/
 and the CI looks discontinued

Could you deploy the latest 3.0-snapshot to the asf repo ? Or is another repo 
used now ? 
https://repository.apache.org/content/repositories/releases/org/apache/tomcat/maven/
 has no v8 either

Thanks !







--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

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



[Bug 61366] "Unable to find [comp]" when attempting to use JNDI datasource for JDBCStore session store

2017-08-02 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=61366

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #6 from Mark Thomas  ---
Many thanks.

I added some docs and a change log entry and applied it.

Fixed in:
- trunk for 9.0.0.M26 onwards
- 8.5.x for 8.5.20 onwards
- 8.0.x for 8.0.46 onwards

I didn't back-port to 7.0.x because the back-port was not clean and it seems
unlikely that anyone already using 7.0.x is going to need this option.

-- 
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 61369] Tomcat 8.5.16 vulnerable to CVE-2016-0793

2017-08-02 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=61369

Brett Schoppert  changed:

   What|Removed |Added

 Resolution|--- |INVALID
 Status|NEEDINFO|RESOLVED

--- Comment #4 from Brett Schoppert  ---
Yes, in this context allowLinking was set to true ... resolving the issue.

Thanks for the feedback.

-- 
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: r1803832 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/session/JDBCStore.java webapps/docs/changelog.xml webapps/docs/config/manager.xml

2017-08-02 Thread markt
Author: markt
Date: Wed Aug  2 15:35:13 2017
New Revision: 1803832

URL: http://svn.apache.org/viewvc?rev=1803832=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61366
Add a new attribute, localDataSource, to the JDBCStore that allows the Store to 
be configured to use a DataSource defined by the web application rather than 
the default of using a globally defined DataSource.
Patch provided by Jonathan Horowitz.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/JDBCStore.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.0.x/trunk/webapps/docs/config/manager.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug  2 15:35:13 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,1791528,1791558,1796697-1796698,1797521,1798543,1799162,1800143,1801693,1802805
-/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
 

svn commit: r1803829 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/session/JDBCStore.java webapps/docs/changelog.xml webapps/docs/config/manager.xml

2017-08-02 Thread markt
Author: markt
Date: Wed Aug  2 15:32:53 2017
New Revision: 1803829

URL: http://svn.apache.org/viewvc?rev=1803829=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61366
Add a new attribute, localDataSource, to the JDBCStore that allows the Store to 
be configured to use a DataSource defined by the web application rather than 
the default of using a globally defined DataSource.
Patch provided by Jonathan Horowitz.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/session/JDBCStore.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.5.x/trunk/webapps/docs/config/manager.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug  2 15:32:53 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,1745535,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,1747
 
536,1747924,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-1
 
756410,1756778,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,176216
 

[GitHub] tomcat pull request #71: Fix #61366 - Set the TCCL to that of the webapp con...

2017-08-02 Thread asfgit
Github user asfgit closed the pull request at:

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


---
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: r1803828 - in /tomcat/trunk: java/org/apache/catalina/session/JDBCStore.java webapps/docs/changelog.xml webapps/docs/config/manager.xml

2017-08-02 Thread markt
Author: markt
Date: Wed Aug  2 15:31:42 2017
New Revision: 1803828

URL: http://svn.apache.org/viewvc?rev=1803828=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61366
Add a new attribute, localDataSource, to the JDBCStore that allows the Store to 
be configured to use a DataSource defined by the web application rather than 
the default of using a globally defined DataSource.
Patch provided by Jonathan Horowitz.
This closes #71

Modified:
tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/manager.xml

Modified: tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java?rev=1803828=1803827=1803828=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java Wed Aug  2 
15:31:42 2017
@@ -108,6 +108,11 @@ public class JDBCStore extends StoreBase
 protected String dataSourceName = null;
 
 /**
+ * Context local datasource.
+ */
+private boolean localDataSource = false;
+
+/**
  * DataSource to use
  */
 protected DataSource dataSource = null;
@@ -455,6 +460,23 @@ public class JDBCStore extends StoreBase
 return this.dataSourceName;
 }
 
+/**
+ * @return if the datasource will be looked up in the webapp JNDI Context.
+ */
+public boolean getLocalDataSource() {
+return localDataSource;
+}
+
+/**
+ * Set to {@code true} to cause the datasource to be looked up in the 
webapp
+ * JNDI Context.
+ *
+ * @param localDataSource the new flag value
+ */
+public void setLocalDataSource(boolean localDataSource) {
+  this.localDataSource = localDataSource;
+}
+
 
 // - Public Methods
 
@@ -868,16 +890,26 @@ public class JDBCStore extends StoreBase
 return dbConnection;
 
 if (dataSourceName != null && dataSource == null) {
+org.apache.catalina.Context context = getManager().getContext();
+ClassLoader oldThreadContextCL = null;
+if (localDataSource) {
+oldThreadContextCL = context.bind(Globals.IS_SECURITY_ENABLED, 
null);
+}
+
 Context initCtx;
 try {
 initCtx = new InitialContext();
 Context envCtx = (Context) initCtx.lookup("java:comp/env");
 this.dataSource = (DataSource) 
envCtx.lookup(this.dataSourceName);
 } catch (NamingException e) {
-manager.getContext().getLogger().error(
+context.getLogger().error(
 sm.getString(getStoreName() + ".wrongDataSource",
 this.dataSourceName), e);
-   }
+} finally {
+if (localDataSource) {
+context.unbind(Globals.IS_SECURITY_ENABLED, 
oldThreadContextCL);
+}
+}
 }
 
 if (dataSource != null) {

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1803828=1803827=1803828=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Aug  2 15:31:42 2017
@@ -66,6 +66,13 @@
 web.xml and similar locations that may legitimately contain characters
 that are not permitted by RFC 3986. (markt)
   
+  
+61366: Add a new attribute, localDataSource, to
+the JDBCStore that allows the Store to be configured to 
use
+a DataSource defined by the web application rather than the default of
+using a globally defined DataSource. Patch provided by Jonathan
+Horowitz. (markt)
+  
 
   
   

Modified: tomcat/trunk/webapps/docs/config/manager.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/manager.xml?rev=1803828=1803827=1803828=diff
==
--- tomcat/trunk/webapps/docs/config/manager.xml (original)
+++ tomcat/trunk/webapps/docs/config/manager.xml Wed Aug  2 15:31:42 2017
@@ -422,6 +422,12 @@
   Java class name of the JDBC driver to be used.
 
 
+
+  This allows the Store to use a DataSource defined for the Context
+  rather than a global DataSource. If not specified, the default is
+  false: use a global DataSource.
+
+
 
   Name of the database column, contained in the specified session table,
   that contains the Engine, Host, and Web Application Context name in the




[Bug 61372] error 500 NullPointerException when no user agent is specified

2017-08-02 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=61372

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #1 from Mark Thomas  ---
That NPE is nothing to do with Tomcat. That is coming from a library packaged
with the application.

-- 
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 61372] New: error 500 NullPointerException when no user agent is specified

2017-08-02 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=61372

Bug ID: 61372
   Summary: error 500  NullPointerException when no user agent is
specified
   Product: Tomcat 7
   Version: 7.0.75
  Hardware: PC
OS: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Integration
  Assignee: dev@tomcat.apache.org
  Reporter: j2017...@mvrht.net
  Target Milestone: ---

An apache tomcat 7.0.75 server is failing to respond to a GET request, I found
out that the root cause is that the client I am using (node.js request module)
does not set a 'User-agent' header by default.

## Stack trace of the error

java.lang.NullPointerException
java.util.regex.Matcher.getTextLength(Matcher.java:1234)
java.util.regex.Matcher.reset(Matcher.java:308)
java.util.regex.Matcher.(Matcher.java:228)
java.util.regex.Pattern.matcher(Pattern.java:1088)
   
org.geonetwork.http.SessionTimeoutCookieFilter.doFilter(SessionTimeoutCookieFilter.java:47)
   
org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:330)
   
org.springframework.security.web.access.intercept.FilterSecurityInterceptor.invoke(FilterSecurityInterceptor.java:118)
   
org.springframework.security.web.access.intercept.FilterSecurityInterceptor.doFilter(FilterSecurityInterceptor.java:84)
   
org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342)
   
org.springframework.security.web.access.ExceptionTranslationFilter.doFilter(ExceptionTranslationFilter.java:113)
   
org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342)
   
org.springframework.security.web.session.SessionManagementFilter.doFilter(SessionManagementFilter.java:103)
   
org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342)
   
org.springframework.security.web.authentication.AnonymousAuthenticationFilter.doFilter(AnonymousAuthenticationFilter.java:113)
   
org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342)
   
org.springframework.security.web.savedrequest.RequestCacheAwareFilter.doFilter(RequestCacheAwareFilter.java:45)
   
org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342)
   
org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter.doFilter(AbstractAuthenticationProcessingFilter.java:183)
   
org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342)
   
org.springframework.security.web.authentication.www.BasicAuthenticationFilter.doFilter(BasicAuthenticationFilter.java:150)
   
org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342)
   
jeeves.config.springutil.PassthroughFilter.doFilter(PassthroughFilter.java:26)
   
org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342)
   
jeeves.config.springutil.MultiNodeAuthenticationFilter.doFilter(MultiNodeAuthenticationFilter.java:98)
   
org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342)
   
org.springframework.security.web.authentication.logout.LogoutFilter.doFilter(LogoutFilter.java:105)
   
org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342)
   
org.springframework.security.web.context.SecurityContextPersistenceFilter.doFilter(SecurityContextPersistenceFilter.java:87)
   
org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342)
   
org.springframework.security.web.FilterChainProxy.doFilterInternal(FilterChainProxy.java:192)
   
org.springframework.security.web.FilterChainProxy.doFilter(FilterChainProxy.java:160)
   
org.springframework.web.filter.DelegatingFilterProxy.invokeDelegate(DelegatingFilterProxy.java:343)
   
org.springframework.web.filter.DelegatingFilterProxy.doFilter(DelegatingFilterProxy.java:260)
   
jeeves.config.springutil.JeevesDelegatingFilterProxy.doFilter(JeevesDelegatingFilterProxy.java:64)
   
org.springframework.web.filter.CharacterEncodingFilter.doFilterInternal(CharacterEncodingFilter.java:88)
   
org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:106)


## Workaround

This can be easily worked around - when you found out the cause of the problem
by specifying a user agent header (even with an empty value)

## Steps to reproduce

send a curl request to an Apache Tomcat server, including the following option
to remove the User-Agent header:

-H "User-Agent:"

-- 
You are receiving this mail 

svn commit: r1803817 - in /tomcat/native/trunk/native: libtcnative.dsp tcnative.dsp

2017-08-02 Thread wrowe
Author: wrowe
Date: Wed Aug  2 13:18:11 2017
New Revision: 1803817

URL: http://svn.apache.org/viewvc?rev=1803817=rev
Log:
The addition of bb.c, os.c was missed from the .dsp project files

Modified:
tomcat/native/trunk/native/libtcnative.dsp
tomcat/native/trunk/native/tcnative.dsp

Modified: tomcat/native/trunk/native/libtcnative.dsp
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/libtcnative.dsp?rev=1803817=1803816=1803817=diff
==
--- tomcat/native/trunk/native/libtcnative.dsp (original)
+++ tomcat/native/trunk/native/libtcnative.dsp Wed Aug  2 13:18:11 2017
@@ -96,6 +96,10 @@ SOURCE=.\src\address.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\src\bb.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\src\dir.c
 # End Source File
 # Begin Source File
@@ -136,6 +140,10 @@ SOURCE=.\src\network.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\src\os.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\src\poll.c
 # End Source File
 # Begin Source File

Modified: tomcat/native/trunk/native/tcnative.dsp
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/tcnative.dsp?rev=1803817=1803816=1803817=diff
==
--- tomcat/native/trunk/native/tcnative.dsp (original)
+++ tomcat/native/trunk/native/tcnative.dsp Wed Aug  2 13:18:11 2017
@@ -96,6 +96,10 @@ SOURCE=.\src\address.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\src\bb.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\src\dir.c
 # End Source File
 # Begin Source File
@@ -136,6 +140,10 @@ SOURCE=.\src\network.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\src\os.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\src\poll.c
 # End Source File
 # Begin Source File



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



Re: svn commit: r1803654 - in /tomcat/site/trunk: docs/migration-85.html xdocs/migration-85.xml

2017-08-02 Thread Konstantin Kolinko
2017-08-01 18:34 GMT+03:00  :
> Author: schultz
> Date: Tue Aug  1 15:34:35 2017
> New Revision: 1803654
>
> URL: http://svn.apache.org/viewvc?rev=1803654=rev
> Log:
> Add note about HTTP reason phrase in Migration Guide.
>
> Modified:
> tomcat/site/trunk/docs/migration-85.html
> tomcat/site/trunk/xdocs/migration-85.xml

> Modified: tomcat/site/trunk/xdocs/migration-85.xml
> URL: 
> http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-85.xml?rev=1803654=1803653=1803654=diff
> ==
> --- tomcat/site/trunk/xdocs/migration-85.xml (original)
> +++ tomcat/site/trunk/xdocs/migration-85.xml Tue Aug  1 15:34:35 2017
> @@ -36,6 +36,13 @@ of Apache Tomcat.
>
>
>
> +  
> +
> +  HTTP reason phrases have been  href="https://bz.apache.org/bugzilla/show_bug.cgi?id=60362;>removed by 
> default,
> +  but can be re-enabled using the sendReasonPhrase
> +  configuration attributea>

1) Anchor has not href attribute and closing tag is doubled.

2) Maybe add this note to Tomcat 9 migration guide as well (as a
warning, not a configurable option).

> +
> +  
>

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



[Bug 61369] Tomcat 8.5.16 vulnerable to CVE-2016-0793

2017-08-02 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=61369

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |NEEDINFO

--- Comment #3 from Mark Thomas  ---
The canonical path check is still required to enforce the required case
sensitivity.

The Window APIs, most likely for reasons dating back to how 8.3 filenames were
stored [1], ignore trailing periods in file names. That explains why
allowLinking="true" enables this vulnerability. As far as the OS APIs are
concerned, "/WEB-INF./web.xml" is the same as "/WEB-INF/web.xml" and setting
allowLinking="true" bypasses the additional checks Tomcat performs to ensure an
exact match between the requested path and the canonical path.

Just need confirmation from the OP that allowLinking="true" was being used and
this issue can be closed.

[1]
https://superuser.com/questions/585097/why-does-ntfs-disallow-the-use-of-trailing-periods-in-directory-names

-- 
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 61369] Tomcat 8.5.16 vulnerable to CVE-2016-0793

2017-08-02 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=61369

--- Comment #2 from Remy Maucherat  ---
The canonical path comparison is a last resort safety net. So it's still useful
then, that's interesting. If you confirm the behavior, it seems we're good as
is, the check is supposed to catch this and prevent trouble (but then a webapp
has to be fully packaged as per the specification).

-- 
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 61369] Tomcat 8.5.16 vulnerable to CVE-2016-0793

2017-08-02 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=61369

Svetlin Zarev  changed:

   What|Removed |Added

 CC||svetlin.za...@abv.bg

-- 
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 61369] Tomcat 8.5.16 vulnerable to CVE-2016-0793

2017-08-02 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=61369

Mark Thomas  changed:

   What|Removed |Added

 OS||All

--- Comment #1 from Mark Thomas  ---
As per http://tomcat.apache.org/security.html security vulnerabilities should
be reported privately to the Apache Tomcat Security Team - not via the public
bug tracker.

Reporting vulnerabilities publicly potentially exposes all Tomcat users to the
vulnerability until the vulnerability is patched.

Unfortunately, once information on a vulnerability is made public it can't be
made private.

Given the circumstances, we might as well make the best of this and use it as
an opportunity to give the Tomcat community an insight into how the Tomcat
security team addresses a security vulnerability and keep discussion on this
issue in the open. There is one caveat. If, during the investigation, we
uncover a separate but related security issue we will keep that information
private until that separate issue is resolved.

My initial reaction to this report is that - knowing how the WEB-INF check is
implemented - I'd be surprised if this was valid. The usual way the check is
bypassed on Windows is setting allowLinking=true (and setting that on Windows
is a configuration error). In this case I don't think that would allow the
behaviour seen here. Other possible causes are a poorly configured reverse
proxy or an unusual configuration of appBase and docBase

Next steps are to see if the report can be reproduced.

I don't have a Windows Server 2012 R2 install to hand so I have started the
process to set one up.

While the 2012 R2 ISO is downloading, I tested a clean build of the latest
8.5.x code running on Windows 7 and I do not see this behaviour. i.e.
http://localhost:8080/WEB-INF./web.xml returns a 404.

If I set allowLinking="true" I do see the behaviour described here. That is a
surprise. The good news is that that makes this a configuration error. There is
a very clear warning in the documentation that setting allowLinking="true" on
Windows or any platform with a case insensitive file system will create
security issues.

However, before resolving this issue as invalid we need to:
- confirm with the OP that they had set allowLinking="true"
- figure out why allowLinking="true" allows this particular bypass to occur

-- 
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: Opportunities for cohesion improvement and refatoring

2017-08-02 Thread Mark Thomas
On 02/08/2017 00:02, João Paulo Lemes Machado wrote:
> Hi Mark.
> 
> Did you take a look at my suggestion?

Yes. I don't think the cost is worth the benefit.

Mark


> 
> 2017-07-25 15:33 GMT-03:00 João Paulo Lemes Machado 
> :
> 
>> Hi Mark, tanks for the comment.
>>
>> Let me take the DataSourceProxy as example.
>>
>> This class has 142 methods  of which 112 are get () and set () methods.
>> We could mark these methods as deprecated and copy them to a new class:
>> DataSourceProxyConfig, but we would leave them in the DataSourceProxy class,
>> and they would be removed gradually.
>>
>> Those parameters and methods would be accessed by an instance variable of
>> DataSourceProxyConfig in DataSourceProxy.
>>
>> So we will keep the methods in the original class for some time so that
>> developers who have some assumption about the class can adapt.
>>
>> However, when choosing the methods we could analyze their complexity. If
>> it is a simple set () or get () that only sets or returns a value it would
>> be prioritized.
>>
>>
>>
>> Methods that have a greater complexity, or that make calls to other
>> methods would not be extracted at first.
>>
>>
>> And if for some reason we can not make these changes (remove the methods),
>> this strategy can be adopted to prevent these classes from growing even
>> more. It can also be adopted as a new practice for creating new classes in
>> the future.
>>
>>
>> What do you think?
>>
>>
>>
>>
>>
>> 2017-07-25 10:40 GMT-03:00 Mark Thomas :
>>
>>> On 25/07/17 13:55, João Paulo Lemes Machado wrote:
 Hello everyone.

 My name is João Paulo, I am a graduate student the Federal University of
 Uberlandia, Brazil.

 I was analyzing the modularization of some classes of Tomcat, and  I
 identified some opportunities for cohesion improvement in the following
 classes:

 DataSourceProxy
 ConnectionPool
 BasicDataSource
 DelegatingCallableStatement
 PoolProperties
 PoolConfiguration
>>>
>>> Those look to be from a mix of implementations (Commons DBCP and
>>> Tomcat's jdbc-pool).
>>>
>>> This is the place to discuss changes to Tomcat's jdbc-pool. DBCP changes
>>> should be discussed on the Apache Commons dev mailing list.
>>>
 Could you please take a look and tell me if it's viable?
>>>
>>> Hard to comment without a concrete example.
>>>
 Maybe some of these classes could benefit from some kind of refactoring
 that we can discuss.
>>>
>>> Maybe. What did you have in mind?
>>>
>>> Mark
>>>
>>> -
>>> 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