Re: [Git migration] Merge strategy

2018-01-23 Thread Rainer Jung

Am 23.01.2018 um 08:48 schrieb Rémy Maucherat:

On Mon, Jan 22, 2018 at 10:16 PM, Mark Thomas  wrote:


The plan when we migrate to git is to migrate to single git repo with
the following branches:

master - 9.0.x development
tc8.5  - 8.5.x development
tc8.0  - 8.0.x development
tc7.0  - 7.0.x development

We need to decide how we are going to handle a fix that applies to
multiple versions.

I can see two options:

1. Make the change in master and cherry-pick as required to earlier
versions. This is, essentially, what we do now in svn.

2. Make the change in the earliest applicable version and them merge
forward. This appears to be the more natural git way of doing things.



I've not seen 2 being done yet, to be honest.


I think the PHP project works that way.


These options are based on my fairly limited understanding of git.
Suggestions for other approaches welcome.

Thoughts? Comments?


I prefer option 1 as well, but can't judge on git-related pros and cons.

Regards,

Rainer


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



svn commit: r1821970 - /tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/SystemPropertyReplacerListener.java

2018-01-23 Thread markt
Author: markt
Date: Tue Jan 23 09:17:02 2018
New Revision: 1821970

URL: http://svn.apache.org/viewvc?rev=1821970=rev
Log:
Fix IDE Javadoc nag

Modified:

tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/SystemPropertyReplacerListener.java

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/SystemPropertyReplacerListener.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/SystemPropertyReplacerListener.java?rev=1821970=1821969=1821970=diff
==
--- 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/SystemPropertyReplacerListener.java
 (original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/SystemPropertyReplacerListener.java
 Tue Jan 23 09:17:02 2018
@@ -27,7 +27,7 @@ import org.apache.tomcat.util.digester.D
 
 /**
  * Helper class used to do property replacement on system properties.
- * @deprecated
+ * @deprecated No longer used. Will be removed in Tomcat 9.
  */
 @Deprecated
 public class SystemPropertyReplacerListener



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



Project Funding

2018-01-23 Thread Alexander Brice
   Hi Sir,   
 I appreciate having the chance to communicate with you via this medium.
 It will be my delight to promote our investment venture and values to you.
 I am Mr. Alexander Brice, Loan Manager of Ascon Investments Limited,
 a global financial company. We focus on helping Individuals and Corporate 
entities that intend to
 venture into viable projects to secure: Credit line, Project funding,
 Business Loans especially if genuine solid income and employment
 generating projects are there. 
We expect your response as quickly as possible with your project plan/
executive summary if you are interested in our services.   
  Sincerely,
 Alexander Brice  
 Alexander Brice   |  Loan Manager | Ascon Investment Limited |   T: 
+1.928.851.3433   |  F: 1.800.792.9439 | alexander.br...@asconinv.com |

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

2018-01-23 Thread markt
Author: markt
Date: Tue Jan 23 12:52:27 2018
New Revision: 1821996

URL: http://svn.apache.org/viewvc?rev=1821996=rev
Log:
Update Tomcat 9 docs to 9.0.4


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

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



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

2018-01-23 Thread markt
Author: markt
Date: Tue Jan 23 12:55:52 2018
New Revision: 1821997

URL: http://svn.apache.org/viewvc?rev=1821997=rev
Log:
Update site for 9.0.4 release

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

Modified: tomcat/site/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/build.properties.default?rev=1821997=1821996=1821997=diff
==
--- tomcat/site/trunk/build.properties.default (original)
+++ tomcat/site/trunk/build.properties.default Tue Jan 23 12:55:52 2018
@@ -39,7 +39,7 @@ tomcat.loc=http://www.apache.org/dist/to
 tomcat70=7.0.82
 tomcat80=8.0.48
 tomcat85=8.5.24
-tomcat90=9.0.2
+tomcat90=9.0.4
 
 # - Download destination -
 tomcat-site-docs.home=${base.path}/tomcat-site-docs/

Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=1821997=1821996=1821997=diff
==
--- tomcat/site/trunk/docs/doap_Tomcat.rdf (original)
+++ tomcat/site/trunk/docs/doap_Tomcat.rdf Tue Jan 23 12:55:52 2018
@@ -59,6 +59,13 @@
 
 
   
+Latest Stable 9.0.x Release
+2018-01-22
+9.0.4
+  
+
+
+  
 Latest Stable 8.5.x Release
 2017-10-01
 8.5.23
@@ -86,6 +93,14 @@
 
 
   
+Java Servlet 4.0
+JCP
+JSR 369
+http://www.jcp.org/en/jsr/detail?id=369"/>
+  
+
+
+  
 Java Servlet 3.1
 JCP
 JSR 340

Modified: tomcat/site/trunk/docs/download-90.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-90.html?rev=1821997=1821996=1821997=diff
==
--- tomcat/site/trunk/docs/download-90.html (original)
+++ tomcat/site/trunk/docs/download-90.html Tue Jan 23 12:55:52 2018
@@ -216,7 +216,7 @@
 Quick Navigation
 
 
-[define v]9.0.2[end]
+[define v]9.0.4[end]
 https://www.apache.org/dist/tomcat/tomcat-9/KEYS;>KEYS |
 [v] (beta) |
 Browse |

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1821997=1821996=1821997=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Tue Jan 23 12:55:52 2018
@@ -239,66 +239,59 @@ project logo are trademarks of the Apach
 
 
 
-
-2017-12-12 Tomcat 8.0.48 Released
+
+2018-01-22 Tomcat 9.0.4 Released
 
 
 
-The Apache Tomcat Project is proud to announce the release of version 8.0.48
-of Apache Tomcat. Apache Tomcat 8.0.48 includes fixes for issues identified in
-8.0.47 as well as other enhancements and changes. The notable changes
-compared to 8.0.47 include:
+The Apache Tomcat Project is proud to announce the release of version 9.0.4
+of Apache Tomcat. This is the first stable release of the 9.0.x series. The
+notable changes compared to 9.0.2 include:
 
 
 
-Java 9 is fully supported
+Modify the Default and WebDAV Servlets so that a 405 status code is 
returned
+for PUT and DELETE requests when disabled via the readonly initialisation
+parameter.
 
-Updated the packaged version of the Tomcat Native Library to 1.2.16 to pick
-up the latest Windows binaries built with APR 1.6.3 and OpenSSL 1.0.2m
+Add support for GZIP compression with HTTP/2
+
+Expand the TLS functionality exposed via the Manager application
+
+Return a simple, plain text error message if a client attempts to make a
+plain text HTTP connection to a TLS enabled NIO or NIO2 Connector.
 
 
 
 
 
 Full details of these changes, and all the other changes, are available in the
-Tomcat 8
+Tomcat 9
 changelog.
 
 
 
-
-Note: End of life date for Apache Tomcat 8.0.x is announced.
-Read more...
-
-
-
-
 
 
-https://tomcat.apache.org/download-80.cgi;>Download
+https://tomcat.apache.org/download-90.cgi;>Download
 
 
 
 
-
-2017-11-30 Tomcat 8.5.24 Released
+
+2017-12-12 Tomcat 8.0.48 Released
 
 
 
-The Apache Tomcat Project is proud to announce the release of version 8.5.24
-of Apache Tomcat. Apache Tomcat 8.5.x is intended to replace 8.0.x and includes
-new features pulled forward from Tomcat 9.0.x. The minimum Java version and
-implemented specification versions remain unchanged. The notable changes
-compared to 8.5.23 

[ANN] Apache Tomcat 9.0.4 available

2018-01-23 Thread Mark Thomas
The Apache Tomcat team announces the immediate availability of Apache
Tomcat 9.0.4. This is the first stable release of the 9.0.x series.

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

Apache Tomcat 9.0.4 is a bugfix and feature release. The notable changes
compared to
9.0.2 include:

- Modify the Default and WebDAV Servlets so that a 405 status code is
  returned for PUT and DELETE requests when disabled via the readonly
  initialisation parameter.

- Add support for GZIP compression with HTTP/2

- Expand the TLS functionality exposed via the Manager application

- Return a simple, plain text error message if a client attempts to make
  a plain text HTTP connection to a TLS enabled NIO or NIO2 Connector.


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

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

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

Enjoy!

- The Apache Tomcat team

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



Re: Project Funding

2018-01-23 Thread Mark Thomas
And today's winner of the "Spammer of the day" award is...

On 23/01/18 08:23, Alexander Brice wrote:



>  Alexander Brice  
>  Alexander Brice   |  Loan Manager | Ascon Investment Limited |   T: 
> +1.928.851.3433   |  F: 1.800.792.9439 | alexander.br...@asconinv.com |

Lucky Alexander is now the proud owner of a lifetime subscription to the
deny lists for all Apache Tomcat mailing lists

(i.e they have been blocking from posting to or receiving email from all
Apache Tomcat mailing lists.)

Mark

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



[Bug 62032] NPE caused by Connector and SSLHostConfig

2018-01-23 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62032

--- Comment #1 from Remy Maucherat  ---
Should we catch this sort of configuration as an error even in cases where it
would kind of work ? Like if there are SSL config bits on the Connector element
*and* one or more SSLHostConfig elements, then fail the connector ?
The user will then have to choose between the deprecated single SSL config or
the new one, and there's a lower error risk.

-- 
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: r1822001 - in /tomcat/trunk: java/org/apache/tomcat/util/net/AprEndpoint.java webapps/docs/changelog.xml

2018-01-23 Thread csutherl
Author: csutherl
Date: Tue Jan 23 13:15:09 2018
New Revision: 1822001

URL: http://svn.apache.org/viewvc?rev=1822001=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62023
Log error reporting multiple SSLHostConfig elements when using the APR 
Connector instead of crashing Tomcat.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1822001=1822000=1822001=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Tue Jan 23 
13:15:09 2018
@@ -625,12 +625,12 @@ public class AprEndpoint extends Abstrac
 @Override
 protected void releaseSSLContext(SSLHostConfig sslHostConfig) {
 Long ctx = sslHostConfig.getOpenSslContext();
-if (ctx != null) {
+if (ctx != null && ctx != 0) {
 SSLContext.free(ctx.longValue());
 sslHostConfig.setOpenSslContext(null);
 }
 Long cctx = sslHostConfig.getOpenSslConfContext();
-if (cctx != null) {
+if (cctx != null && cctx != 0) {
 SSLConf.free(cctx.longValue());
 sslHostConfig.setOpenSslConfContext(null);
 }

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1822001=1822000=1822001=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Jan 23 13:15:09 2018
@@ -53,6 +53,14 @@
   
 
   
+  
+
+  
+62023: Log error reporting multiple SSLHostConfig elements
+when using the APR Connector instead of crashing Tomcat. (csutherl)
+  
+
+  
 
 
   



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



svn commit: r1822002 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

2018-01-23 Thread kkolinko
Author: kkolinko
Date: Tue Jan 23 13:16:18 2018
New Revision: 1822002

URL: http://svn.apache.org/viewvc?rev=1822002=rev
Log:
Retroactively add changelog entry for r766526 (April 2009, adding support for a 
custom PropertySource).

It is included in 7.0.0, has never been ported to Tomcat 6.

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

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1822002=1822001=1822002=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Jan 23 13:16:18 2018
@@ -14265,7 +14265,7 @@
 
   
 A new JmxRemoteLifecycleListener that can be used to fix the ports used
-for remote JMX connections, eg when using JConsole. (markt)
+for remote JMX connections, e.g. when using JConsole. (markt)
   
 
   
@@ -14284,6 +14284,13 @@
   
 Parameterize version number throughout build scripts and source. 
(rjung)
   
+  
+766526 Add support for setting up an additional 
PropertySource
+that is used to lookup parameters referenced as ${..} in
+XML files parsed by Tomcat. It is configured via
+org.apache.tomcat.util.digester.PROPERTY_SOURCE
+system property. (fhanik)
+  
 
   
 



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



svn commit: r1822004 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/net/AprEndpoint.java webapps/docs/changelog.xml

2018-01-23 Thread csutherl
Author: csutherl
Date: Tue Jan 23 13:19:34 2018
New Revision: 1822004

URL: http://svn.apache.org/viewvc?rev=1822004=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62023
> Log error reporting multiple SSLHostConfig elements when using the APR 
> Connector instead of crashing Tomcat.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 23 13:19:34 2018
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/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,1739492,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,1744149,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,1747
 
404,1747506,1747536,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-1
 
756289,1756408-1756410,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-176205
 

[Tomcat Wiki] Update of "FAQ/Password" by KonstantinKolinko

2018-01-23 Thread Apache Wiki
Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change 
notification.

The "FAQ/Password" page has been changed by KonstantinKolinko:
https://wiki.apache.org/tomcat/FAQ/Password?action=diff=12=13

Comment:
Update entry about setting a custom PropertySource. Add link to "PicketLink 
Vault extension for Apache Tomcat" project.

   . Now, whenever you write {{{}}} in the text below, it will be 
replaced by the content of the file "resources.txt". The file path is relative 
to the conf directory.
   * Write your own datasource implementation which wraps your datasource and 
obscure your brains out ([[http://en.wikipedia.org/wiki/XOR_cipher|XOR]] and 
[[http://en.wikipedia.org/wiki/ROT13|ROT13]] are great candidates for this 
since their strength matches the protection you'll actually get). See the docs 
on how to do this.
   * Write your own {{{javax.naming.spi.ObjectFactory}}} implementation that 
creates and configures your datasource.
-  * (Tomcat 7) Write your own 
{{{org.apache.tomcat.util.IntrospectionUtils.PropertySource}}} implementation 
to 'decrypt' passwords that are 'encrypted' in catalina.properties and 
referenced via ${...} in server.xml. You will need to set the system property 
{{{org.apache.tomcat.util.digester.PROPERTY_SOURCE}}} to point to your 
!PropertySource implementation. 
+  * Write your own 
{{{org.apache.tomcat.util.IntrospectionUtils.PropertySource}}} implementation 
to 'decrypt' passwords that are 'encrypted' in catalina.properties and 
referenced via ${...} in server.xml. You will need to set the 
[[https://tomcat.apache.org/tomcat-8.5-doc/config/systemprops.html|system 
property]] {{{org.apache.tomcat.util.digester.PROPERTY_SOURCE}}} to point to 
your !PropertySource implementation.
+ * An example of a project that provides such custom !PropertySource: 
[[https://github.com/picketbox/tomcat-vault|PicketLink Vault extension for 
Apache Tomcat]].
  
  A cultural reference:
  

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



[Bug 62023] Tomcat crashes when SSLprotocol value is defined

2018-01-23 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62023

Coty Sutherland  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|REOPENED|RESOLVED

--- Comment #11 from Coty Sutherland  ---
Fixed in:
- trunk for 9.0.5 onwards
- 8.5.x for 8.5.28 onwards

Thanks for the report!

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



[Tomcat Wiki] Update of "AddOns" by KonstantinKolinko

2018-01-23 Thread Apache Wiki
Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change 
notification.

The "AddOns" page has been changed by KonstantinKolinko:
https://wiki.apache.org/tomcat/AddOns?action=diff=12=13

Comment:
Add link to "PicketLink Vault extension for Apache Tomcat" project.

  (Historically, the name is a tribute to Lambda Probe project, which they 
continued as a fork. The original Lambda Probe project (www.lambdaprobe.org) 
closed more than 10 years ago (2006) and is not applicable to current versions 
of Tomcat).
  
  
+ 
+ = Other =
+ 
+  * [[https://github.com/picketbox/tomcat-vault|PicketLink Vault extension for 
Apache Tomcat]] - Provides a custom `PropertySource` that can be used with 
Tomcat. See [[FAQ/Password]].
+ 
+ 
  [[CategoryFAQ]]
  

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



[Bug 62036] Roles stripped when using programmatic login() in tomcat 8.5 but not 8.0

2018-01-23 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62036

--- Comment #2 from Konstantin Kolinko  ---
Created attachment 35695
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=35695=edit
catalina_2018-01-23_log.txt - Cumulative log file, Tomcat 8.5.27

To enable logging I add the following lines to conf/logging.properties:

org.apache.catalina.authenticator.level=FINE
org.apache.catalina.realm.level=FINE

I am attaching an excerpt from catalina.2018-01-23.log and access log when
running on Tomcat 8.5.27.

-- 
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 62036] Roles stripped when using programmatic login() in tomcat 8.5 but not 8.0

2018-01-23 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62036

--- Comment #5 from Konstantin Kolinko  ---
(In reply to Konstantin Kolinko from comment #3)
> 2). It is also odd that RealmBase.hasRole() check for a MemoryUser fails.

Debugging Tomcat 9:

The following methods in RealmBase are called:
(the actual object is LockOutRealm)

1. hasResourcePermission(request, response, SecurityConstraint []constraints,
context)
2. hasRole((Wrapper) null, principal, (String) "testrole")
3. hasRoleInternal(principal, (String) "testrole")

On successful call the 'principal' is GenericPrincipal.

On unsuccessful call the 'principal' is MemoryUser and
RealmBase.hasRoleInternal() fails because of the following lines:

[[[
 // Should be overridden in JAASRealm - to avoid pretty inefficient conversions
 if (!(principal instanceof GenericPrincipal)) {
return false;
 }
]]]

-- 
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 62036] Roles stripped when using programmatic login() in tomcat 8.5 but not 8.0

2018-01-23 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62036

--- Comment #1 from Konstantin Kolinko  ---
Created attachment 35694
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=35694=edit
test.war

Test application.

It differs from original:
I corrected the values of xmlns and xsi:schemaLocation attributes on the root
 element to have the correct values for a Servlet 3.1 application.

(I usually run with org.apache.catalina.STRICT_SERVLET_COMPLIANCE=true which
enables validation of web.xml, thus those typos became noticable).

-- 
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 62036] Roles stripped when using programmatic login() in tomcat 8.5 but not 8.0

2018-01-23 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62036

Konstantin Kolinko  changed:

   What|Removed |Added

 OS||All

--- Comment #3 from Konstantin Kolinko  ---
(In reply to Konstantin Kolinko from comment #2)
> Created attachment 35695

The first /test/authtest call at 19:25:27.037 has the following lines:

[[[
- AuthenticatorBase.invoke We have cached auth type NONE for principal
GenericPrincipal[testuser(testrole,)]

- RealmBase.hasResourcePermission   Checking roles
GenericPrincipal[testuser(testrole,)]
- RealmBase.hasRole Username [testuser] has role [testrole]
]]]

The second /test/authtest call at 19:25:35.225 has the following lines:
[[[
- AuthenticatorBase.invoke We have cached auth type NONE for principal User
username="testuser", roles="testrole"

- RealmBase.hasResourcePermission   Checking roles User username="testuser",
roles="testrole"
- RealmBase.hasRole Username [testuser] does NOT have role [testrole]
]]]

Note the following:
1). The principal differs.

The first call operates on a GenericPrincipal.
The second call operates on a MemoryUser.

2). It is also odd that RealmBase.hasRole() check for a MemoryUser fails.

-- 
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 62036] New: Roles stripped when using programmatic login() in tomcat 8.5 but not 8.0

2018-01-23 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62036

Bug ID: 62036
   Summary: Roles stripped when using programmatic login() in
tomcat 8.5 but not 8.0
   Product: Tomcat 8
   Version: 8.5.27
  Hardware: PC
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: knst.koli...@gmail.com
  Target Milestone: 

Filing a Bugzilla entry for an issue reported by Robert J. Carr on the users@
list. See
http://markmail.org/message/rfm2qejzgcd2uwmh

I can confirm that the issue is reproducible in the current Tomcat 8.5 and 9.0.

Steps to reproduce:

[quote]
To reproduce the problem in tomcat 8.5.24 (for me):

 1)  make a user available with the role "testrole" (I just user
tomcat-users)

 2) startup tomcat, copy the war file into webapps

 3) go to the application homepage, index.jsp should auto load

 4) enter username and password and login; it should change to the username
