buildbot success in on tomcat-trunk

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

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] 1839543
Blamelist: kfujino

Build succeeded!

Sincerely,
 -The Buildbot




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

svn commit: r1839575 - /tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java

2018-08-29 Thread markt 
Author: markt
Date: Wed Aug 29 13:06:30 2018
New Revision: 1839575

URL: http://svn.apache.org/viewvc?rev=1839575&view=rev
Log:
Ensure thread-local mapping data is always recycled

Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1839575&r1=1839574&r2=1839575&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Wed Aug 
29 13:06:30 2018
@@ -460,47 +460,52 @@ public class ApplicationContext implemen
 // Use the thread local mapping data
 MappingData mappingData = dd.mappingData;
 
-// Map the URI
-CharChunk uriCC = uriMB.getCharChunk();
 try {
-uriCC.append(context.getPath(), 0, context.getPath().length());
-/*
- * Ignore any trailing path params (separated by ';') for mapping
- * purposes
- */
-int semicolon = normalizedPath.indexOf(';');
-if (pos >= 0 && semicolon > pos) {
-semicolon = -1;
-}
-uriCC.append(normalizedPath, 0, semicolon > 0 ? semicolon : pos);
-service.getMapper().map(context, uriMB, mappingData);
-if (mappingData.wrapper == null) {
+// Map the URI
+CharChunk uriCC = uriMB.getCharChunk();
+try {
+uriCC.append(context.getPath(), 0, context.getPath().length());
+/*
+ * Ignore any trailing path params (separated by ';') for 
mapping
+ * purposes
+ */
+int semicolon = normalizedPath.indexOf(';');
+if (pos >= 0 && semicolon > pos) {
+semicolon = -1;
+}
+uriCC.append(normalizedPath, 0, semicolon > 0 ? semicolon : 
pos);
+service.getMapper().map(context, uriMB, mappingData);
+if (mappingData.wrapper == null) {
+return null;
+}
+/*
+ * Append any trailing path params (separated by ';') that were
+ * ignored for mapping purposes, so that they're reflected in 
the
+ * RequestDispatcher's requestURI
+ */
+if (semicolon > 0) {
+uriCC.append(normalizedPath, semicolon, pos - semicolon);
+}
+} catch (Exception e) {
+// Should never happen
+log(sm.getString("applicationContext.mapping.error"), e);
 return null;
 }
-/*
- * Append any trailing path params (separated by ';') that were
- * ignored for mapping purposes, so that they're reflected in the
- * RequestDispatcher's requestURI
- */
-if (semicolon > 0) {
-uriCC.append(normalizedPath, semicolon, pos - semicolon);
-}
-} catch (Exception e) {
-// Should never happen
-log(sm.getString("applicationContext.mapping.error"), e);
-return null;
-}
 
-Wrapper wrapper = mappingData.wrapper;
-String wrapperPath = mappingData.wrapperPath.toString();
-String pathInfo = mappingData.pathInfo.toString();
-HttpServletMapping mapping = new 
ApplicationMapping(mappingData).getHttpServletMapping();
-
-mappingData.recycle();
-
-// Construct a RequestDispatcher to process this request
-return new ApplicationDispatcher(wrapper, uri, wrapperPath, pathInfo,
-queryString, mapping, null);
+Wrapper wrapper = mappingData.wrapper;
+String wrapperPath = mappingData.wrapperPath.toString();
+String pathInfo = mappingData.pathInfo.toString();
+HttpServletMapping mapping = new 
ApplicationMapping(mappingData).getHttpServletMapping();
+
+// Construct a RequestDispatcher to process this request
+return new ApplicationDispatcher(wrapper, uri, wrapperPath, 
pathInfo,
+queryString, mapping, null);
+} finally {
+// Recycle thread local data at the end of the request so 
references
+// are not held to a completed request as there is potential for
+// that to trigger a memory leak if a context is unloaded.
+mappingData.recycle();
+}
 }
 
 



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

Re: svn commit: r1839575 - /tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java

2018-08-29 Thread Mark Thomas 
On 29/08/18 14:06, ma...@apache.org wrote:
> Author: markt
> Date: Wed Aug 29 13:06:30 2018
> New Revision: 1839575
> 
> URL: http://svn.apache.org/viewvc?rev=1839575&view=rev
> Log:
> Ensure thread-local mapping data is always recycled

FYI, I've been digging into the RequestDispatcher processing and I have
a couple of edge cases that aren't handled correctly. I'm working my way
through an expansion of the unit tests and I'll be committing fixes as I go.

Mark

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

svn commit: r1839604 - in /tomcat/trunk: java/org/apache/catalina/connector/ java/org/apache/catalina/core/ test/org/apache/catalina/core/ webapps/docs/

2018-08-29 Thread markt 
Author: markt
Date: Wed Aug 29 19:29:46 2018
New Revision: 1839604