you're authenticated with

 5) hit the auth test link and it should give you a success message

 6) hit the same link again and it should give you a 403

If you want to see how things are changing, I created an unprotected page
called /authinfo (no jsp) that shows the logged in user and role.  Here's
what it shows as you proceed through the test:

 * no user or role
 * user and role
 * user, but no role

If you do this same process in tomcat 8 (8.0.43, for me) it works fine,
particularly, the you can hit the link as many times as you want and the
roles never go away until you logout.  And generally, the login/test/logout
works perfectly, where in 8.5 even if you logout it doesn't always log you
back in the next time either.  Sometimes its takes several attempts.
[/quote]

-- 
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 62036] Roles stripped when using programmatic login() in tomcat 8.5 but not 8.0

2018-01-23 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62036

--- Comment #4 from Konstantin Kolinko  ---
(In reply to Konstantin Kolinko from comment #3)
> Note the following:
> 1). The principal differs.
> 
> The first call operates on a GenericPrincipal.
> The second call operates on a MemoryUser.

Debugging current Tomcat 9, the change of the cached principal occurs in
NonLoginAuthenticator.doAuthenticate(), with the following call stack:

[[[
at StandardSession.setPrincipal(Principal) - StandardSession:614
at NonLoginAuthenticator.doAuthenticate(Request, HttpServletResponse) -
NonLoginAuthenticator:86
at NonLoginAuthenticator.invoke(Request, Response) - AuthenticatorBase:584
at StandardHostValve.invoke(Request, Response) - StandardHostValve:140  
]]]

-- 
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: r1822053 - in /tomcat/site/trunk: ./ docs/ docs/tomcat-8.5-doc/ docs/tomcat-8.5-doc/api/ docs/tomcat-8.5-doc/api/org/apache/catalina/ docs/tomcat-8.5-doc/api/org/apache/catalina/ant/ docs/

2018-01-23 Thread markt
Author: markt
Date: Tue Jan 23 20:52:19 2018
New Revision: 1822053

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


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

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



svn commit: r24397 - /release/tomcat/tomcat-8/v8.5.24/

2018-01-23 Thread markt
Author: markt
Date: Tue Jan 23 20:56:46 2018
New Revision: 24397

Log:
Drop 8.5.24 from mirrors

Removed:
release/tomcat/tomcat-8/v8.5.24/


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



svn commit: r24396 - /release/tomcat/tomcat-9/v9.0.2/

2018-01-23 Thread markt
Author: markt
Date: Tue Jan 23 20:17:00 2018
New Revision: 24396

Log:
Drop 9.0.2 from mirrors

Removed:
release/tomcat/tomcat-9/v9.0.2/


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



svn commit: r1822057 - in /tomcat/site/trunk: docs/oldnews.html xdocs/oldnews.xml

2018-01-23 Thread markt
Author: markt
Date: Tue Jan 23 20:55:16 2018
New Revision: 1822057