URL: http://svn.apache.org/viewvc?rev=1839604&view=rev
Log:
Improve the handling of path parameters when working with RequestDispatcher 
objects.

Added:

tomcat/trunk/test/org/apache/catalina/core/TestApplicationContextGetRequestDispatcherB.java
   (with props)

tomcat/trunk/test/org/apache/catalina/core/TestApplicationContextStripPathParams.java
   (with props)
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1839604&r1=1839603&r2=1839604&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Wed Aug 29 
19:29:46 2018
@@ -1360,6 +1360,25 @@ public class Request implements HttpServ
 return context.getServletContext().getRequestDispatcher(path);
 }
 
+/*
+ * Relative to what, exactly?
+ *
+ * From the Servlet 4.0 Javadoc:
+ * - The pathname specified may be relative, although it cannot extend
+ *   outside the current servlet context.
+ * - If it is relative, it must be relative against the current servlet
+ *
+ * From Section 9.1 of the spec:
+ * - The servlet container uses information in the request object to
+ *   transform the given relative path against the current servlet to a
+ *   complete path.
+ *
+ * It is undefined whether the requestURI is used or whether 
servletPath
+ * and pathInfo are used. Given that the RequestURI includes the
+ * contextPath (and extracting that is messy) , using the servletPath 
and
+ * pathInfo looks to be the more reasonable choice.
+ */
+
 // Convert a request-relative path to a context-relative one
 String servletPath = (String) getAttribute(
 RequestDispatcher.INCLUDE_SERVLET_PATH);

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1839604&r1=1839603&r2=1839604&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Wed Aug 
29 19:29:46 2018
@@ -403,9 +403,8 @@ public class ApplicationContext implemen
 sm.getString("applicationContext.requestDispatcher.iae", 
path));
 }
 
-// Need to separate the query string and the uri. This is required for
-// the ApplicationDispatcher constructor. Mapping also requires the uri
-// without the query string.
+// Same processing order as InputBuffer / CoyoteAdapter
+// First remove query string
 String uri;
 String queryString;
 int pos = path.indexOf('?');
@@ -417,18 +416,24 @@ public class ApplicationContext implemen
 queryString = null;
 }
 