URL: http://svn.apache.org/viewvc?rev=1822057=rev
Log:
Update old news

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

Modified: tomcat/site/trunk/docs/oldnews.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews.html?rev=1822057=1822056=1822057=diff
==
--- tomcat/site/trunk/docs/oldnews.html (original)
+++ tomcat/site/trunk/docs/oldnews.html Tue Jan 23 20:55:16 2018
@@ -245,6 +245,45 @@
 
 
 
+
+2017-11-30 Tomcat 8.5.24 Released
+
+
+
+The Apache Tomcat Project is proud to announce the release of version 8.5.24
+of Apache Tomcat. Apache Tomcat 8.5.x is intended to replace 8.0.x and includes
+new features pulled forward from Tomcat 9.0.x. The minimum Java version and
+implemented specification versions remain unchanged. The notable changes
+compared to 8.5.23 include:
+
+
+
+Java 9 is fully supported
+
+Fixed a number of HTTP/2 issues
+
+Fixed numerous JASPIC issues with patches from Lazar
+
+Updated the packaged version of the Tomcat Native Library to 1.2.16 to pick
+up the latest Windows binaries built with APR 1.6.3 and OpenSSL 1.0.2m
+
+
+
+
+
+Full details of these changes, and all the other changes, are available in the
+Tomcat 8.5
+changelog.
+
+
+
+
+
+https://tomcat.apache.org/download-80.cgi;>Download
+
+
+
+
 
 2017-11-30 Tomcat 9.0.2 (beta) Released
 

Modified: tomcat/site/trunk/xdocs/oldnews.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/oldnews.xml?rev=1822057=1822056=1822057=diff
==
--- tomcat/site/trunk/xdocs/oldnews.xml (original)
+++ tomcat/site/trunk/xdocs/oldnews.xml Tue Jan 23 20:55:16 2018
@@ -22,6 +22,32 @@
 
 
 
+
+
+The Apache Tomcat Project is proud to announce the release of version 8.5.24
+of Apache Tomcat. Apache Tomcat 8.5.x is intended to replace 8.0.x and includes
+new features pulled forward from Tomcat 9.0.x. The minimum Java version and
+implemented specification versions remain unchanged. The notable changes
+compared to 8.5.23 include:
+
+Java 9 is fully supported
+Fixed a number of HTTP/2 issues
+Fixed numerous JASPIC issues with patches from Lazar
+Updated the packaged version of the Tomcat Native Library to 1.2.16 to pick
+up the latest Windows binaries built with APR 1.6.3 and OpenSSL 1.0.2m
+
+
+
+Full details of these changes, and all the other changes, are available in the
+Tomcat 8.5
+changelog.
+
+
+
+Download
+
+
+
 
 
 The Apache Tomcat Project is proud to announce the release of version 9.0.2



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



[ANN] Apache Tomcat 8.5.27 available

2018-01-23 Thread Mark Thomas
The Apache Tomcat team announces the immediate availability of Apache
Tomcat 8.5.27.

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

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

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


- Add support for GZIP compression with HTTP/2