-String normalizedPath = RequestUtil.normalize(uri);
-if (normalizedPath == null) {
+// Remove path parameters
+String uriNoParams = stripPathParams(uri);
+
+// Then normalize
+String normalizedUri = RequestUtil.normalize(uriNoParams);
+if (normalizedUri == null) {
 return null;
 }
 
+// Mapping is against the normalized uri
+
 if (getContext().getDispatchersUseEncodedPaths()) {
 // Decode
-String decodedPath = UDecoder.URLDecode(normalizedPath);
+String decodedUri = UDecoder.URLDecode(normalizedUri);
 
 // Security check to catch attempts to encode /../ sequences
-normalizedPath = RequestUtil.normalize(decodedPath);
-if (!decodedPath.equals(normalizedPath)) {
+normalizedUri = RequestUtil.normalize(decodedUri);
+if (!decodedUri.equals(normalizedUri)) {
 getContext().getLogger().warn(
 sm.getString("applicationContext.illegalDispatchPath", 
path),
 new IllegalArgumentException());
@@ -445,7 +450,7 @@ public class ApplicationContext implemen
 uri = URLEncoder.DEFAULT.encode(getContextPath() + uri, 
StandardCharsets.UTF_8);
 }
 
-pos = normalizedPath.length();
+pos = normalizedUri.length();
 
 // Use the thread local URI and mapping data
 DispatchData dd = dispatchData.get();
@@ -464,28 +469,12 @@ public class ApplicationCo

svn commit: r1839609 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ test/org/apache/catalina/core/ webapps/docs/

2018-08-29 Thread markt 
Author: markt
Date: Wed Aug 29 19:47:18 2018
New Revision: 1839609

URL: http://svn.apache.org/viewvc?rev=1839609&view=rev
Log:
Improve the handling of path parameters when working with RequestDispatcher 
objects.

Added:

tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationContextGetRequestDispatcherB.java
  - copied, changed from r1839604, 
tomcat/trunk/test/org/apache/catalina/core/TestApplicationContextGetRequestDispatcherB.java

tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationContextStripPathParams.java
  - copied unchanged from r1839604, 
tomcat/trunk/test/org/apache/catalina/core/TestApplicationContextStripPathParams.java
Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Request.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 29 19:47:18 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

svn commit: r1839610 [2/2] - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ test/org/apache/catalina/core/ webapps/docs/

2018-08-29 Thread markt 
Copied: 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestApplicationContextGetRequestDispatcherB.java
 (from r1839609, 
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationContextGetRequestDispatcherB.java)
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestApplicationContextGetRequestDispatcherB.java?p2=tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestApplicationContextGetRequestDispatcherB.java&p1=tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationContextGetRequestDispatcherB.java&r1=1839609&r2=1839610&rev=1839610&view=diff
==
--- 
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationContextGetRequestDispatcherB.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestApplicationContextGetRequestDispatcherB.java
 Wed Aug 29 19:59:31 2018
@@ -38,8 +38,6 @@ import org.junit.runners.Parameterized.P
 
 import org.apache.catalina.Context;
 import org.apache.catalina.Wrapper;
-import org.apache.catalina.servlet4preview.http.MappingMatch;
-import org.apache.catalina.servlet4preview.http.ServletMapping;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.startup.TomcatBaseTest;
 import org.apache.tomcat.util.buf.ByteChunk;
@@ -50,149 +48,103 @@ public class TestApplicationContextGetRe
 @Parameters(name = "{index}: startMapping[{0}], startUri[{1}], 
dispatcherType[{2}], " +
 "targetMapping[{3}], targetUri[{4}], useEncodedDispatchPaths[{5}], 
" +
 "expectedRequestURI[{6}], expectedContextPath[{7}], 
expectedServletPath[{8}], " +
-"expectedPathInfo[{9}], expectedQueryString[{10}], 
expectedMappingMatch[{11}, " +
-"expectedMappingPattern[{12}], expectedMappingMatchValue[{13}], " +
-"expectedMappingServletName[{14}], " +
-"expectedDispatcherRequestURI[{15}], 
expectedDispatcherContextPath[{16}], " +
-"expectedDispatcherServletPath[{17}], 
expectedDispatcherPathInfo[{18}], " +
-"expectedDispatcherQueryString[{19}], 
expectedDispatcherMappingMatch[{20}]," +
-"expectedDispatcherMappingPattern[{21}], 
expectedDispatcherMappingMatchValue[{22}]," +
-"expectedDispatcherMappingServletName[{23}]," +
-"expectedBody")
+"expectedPathInfo[{9}], expectedQueryString[{10}], " +
+"expectedDispatcherRequestURI[{11}], 
expectedDispatcherContextPath[{12}], " +
+"expectedDispatcherServletPath[{13}], 
expectedDispatcherPathInfo[{14}], " +
+"expectedDispatcherQueryString[{15}], " +
+"expectedBody[{16}]")
 public static Collection data() {
 return Arrays.asList(new Object[][]{
 // Simple dispatch for each type
 { "/start", "/start", DispatcherType.INCLUDE, "/target", 
"/target", Boolean.TRUE,
 "/test/start", "/test", "/start", null, null,
-MappingMatch.EXACT, "/start", "start", "rd",
 "/test/target", "/test", "/target", null, null,
-MappingMatch.EXACT, "/target", "target", "target",
 "OK"},
 { "/start", "/start", DispatcherType.FORWARD, "/target", 
"/target", Boolean.TRUE,
 "/test/target", "/test", "/target", null, null,
-MappingMatch.EXACT, "/target", "target", "target",
 "/test/start", "/test", "/start", null, null,
-MappingMatch.EXACT, "/start", "start", "rd",
 "OK"},
 { "/start", "/start", DispatcherType.ASYNC, "/target", "/target", 
Boolean.TRUE,
 "/test/target", "/test", "/target", null, null,
-MappingMatch.EXACT, "/target", "target", "target",
 "/test/start", "/test", "/start", null, null,
-MappingMatch.EXACT, "/start", "start", "rd",
 "OK"},
 // Simple dispatch with query strings
 { "/start", "/start?abcde=fghij", DispatcherType.INCLUDE, 
"/target", "/target?zyxwv=utsrq", Boolean.TRUE,
 "/test/start", "/test", "/start", null, "abcde=fghij",
-MappingMatch.EXACT, "/start", "start", "rd",
 "/test/target", "/test", "/target", null, "zyxwv=utsrq",
-MappingMatch.EXACT, "/target", "target", "target",
 "OK"},
 { "/start", "/start?abcde=fghij", DispatcherType.FORWARD, 
"/target", "/target?zyxwv=utsrq", Boolean.TRUE,
 "/test/target", "/test", "/target", null, "zyxwv=utsrq",
-MappingMatch.EXACT, "/target", "target", "target",
 "/test/start", "/test", "/start", null, "abcde=fghij",
-MappingMatch.EXACT, "/start", "start", "rd",
 "OK"},
 { "/start", "/

svn commit: r1839610 [1/2] - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ test/org/apache/catalina/core/ webapps/docs/

2018-08-29 Thread markt 
Author: markt
Date: Wed Aug 29 19:59:31 2018
New Revision: 1839610

URL: http://svn.apache.org/viewvc?rev=1839610&view=rev
Log:
Improve the handling of path parameters when working with RequestDispatcher 
objects.

Added:

tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestApplicationContextGetRequestDispatcherB.java
  - copied, changed from r1839609, 
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationContextGetRequestDispatcherB.java

tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestApplicationContextStripPathParams.java
  - copied unchanged from r1839609, 
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationContextStripPathParams.java
Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 29 19:59:31 2018
@@ -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
 
725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,17856