- Expand the TLS functionality exposed via the Manager application

- Return a simple, plain text error message if a client attempts to make
  a plain text HTTP connection to a TLS enabled NIO or NIO2 Connector.

- Add a new system property
  (org.apache.jasper.runtime.BodyContentImpl.BUFFER_SIZE) to control the
  size of the buffer used by Jasper when buffering tag bodies.


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

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

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

Enjoy!

- The Apache Tomcat team


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



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

2018-01-23 Thread markt
Author: markt
Date: Tue Jan 23 20:53:25 2018
New Revision: 1822054

URL: http://svn.apache.org/viewvc?rev=1822054=rev
Log:
Missed version update

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

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1822054=1822053=1822054=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Tue Jan 23 20:53:25 2018
@@ -239,8 +239,8 @@ project logo are trademarks of the Apach
 
 
 
-
-2018-01-22 Tomcat 8.5.24 Released
+
+2018-01-22 Tomcat 8.5.27 Released
 
 
 

Modified: tomcat/site/trunk/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/index.xml?rev=1822054=1822053=1822054=diff
==
--- tomcat/site/trunk/xdocs/index.xml (original)
+++ tomcat/site/trunk/xdocs/index.xml Tue Jan 23 20:53:25 2018
@@ -39,7 +39,7 @@ project logo are trademarks of the Apach
 
 
 
-
+
 
 The Apache Tomcat Project is proud to announce the release of version 8.5.27
 of Apache Tomcat. Apache Tomcat 8.5.x is intended to replace 8.0.x and includes



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



svn commit: r1822016 - /tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java

2018-01-23 Thread kkolinko
Author: kkolinko
Date: Tue Jan 23 15:37:00 2018
New Revision: 1822016

URL: http://svn.apache.org/viewvc?rev=1822016=rev
Log:
For BZ 62023, followup to r1822004 - Use explicit unboxing.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1822016=1822015=1822016=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Tue Jan 23 
15:37:00 2018
@@ -625,12 +625,12 @@ public class AprEndpoint extends Abstrac
 @Override
 protected void releaseSSLContext(SSLHostConfig sslHostConfig) {
 Long ctx = sslHostConfig.getOpenSslContext();
-if (ctx != null && ctx != 0) {
+if (ctx != null && ctx.longValue() != 0L) {
 SSLContext.free(ctx.longValue());
 sslHostConfig.setOpenSslContext(null);
 }
 Long cctx = sslHostConfig.getOpenSslConfContext();
-if (cctx != null && cctx != 0) {
+if (cctx != null && cctx.longValue() != 0L) {
 SSLConf.free(cctx.longValue());
 sslHostConfig.setOpenSslConfContext(null);
 }



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



buildbot failure in on tomcat-trunk

2018-01-23 Thread buildbot
The Buildbot has detected a new failure on builder tomcat-trunk while building 
. Full details are available at:
https://ci.apache.org/builders/tomcat-trunk/builds/2984

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

Buildslave for this Build: silvanus_ubuntu

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

BUILD FAILED: failed shell_9

Sincerely,
 -The Buildbot




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



[Bug 62032] NPE caused by Connector and SSLHostConfig

2018-01-23 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=62032

--- Comment #2 from Coty Sutherland  ---
(In reply to Remy Maucherat from comment #1)
> Should we catch this sort of configuration as an error even in cases where
> it would kind of work ? Like if there are SSL config bits on the Connector
> element *and* one or more SSLHostConfig elements, then fail the connector ?

If I understand you correctly, that does happen now in cases that they're both
named _default_. I think the problem is that we're defaulting to an empty PEM
file with the auto-generated default SSLHostConfig instead of throwing an
error. The logic in JSSEUtil is interesting, we're checking for a keystore and
if it's null we default to a PEMFile without verifying it exists. Is there some
reason for doing that instead of throwing an exception? I don't think an SSL
Connector with no keystore or key/cert pair is usable :)

-- 
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: r1822017 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/net/AprEndpoint.java

2018-01-23 Thread kkolinko
Author: kkolinko
Date: Tue Jan 23 15:39:04 2018
New Revision: 1822017

URL: http://svn.apache.org/viewvc?rev=1822017=rev
Log:
For BZ 62023, followup to r1822004 - Use explicit unboxing.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 23 15:39:04 2018
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/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,1739492,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,1744149,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,1747
 
404,1747506,1747536,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-1
 
756289,1756408-1756410,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-176205