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

[Bill Barker]

To whom it may engage...

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

Project tomcat-trunk-validate has an issue affecting its community integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-trunk-validate :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-validate/index.html

That said, some information snippets are provided here.

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



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-validate/gump_work/build_tomcat-trunk_tomcat-trunk-validate.html
Work Name: build_tomcat-trunk_tomcat-trunk-validate (Type: Build)
Work ended in a state of : Failed
Elapsed: 37 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true 
org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs 
-Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-8.13-SNAPSHOT.jar
 -Dexecute.validate=true validate 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/checkstyle/target/checkstyle-8.13-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/commons-beanutils/dist/commons-beanutils-20180825.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/commons-cli/target/commons-cli-1.5-SNAPSHOT.jar:/srv/gump/public/workspace/commons-lang-trunk/target/commons-lang3-3.9-SNAPSHOT.jar:/srv/gump/pu
 
blic/workspace/apache-commons/logging/target/commons-logging-20180825.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20180825.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-HEAD-jre-SNAPSHOT.jar
-
Buildfile: /srv/gump/public/workspace/tomcat-trunk/build.xml

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

compile-prepare:

download-validate:

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

setproxy:

downloadfile:

validate:
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/res/checkstyle
[checkstyle] Running Checkstyle 8.13-SNAPSHOT on 3309 files
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-trunk/webapps/docs/introduction.xml:84: Line 
matches the illegal pattern '\s+$'. [RegexpSingleline]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-trunk/webapps/docs/introduction.xml:94: Line 
matches the illegal pattern '\s+$'. [RegexpSingleline]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-trunk/webapps/docs/introduction.xml:102: Line 
matches the illegal pattern '\s+$'. [RegexpSingleline]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-trunk/webapps/docs/introduction.xml:109: Line 
matches the illegal pattern '\s+$'. [RegexpSingleline]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-trunk/webapps/docs/introduction.xml:115: Line 
matches the illegal pattern '\s+$'. [RegexpSingleline]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-trunk/webapps/docs/introduction.xml:131: Line 
matches the illegal pattern '\s+$'. [RegexpSingleline]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-trunk/webapps/docs/introduction.xml:133: Line 
matches the illegal pattern '\s+$'. [RegexpSingleline]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-trunk/webapps/docs/introduction.xml:136: Line 
matches the illegal pattern '\s+$'. [RegexpSingleline]
[checkstyle] [ERROR] 
/srv/gump/public/workspace/tomcat-trunk/webapps/docs/introduction.xml:143: Line 
matches the illegal pattern '\s+$'. [RegexpSingleline]

[Bug 62633] WsSession leaks if cache Session are used for group sending

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 OS||All
 Resolution|--- |INVALID

--- Comment #1 from Mark Thomas  ---
The provided sample application does not demonstrate a memory leak in Apache
Tomcat. WsSession objects are retained while the session is open and released
once the session is closed.

The provided sample application does contain several memory leaks due to the
failure to stop threads.

-- 
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: r1838947 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/ webapps/docs/config/

[markt]

Author: markt
Date: Fri Aug 24 19:53:47 2018
New Revision: 1838947

URL: http://svn.apache.org/viewvc?rev=1838947=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62652
Make it clearer that it is DBCP 1 that is packaged with Tomcat 7.

Modified:
tomcat/tc7.0.x/trunk/BUILDING.txt
tomcat/tc7.0.x/trunk/RELEASE-NOTES
tomcat/tc7.0.x/trunk/build.properties.default
tomcat/tc7.0.x/trunk/build.xml
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/class-loader-howto.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/globalresources.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/systemprops.xml
tomcat/tc7.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml
tomcat/tc7.0.x/trunk/webapps/docs/jndi-resources-howto.xml

Modified: tomcat/tc7.0.x/trunk/BUILDING.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/BUILDING.txt?rev=1838947=1838946=1838947=diff
==
--- tomcat/tc7.0.x/trunk/BUILDING.txt (original)
+++ tomcat/tc7.0.x/trunk/BUILDING.txt Fri Aug 24 19:53:47 2018
@@ -44,7 +44,7 @@ source distribution, do the following:
 Note regarding later versions of Java:
 
   As documented elsewhere, one of the components in Apache Tomcat includes
-  a private copy of the Apache Commons DBCP library. The source code
+  a private copy of the Apache Commons DBCP 1.x library. The source code
   for this library is downloaded, processed by the build script
   (renaming the packages) and compiled.
 
@@ -54,7 +54,7 @@ source distribution, do the following:
   implementing this version of specification. Therefore, the build Tomcat
   build process must be executed with a Java 6 JDK.
 
-  See Apache Commons DBCP project web site for more details on
+  See Apache Commons DBCP 1.x project web site for more details on
   available versions of the library and its requirements,
 
 https://commons.apache.org/dbcp/

Modified: tomcat/tc7.0.x/trunk/RELEASE-NOTES
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/RELEASE-NOTES?rev=1838947=1838946=1838947=diff
==
--- tomcat/tc7.0.x/trunk/RELEASE-NOTES (original)
+++ tomcat/tc7.0.x/trunk/RELEASE-NOTES Fri Aug 24 19:53:47 2018
@@ -112,7 +112,7 @@ for use by web applications (by placing
 * tomcat7-websocket.jar (WebSocket 1.1 implementation)
 * tomcat-api.jar (Interfaces shared by Catalina and Jasper)
 * tomcat-coyote.jar (Tomcat connectors and utility classes)
-* tomcat-dbcp.jar (package renamed database connection pool based on Commons 
DBCP)
+* tomcat-dbcp.jar (package renamed database connection pool based on Commons 
DBCP 1.x)
 * tomcat-jdbc.jar (Tomcat's database connection pooling solution)
 * tomcat-util.jar (Various utilities)
 * websocket-api.jar (WebSocket 1.1 API)

Modified: tomcat/tc7.0.x/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.properties.default?rev=1838947=1838946=1838947=diff
==
--- tomcat/tc7.0.x/trunk/build.properties.default (original)
+++ tomcat/tc7.0.x/trunk/build.properties.default Fri Aug 24 19:53:47 2018
@@ -180,7 +180,7 @@ tomcat-native.loc.2=${base-tomcat.loc.2}
 
tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-win32-bin.zip
 
tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-win32-bin.zip
 
-# - Commons DBCP, version 1.1 or later -
+# - Commons DBCP 1.x, version 1.1 or later -
 commons-dbcp.version=1.4
 commons-dbcp-src.checksum.enabled=true
 commons-dbcp-src.checksum.algorithm=SHA-256
@@ -189,7 +189,7 @@ commons-dbcp.home=${base.path}/commons-d
 
commons-dbcp-src.loc.1=${base-commons.loc.1}/dbcp/source/commons-dbcp-${commons-dbcp.version}-src.tar.gz
 
commons-dbcp-src.loc.2=${base-commons.loc.2}/dbcp/source/commons-dbcp-${commons-dbcp.version}-src.tar.gz
 
-# - Commons Pool, version 1.1 or later -
+# - Commons Pool 1.x, version 1.1 or later -
 commons-pool.version=1.5.7
 commons-pool-src.checksum.enabled=true
 commons-pool-src.checksum.algorithm=MD5|SHA-1

Modified: tomcat/tc7.0.x/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1838947=1838946=1838947=diff
==
--- tomcat/tc7.0.x/trunk/build.xml (original)
+++ tomcat/tc7.0.x/trunk/build.xml Fri Aug 24 19:53:47 2018
@@ -2583,7 +2583,7 @@ Apache Tomcat ${version} native binaries
   filesDir="java"
   filesId="files.jasper-el" />
 
-
+
 
 
 
@@ -2656,7 +2656,7 @@ Apache Tomcat ${version} native binaries
   

svn commit: r1838943 - in /tomcat/tc8.5.x/trunk: ./ webapps/docs/ webapps/docs/config/

[markt]

Author: markt
Date: Fri Aug 24 19:48:08 2018
New Revision: 1838943

URL: http://svn.apache.org/viewvc?rev=1838943=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62652
Make it clearer that it is DBCP 2 that is packaged with Tomcat 9.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/BUILDING.txt
tomcat/tc8.5.x/trunk/RELEASE-NOTES
tomcat/tc8.5.x/trunk/build.xml
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.5.x/trunk/webapps/docs/class-loader-howto.xml
tomcat/tc8.5.x/trunk/webapps/docs/config/context.xml
tomcat/tc8.5.x/trunk/webapps/docs/config/globalresources.xml
tomcat/tc8.5.x/trunk/webapps/docs/config/systemprops.xml
tomcat/tc8.5.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml
tomcat/tc8.5.x/trunk/webapps/docs/jndi-resources-howto.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 24 19:48:08 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
 

svn commit: r1838942 - in /tomcat/trunk: ./ webapps/docs/ webapps/docs/config/

[markt]

Author: markt
Date: Fri Aug 24 19:46:57 2018
New Revision: 1838942

URL: http://svn.apache.org/viewvc?rev=1838942=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62652
Make it clearer that it is DBCP 2 that is packaged with Tomcat 9.

Modified:
tomcat/trunk/BUILDING.txt
tomcat/trunk/RELEASE-NOTES
tomcat/trunk/build.xml
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/class-loader-howto.xml
tomcat/trunk/webapps/docs/config/context.xml
tomcat/trunk/webapps/docs/config/globalresources.xml
tomcat/trunk/webapps/docs/config/systemprops.xml
tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml
tomcat/trunk/webapps/docs/jndi-resources-howto.xml

Modified: tomcat/trunk/BUILDING.txt
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/BUILDING.txt?rev=1838942=1838941=1838942=diff
==
--- tomcat/trunk/BUILDING.txt (original)
+++ tomcat/trunk/BUILDING.txt Fri Aug 24 19:46:57 2018
@@ -45,15 +45,15 @@ source distribution, do the following:
 Note regarding later versions of Java:
 
   As documented elsewhere, one of components in Apache Tomcat includes
-  a private copy of the Apache Commons DBCP library.
+  a private copy of the Apache Commons DBCP 2 library.
 
   The JDBC interfaces implemented by DBCP frequently change in 
non-backwards
   compatible ways between versions of the Java SE specification. Therefore,
-  it is likely that DBCP will only compile with the specific version of 
Java
+  it is likely that DBCP 2 will only compile with the specific version of 
Java
   listed above and that compilation will fail if a later version of Java is
   used.
 
-  See Apache Commons DBCP project web site for more details on
+  See Apache Commons DBCP 2 project web site for more details on
   available versions of the library and its requirements,
 
 https://commons.apache.org/dbcp/

Modified: tomcat/trunk/RELEASE-NOTES
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/RELEASE-NOTES?rev=1838942=1838941=1838942=diff
==
--- tomcat/trunk/RELEASE-NOTES (original)
+++ tomcat/trunk/RELEASE-NOTES Fri Aug 24 19:46:57 2018
@@ -80,7 +80,7 @@ for use by web applications (by placing
 * servlet-api.jar (Servlet 4.0 API)
 * tomcat-api.jar (Interfaces shared by Catalina and Jasper)
 * tomcat-coyote.jar (Tomcat connectors and utility classes)
-* tomcat-dbcp.jar (package renamed database connection pool based on Commons 
DBCP)
+* tomcat-dbcp.jar (package renamed database connection pool based on Commons 
DBCP 2)
 * tomcat-jdbc.jar (Tomcat's database connection pooling solution)
 * tomcat-jni.jar (Interface to the native component of the APR/native 
connector)
 * tomcat-util.jar (Various utilities)

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1838942=1838941=1838942=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Fri Aug 24 19:46:57 2018
@@ -886,7 +886,7 @@
   filesId="files.jasper-el"
   addOSGi="true" />
 
-
+
 
 
-
+
 

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1838942=1838941=1838942=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Aug 24 19:46:57 2018
@@ -69,6 +69,11 @@
 the use of CATALINA_HOME and CATALINA_BASE.
 Patch provided by Marek Czernek. (markt)
   
+  
+62652: Make it clearer that the version of DBCP that is
+packaged in Tomcat 9.0.x is DBCP 2. Correct the names of some DBCP 2
+configuration attributes that changed between 1.x and 2.x. (markt)
+  
 
   
   
@@ -882,8 +887,8 @@
 Always report the OS's umask when launching the JVM. (schultz)
   
   
-Add managed connections package to the package renamed DBCP2 to provide
-a complete DBCP2 in Tomcat. (remm)
+Add managed connections package to the package renamed DBCP 2 to 
provide
+a complete DBCP 2 in Tomcat. (remm)
   
 
   
@@ -4454,7 +4459,7 @@
 BCEL 6 release. (markt)
   
   
-Update the internal fork of Commons DBCP2 to r1757164 to pick up a
+Update the internal fork of Commons DBCP 2 to r1757164 to pick up a
 couple of bug fixes. (markt)
   
   

Modified: tomcat/trunk/webapps/docs/class-loader-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/class-loader-howto.xml?rev=1838942=1838941=1838942=diff
==
--- 

[Bug 62652] DBCP documentation to fix/clarify

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

 OS||All

--- Comment #1 from Mark Thomas  ---
Note: Tomcat 8.0.x reached end-of-life on 2018-06-30. No further fixes are
releases are expected for 8.0.x. I'll take a look at the docs for 8.5.x and
9.0.x

-- 
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 62650] ampersand entity in jspx

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |INVALID
 OS||All
 Status|NEW |RESOLVED

--- Comment #1 from Mark Thomas  ---
The content served to the client needs to be:



Therefore, the content in the JSPX needs to be:

amp;

-- 
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 62626] Tomcat 9.0.10 APR/Native crashes

[bugzilla]

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

--- Comment #21 from Christopher Schultz  ---
(In reply to jan.pfeifer from comment #20)
> Calling NIO2+HTTP/2 stable was quite premature. With this config I get out
> of memory (5G) every few hours. Strange, peak traffic isnt causing any
> obvious problem.

Just to confirm:

* NIO2 + HTTP/2 + Java 10 crashes. Same setup with Java 8 crashes.
* Limiting to HTTP/1.1 restores stability

Correct?

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

[GitHub] tomcat issue #117: Enhance the CATALINA_BASE documentation

[markt-asf]

Github user markt-asf commented on the issue:

https://github.com/apache/tomcat/pull/117
  
Looks great. Applied. Many thanks.
(note: there was one s/HOME/BASE/ required in the webapps section)


---

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

svn commit: r1838927 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/introduction.xml

[markt]

Author: markt
Date: Fri Aug 24 18:29:35 2018
New Revision: 1838927

URL: http://svn.apache.org/viewvc?rev=1838927=rev
Log:
Expand the information in the documentation web application regarding the use 
of CATALINA_HOME and CATALINA_BASE.
Patch provided by Marek Czernek.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/introduction.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 24 18:29:35 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,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281
 

svn commit: r1838926 - in /tomcat/tc8.5.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/introduction.xml

[markt]

Author: markt
Date: Fri Aug 24 18:28:15 2018
New Revision: 1838926

URL: http://svn.apache.org/viewvc?rev=1838926=rev
Log:
Expand the information in the documentation web application regarding the use 
of CATALINA_HOME and CATALINA_BASE.
Patch provided by Marek Czernek.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.5.x/trunk/webapps/docs/introduction.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 24 18:28:15 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
 

[GitHub] tomcat pull request #117: Enhance the CATALINA_BASE documentation

[asfgit]

Github user asfgit closed the pull request at:

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


---

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

svn commit: r1838925 - in /tomcat/trunk/webapps/docs: changelog.xml introduction.xml

[markt]

Author: markt
Date: Fri Aug 24 18:27:37 2018
New Revision: 1838925

URL: http://svn.apache.org/viewvc?rev=1838925=rev
Log:
Expand the information in the documentation web application regarding the use 
of CATALINA_HOME and CATALINA_BASE.
Patch provided by Marek Czernek.
This closes #117

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

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1838925=1838924=1838925=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Aug 24 18:27:37 2018
@@ -62,6 +62,15 @@
   
 
   
+  
+
+  
+Expand the information in the documentation web application regarding
+the use of CATALINA_HOME and CATALINA_BASE.
+Patch provided by Marek Czernek. (markt)
+  
+
+  
   
 
   

Modified: tomcat/trunk/webapps/docs/introduction.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/introduction.xml?rev=1838925=1838924=1838925=diff
==
--- tomcat/trunk/webapps/docs/introduction.xml (original)
+++ tomcat/trunk/webapps/docs/introduction.xml Fri Aug 24 18:27:37 2018
@@ -63,15 +63,6 @@ do let us know.
 
 
 
-Throughout the docs, you'll notice there are numerous references to
-$CATALINA_HOME. This represents the root of your Tomcat
-installation. When we say, "This information can be found in your
-$CATALINA_HOME/README.txt file" we mean to look at the README.txt file at the
-root of your Tomcat install. Optionally, Tomcat may be configured for multiple
-instances by defining $CATALINA_BASE for each instance. If
-multiple instances are not configured, $CATALINA_BASE is the
-same as $CATALINA_HOME.
-
 These are some of the key tomcat directories:
 
 
@@ -89,6 +80,170 @@ same as $CATALINA_HOME.
 
 
 
+
+  Throughout the documentation, there are references to the two following 
+properties:
+
+  
+CATALINA_HOME: Represents the root of your Tomcat
+installation, for example 
/home/tomcat/apache-tomcat-9.0.10
+or C:\Program Files\apache-tomcat-9.0.10.
+  
+  
+CATALINA_BASE: Represents the root of a runtime
+configuration of a specific Tomcat instance. If you want to have 
+multiple Tomcat instances on one machine, use the 
CATALINA_BASE
+property.
+  
+
+  
+  
+If you set the properties to different locations, the CATALINA_HOME 
location
+contains static sources, such as .jar files, or binary files. 
+The CATALINA_BASE location contains configuration files, log files, 
deployed
+applications, and other runtime requirements.
+  
+  
+
+  By default, CATALINA_HOME and CATALINA_BASE point to the same directory.
+  Set CATALINA_BASE manually when you require running multiple Tomcat 
+  instances on one machine. Doing so provides the following benefits:
+
+
+  
+Easier management of upgrading to a newer version of Tomcat. Because 
all
+instances with single CATALINA_HOME location share one set of 
+.jar files and binary files, you can easily upgrade the 
files
+to newer version and have the change propagated to all Tomcat instances
+using the same CATALIA_HOME directory.
+  
+  
+Avoiding duplication of the same static .jar files.
+  
+  
+The possibility to share certain settings, for example the 
setenv shell
+or bat script file (depending on your operating system).
+  
+
+  
+  
+
+  Before you start using CATALINA_BASE, first consider and create the 
+  directory tree used by CATALINA_BASE. Note that if you do not create
+  all the recommended directories, Tomcat creates the directories 
+  automatically. If it fails to create the necessary directory, for example
+  due to permission issues, Tomcat will either fail to start, or may not
+  function correctly. 
+
+
+  Consider the following list of directories:
+  
+
+  
+The bin directory with the setenv.sh, 
+setenv.bat, and tomcat-juli.jar files.
+  
+  
+Recommended: No.
+  
+  
+Order of lookup: CATALINA_BASE is checked first; fallback 
is provided
+to CATALINA_HOME. 
+  
+
+
+  
+The lib directory with further resources to be added 
on
+classpath.
+  
+  
+Recommended: Yes, if your application depends on external 
libraries.
+  
+  
+Order of lookup: CATALINA_BASE is checked first; 
CATALINA_HOME is
+loaded second. 
+  
+
+
+  
+ 

Re: JDK 11: First Release Candidate available

[Mark Thomas]

On 24/08/18 10:30, Rory O'Donnell wrote:
> Hi Mark,
> 
> *JDK 11 build 28 is our first JDK 11 Release Candidate [1]
> *
> 
>  * JDK 11 Early Access  build 28 is available at : - jdk.java.net/11/
> 
> *FOSS fixes in recent builds.*



>  * *Apache Tomcat *  -JDK-8208642
>    (b27)
>  o *Hope you can confirm that all is ok ?*

Confirmed.

Tests that previous failed passed with:

Oracle JDK 11 build 28

OpenJDK 11 build 28

OpenJDK 12 build 8

Thanks for the fix.

Mark

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

[VOTE] Release JK 1.2.44

[Mark Thomas]

Tag:
http://svn.apache.org/viewvc/tomcat/jk/tags/JK_1_2_44/

Source:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/jk/


This is a maintenance release with a handful of bug fixes and some
clean-up. It also includes Windows binaries for IIS.


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

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

svn commit: r28939 - in /dev/tomcat/tomcat-connectors/jk: HEADER.html README.html

[markt]

Author: markt
Date: Fri Aug 24 16:55:33 2018
New Revision: 28939

Log:
Add missing HTML files before vote starts

Added:
dev/tomcat/tomcat-connectors/jk/HEADER.html
  - copied unchanged from r28811, 
release/tomcat/tomcat-connectors/jk/HEADER.html
dev/tomcat/tomcat-connectors/jk/README.html
  - copied, changed from r28811, 
release/tomcat/tomcat-connectors/jk/README.html

Copied: dev/tomcat/tomcat-connectors/jk/README.html (from r28811, 
release/tomcat/tomcat-connectors/jk/README.html)
==
--- release/tomcat/tomcat-connectors/jk/README.html (original)
+++ dev/tomcat/tomcat-connectors/jk/README.html Fri Aug 24 16:55:33 2018
@@ -47,13 +47,13 @@ nearest mirror site!
 
 
 % pgpk -a KEYS
-% pgpv tomcat-connectors-1.2.43-src.tar.gz.asc
+% pgpv tomcat-connectors-1.2.44-src.tar.gz.asc
 or,
 % pgp -ka KEYS
-% pgp tomcat-connectors-1.2.43-src.tar.gz.asc
+% pgp tomcat-connectors-1.2.44-src.tar.gz.asc
 or,
 % gpg --import KEYS
-% gpg --verify tomcat-connectors-1.2.43-src.tar.gz.asc
+% gpg --verify tomcat-connectors-1.2.44-src.tar.gz.asc
 
 
 We offer SHA1 and SHA512 hashes as alternatives to validate the integrity



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

svn commit: r28938 - in /dev/tomcat/tomcat-connectors/jk: ./ binaries/ binaries/windows/ binaries/windows/symbols/

[markt]

Author: markt
Date: Fri Aug 24 16:50:29 2018
New Revision: 28938

Log:
Upload 1.2.44 for a release vote

Added:
dev/tomcat/tomcat-connectors/jk/binaries/README.html
  - copied unchanged from r28811, 
release/tomcat/tomcat-connectors/jk/binaries/README.html
dev/tomcat/tomcat-connectors/jk/binaries/windows/HEADER.html
  - copied unchanged from r28811, 
release/tomcat/tomcat-connectors/jk/binaries/windows/HEADER.html
dev/tomcat/tomcat-connectors/jk/binaries/windows/README.html
  - copied, changed from r28811, 
release/tomcat/tomcat-connectors/jk/binaries/windows/README.html
dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/HEADER.html
  - copied unchanged from r28811, 
release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/HEADER.html
dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/README.html
  - copied unchanged from r28811, 
release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/README.html

dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.44-windows-i386-symbols.zip
   (with props)

dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.44-windows-i386-symbols.zip.asc

dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.44-windows-i386-symbols.zip.sha512

dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.44-windows-x86_64-symbols.zip
   (with props)

dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.44-windows-x86_64-symbols.zip.asc

dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.44-windows-x86_64-symbols.zip.sha512

dev/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.44-windows-i386-iis.zip
   (with props)

dev/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.44-windows-i386-iis.zip.asc

dev/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.44-windows-i386-iis.zip.sha512

dev/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.44-windows-x86_64-iis.zip
   (with props)

dev/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.44-windows-x86_64-iis.zip.asc

dev/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.44-windows-x86_64-iis.zip.sha512
dev/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.44-src.tar.gz   (with 
props)
dev/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.44-src.tar.gz.asc
dev/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.44-src.tar.gz.sha512
dev/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.44-src.zip   (with 
props)
dev/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.44-src.zip.asc
dev/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.44-src.zip.sha512

Copied: dev/tomcat/tomcat-connectors/jk/binaries/windows/README.html (from 
r28811, release/tomcat/tomcat-connectors/jk/binaries/windows/README.html)
==
--- release/tomcat/tomcat-connectors/jk/binaries/windows/README.html (original)
+++ dev/tomcat/tomcat-connectors/jk/binaries/windows/README.html Fri Aug 24 
16:50:29 2018
@@ -22,7 +22,7 @@
connector to fail.
 
 
-The current stable release is 1.2.43
+The current stable release is 1.2.44
 
 See the Apache Tomcat Connectors
 http://tomcat.apache.org/connectors-doc/miscellaneous/changelog.html;>changelog

Added: 
dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.44-windows-i386-symbols.zip
==
Binary file - no diff available.

Propchange: 
dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.44-windows-i386-symbols.zip
--
svn:executable = *

Propchange: 
dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.44-windows-i386-symbols.zip
--
svn:mime-type = application/octet-stream

Added: 
dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.44-windows-i386-symbols.zip.asc
==
--- 
dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.44-windows-i386-symbols.zip.asc
 (added)
+++ 
dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.44-windows-i386-symbols.zip.asc
 Fri Aug 24 16:50:29 2018
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Comment: GPGTools - http://gpgtools.org
+
+iQIzBAABCgAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAluANqEACgkQEMAcWi9g
+WeeXvxAAnipTY7uFDFvgzdE6lt3J+QhT896PzIdxaUeKn9NoyMPHjjXj7KyxyPlt
+1UPLCYKwgQZVLlJPa/Ko45ib8BCtguU+WXEA66BXuOMVPws3insXhFCy3lSMJSIK
+xSGE+jOiavQaALpf0w0cR5llJ1FeV3ohCleCjcZzCB3DdxOxM+/436OQh2CZ7+5+

svn commit: r1838889 - in /tomcat/jk/tags/JK_1_2_44: ./ native/STATUS.txt native/common/jk_version.h

[markt]

Author: markt
Date: Fri Aug 24 16:15:03 2018
New Revision: 1838889

URL: http://svn.apache.org/viewvc?rev=1838889=rev
Log:
Tag 1.2.44

Added:
tomcat/jk/tags/JK_1_2_44/
  - copied from r183, tomcat/jk/trunk/
Modified:
tomcat/jk/tags/JK_1_2_44/native/STATUS.txt
tomcat/jk/tags/JK_1_2_44/native/common/jk_version.h

Modified: tomcat/jk/tags/JK_1_2_44/native/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/jk/tags/JK_1_2_44/native/STATUS.txt?rev=1838889=183=1838889=diff
==
--- tomcat/jk/tags/JK_1_2_44/native/STATUS.txt (original)
+++ tomcat/jk/tags/JK_1_2_44/native/STATUS.txt Fri Aug 24 16:15:03 2018
@@ -18,7 +18,7 @@ Last modified at [$Date$]
 
 Release:
 
-1.2.44  : development in progress
+1.2.44  : release in progress
 1.2.43  : released March 6, 2018
 1.2.42  : released October 5, 2016
 1.2.41  : released August 11, 2015

Modified: tomcat/jk/tags/JK_1_2_44/native/common/jk_version.h
URL: 
http://svn.apache.org/viewvc/tomcat/jk/tags/JK_1_2_44/native/common/jk_version.h?rev=1838889=183=1838889=diff
==
--- tomcat/jk/tags/JK_1_2_44/native/common/jk_version.h (original)
+++ tomcat/jk/tags/JK_1_2_44/native/common/jk_version.h Fri Aug 24 16:15:03 2018
@@ -29,7 +29,7 @@
 #define JK_VERFIX   44
 
 /* set JK_VERISRELEASE to 1 when release (do not forget to commit!) */
-#define JK_VERISRELEASE 0
+#define JK_VERISRELEASE 1
 /* Beta number */
 #define JK_VERBETA  0
 #define JK_BETASTRING   "0"



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

svn commit: r1838887 - /tomcat/jk/trunk/tools/signfile.sh

[markt]

Author: markt
Date: Fri Aug 24 15:59:16 2018
New Revision: 1838887

URL: http://svn.apache.org/viewvc?rev=1838887=rev
Log:
Another SHA1 reference

Modified:
tomcat/jk/trunk/tools/signfile.sh

Modified: tomcat/jk/trunk/tools/signfile.sh
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/tools/signfile.sh?rev=1838887=1838886=1838887=diff
==
--- tomcat/jk/trunk/tools/signfile.sh (original)
+++ tomcat/jk/trunk/tools/signfile.sh Fri Aug 24 15:59:16 2018
@@ -50,7 +50,6 @@ for o
 do
 echo "Signing $o"
 gpg $gpgopts $o
-$SHA1SUM $o > $o.sha1
 $SHA512SUM $o > $o.sha512
 done
 



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

svn commit: r1838886 - /tomcat/jk/trunk/tools/signfile.sh

[markt]

Author: markt
Date: Fri Aug 24 15:58:07 2018
New Revision: 1838886

URL: http://svn.apache.org/viewvc?rev=1838886=rev
Log:
SHA-1 is deprecated. Use SHA-512 only.

Modified:
tomcat/jk/trunk/tools/signfile.sh

Modified: tomcat/jk/trunk/tools/signfile.sh
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/tools/signfile.sh?rev=1838886=1838885=1838886=diff
==
--- tomcat/jk/trunk/tools/signfile.sh (original)
+++ tomcat/jk/trunk/tools/signfile.sh Fri Aug 24 15:58:07 2018
@@ -38,13 +38,6 @@ do
 esac
 done
 
-# Try to locate a SHA1 binary
-sha1_bin="`which sha1sum 2>/dev/null || type sha1sum 2>&1`"
-if [ -x "$sha1_bin" ]; then
-SHA1SUM="$sha1_bin --binary "
-else
-SHA1SUM="echo  "
-fi
 # Try to locate a SHA512 binary
 sha512_bin="`which sha512sum 2>/dev/null || type sha512sum 2>&1`"
 if [ -x "$sha512_bin" ]; then



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

svn commit: r1838884 - /tomcat/jk/trunk/native/STATUS.txt

[markt]

Author: markt
Date: Fri Aug 24 15:45:36 2018
New Revision: 1838884

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

Modified:
tomcat/jk/trunk/native/STATUS.txt

Modified: tomcat/jk/trunk/native/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/STATUS.txt?rev=1838884=1838883=1838884=diff
==
--- tomcat/jk/trunk/native/STATUS.txt (original)
+++ tomcat/jk/trunk/native/STATUS.txt Fri Aug 24 15:45:36 2018
@@ -19,7 +19,7 @@ Last modified at [$Date$]
 Release:
 
 1.2.44  : development in progress
-1.2.43  : release in progress
+1.2.43  : released March 6, 2018
 1.2.42  : released October 5, 2016
 1.2.41  : released August 11, 2015
 1.2.40  : released April 15, 2014



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

Re: svn commit: r1838882 - /tomcat/jk/trunk/native/common/jk_lb_worker.c

[Rainer Jung]

That happens often, the MS compiler requires vars to be declared at the 
beginning of the block, gcc is more forgiving.


Am 24.08.2018 um 17:38 schrieb ma...@apache.org:

Author: markt
Date: Fri Aug 24 15:38:23 2018
New Revision: 1838882

URL: http://svn.apache.org/viewvc?rev=1838882=rev
Log:
Fix compilation for IIS

Modified:
 tomcat/jk/trunk/native/common/jk_lb_worker.c

Modified: tomcat/jk/trunk/native/common/jk_lb_worker.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_lb_worker.c?rev=1838882=1838881=1838882=diff
==
--- tomcat/jk/trunk/native/common/jk_lb_worker.c (original)
+++ tomcat/jk/trunk/native/common/jk_lb_worker.c Fri Aug 24 15:38:23 2018
@@ -1225,9 +1225,11 @@ static int JK_METHOD service(jk_endpoint
  if (p->worker->sequence < p->worker->s->h.sequence)
  jk_lb_pull(p->worker, JK_FALSE, l);
  for (i = 0; i < num_of_workers; i++) {
+lb_sub_worker_t *rec;
+ajp_worker_t *aw;
  jk_log(l, JK_LOG_DEBUG, "LB - num_of_workers: %d, retry: %d, lb_retries: 
%d", num_of_workers, i, p->worker->lb_retries);
-lb_sub_worker_t *rec = &(p->worker->lb_workers[i]);
-ajp_worker_t *aw = (ajp_worker_t *)rec->worker->worker_private;
+rec = &(p->worker->lb_workers[i]);
+aw = (ajp_worker_t *)rec->worker->worker_private;
  if (rec->s->state == JK_LB_STATE_BUSY) {
  if ((aw->busy_limit <= 0 || aw->s->busy < aw->busy_limit) &&
  ajp_has_endpoint(rec->worker, l)) {


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

Re: svn commit: r1838871 - in /tomcat/jk/trunk/native: apache-2.0/mod_jk.c common/jk_global.h common/jk_uri_worker_map.c common/jk_uri_worker_map.h iis/jk_isapi_plugin.c

[Mark Thomas]

On 24/08/18 16:27, Mark Thomas wrote:
> On 24/08/18 15:42, ma...@apache.org wrote:
>> Author: markt
>> Date: Fri Aug 24 14:42:42 2018
>> New Revision: 1838871
>>
>> URL: http://svn.apache.org/viewvc?rev=1838871=rev
>> Log:
>> Remove unnecessary processing of CollapseSlashes option
> 
> Looks like I messed this up somewhere. I'm seeing a lot of compilation
> errors for IIS. Looking at them now.

Easy fix :)

I'm going to do my final checks before tagging. If there is anything
anyone wants me to wait for before tagging, now is the time to let me know.

Mark

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

svn commit: r1838882 - /tomcat/jk/trunk/native/common/jk_lb_worker.c

[markt]

Author: markt
Date: Fri Aug 24 15:38:23 2018
New Revision: 1838882

URL: http://svn.apache.org/viewvc?rev=1838882=rev
Log:
Fix compilation for IIS

Modified:
tomcat/jk/trunk/native/common/jk_lb_worker.c

Modified: tomcat/jk/trunk/native/common/jk_lb_worker.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_lb_worker.c?rev=1838882=1838881=1838882=diff
==
--- tomcat/jk/trunk/native/common/jk_lb_worker.c (original)
+++ tomcat/jk/trunk/native/common/jk_lb_worker.c Fri Aug 24 15:38:23 2018
@@ -1225,9 +1225,11 @@ static int JK_METHOD service(jk_endpoint
 if (p->worker->sequence < p->worker->s->h.sequence)
 jk_lb_pull(p->worker, JK_FALSE, l);
 for (i = 0; i < num_of_workers; i++) {
+lb_sub_worker_t *rec;
+ajp_worker_t *aw;
 jk_log(l, JK_LOG_DEBUG, "LB - num_of_workers: %d, retry: %d, 
lb_retries: %d", num_of_workers, i, p->worker->lb_retries);
-lb_sub_worker_t *rec = &(p->worker->lb_workers[i]);
-ajp_worker_t *aw = (ajp_worker_t *)rec->worker->worker_private;
+rec = &(p->worker->lb_workers[i]);
+aw = (ajp_worker_t *)rec->worker->worker_private;
 if (rec->s->state == JK_LB_STATE_BUSY) {
 if ((aw->busy_limit <= 0 || aw->s->busy < aw->busy_limit) &&
 ajp_has_endpoint(rec->worker, l)) {



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

Re: svn commit: r1838871 - in /tomcat/jk/trunk/native: apache-2.0/mod_jk.c common/jk_global.h common/jk_uri_worker_map.c common/jk_uri_worker_map.h iis/jk_isapi_plugin.c

[Mark Thomas]

On 24/08/18 15:42, ma...@apache.org wrote:
> Author: markt
> Date: Fri Aug 24 14:42:42 2018
> New Revision: 1838871
> 
> URL: http://svn.apache.org/viewvc?rev=1838871=rev
> Log:
> Remove unnecessary processing of CollapseSlashes option

Looks like I messed this up somewhere. I'm seeing a lot of compilation
errors for IIS. Looking at them now.

Mark

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

svn commit: r1838874 [1/2] - in /tomcat/jk/trunk: native/scripts/build/unix/config.guess native/scripts/build/unix/config.sub xdocs/miscellaneous/changelog.xml

[rjung]

Author: rjung
Date: Fri Aug 24 14:46:25 2018
New Revision: 1838874

URL: http://svn.apache.org/viewvc?rev=1838874=rev
Log:
Update config.guess and config.sub from
https://git.savannah.gnu.org/git/config.git

Modified:
tomcat/jk/trunk/native/scripts/build/unix/config.guess
tomcat/jk/trunk/native/scripts/build/unix/config.sub
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/jk/trunk/native/scripts/build/unix/config.guess
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/scripts/build/unix/config.guess?rev=1838874=1838873=1838874=diff
==
--- tomcat/jk/trunk/native/scripts/build/unix/config.guess (original)
+++ tomcat/jk/trunk/native/scripts/build/unix/config.guess Fri Aug 24 14:46:25 
2018
@@ -2,7 +2,7 @@
 # Attempt to guess a canonical system name.
 #   Copyright 1992-2018 Free Software Foundation, Inc.
 
-timestamp='2018-01-01'
+timestamp='2018-08-02'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -84,8 +84,6 @@ if test $# != 0; then
   exit 1
 fi
 
-trap 'exit 1' 1 2 15
-
 # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
 # compiler to aid in system detection is discouraged as it requires
 # temporary files to be created and, as you can see below, it is a
@@ -96,34 +94,39 @@ trap 'exit 1' 1 2 15
 
 # Portable tmp directory creation inspired by the Autoconf team.
 
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && 
exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 
;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXX") 2>/dev/null` && test -n 
"$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) 
; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating 
insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } 
;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)echo "int x;" > $dummy.c ;
-   for c in cc gcc c89 c99 ; do
- if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-CC_FOR_BUILD="$c"; break ;
- fi ;
-   done ;
-   if test x"$CC_FOR_BUILD" = x ; then
- CC_FOR_BUILD=no_compiler_found ;
-   fi
-   ;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
+tmp=
+# shellcheck disable=SC2172
+trap 'test -z "$tmp" || rm -fr "$tmp"' 1 2 13 15
+trap 'exitcode=$?; test -z "$tmp" || rm -fr "$tmp"; exit $exitcode' 0
+
+set_cc_for_build() {
+: "${TMPDIR=/tmp}"
+# shellcheck disable=SC2039
+{ tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXX") 2>/dev/null` && test -n 
"$tmp" && test -d "$tmp" ; } ||
+   { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir 
"$tmp" 2>/dev/null) ; } ||
+   { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo 
"Warning: creating insecure temp directory" >&2 ; } ||
+   { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 
1 ; }
+dummy=$tmp/dummy
+case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in
+   ,,)echo "int x;" > "$dummy.c"
+  for driver in cc gcc c89 c99 ; do
+  if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; 
then
+  CC_FOR_BUILD="$driver"
+  break
+  fi
+  done
+  if test x"$CC_FOR_BUILD" = x ; then
+  CC_FOR_BUILD=no_compiler_found
+  fi
+  ;;
+   ,,*)   CC_FOR_BUILD=$CC ;;
+   ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+esac
+}
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (gh...@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+if test -f /.attbin/uname ; then
PATH=$PATH:/.attbin ; export PATH
 fi
 
@@ -132,14 +135,14 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` |
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
-case "${UNAME_SYSTEM}" in
+case "$UNAME_SYSTEM" in
 Linux|GNU|GNU/*)
# If the system lacks a compiler, then just pick glibc.
# We could probably try harder.
LIBC=gnu
 
-   eval $set_cc_for_build
-   cat <<-EOF > $dummy.c
+   set_cc_for_build
+   cat <<-EOF > "$dummy.c"
#include 
#if defined(__UCLIBC__)
LIBC=uclibc
@@ -149,13 +152,20 @@ Linux|GNU|GNU/*)
LIBC=gnu
#endif
EOF
-   eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, 
,,g'`
+   eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, 

svn commit: r1838874 [2/2] - in /tomcat/jk/trunk: native/scripts/build/unix/config.guess native/scripts/build/unix/config.sub xdocs/miscellaneous/changelog.xml

[rjung]

Modified: tomcat/jk/trunk/native/scripts/build/unix/config.sub
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/scripts/build/unix/config.sub?rev=1838874=1838873=1838874=diff
==
--- tomcat/jk/trunk/native/scripts/build/unix/config.sub (original)
+++ tomcat/jk/trunk/native/scripts/build/unix/config.sub Fri Aug 24 14:46:25 
2018
@@ -2,7 +2,7 @@
 # Configuration validation subroutine script.
 #   Copyright 1992-2018 Free Software Foundation, Inc.
 
-timestamp='2018-01-01'
+timestamp='2018-08-24'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -94,7 +94,7 @@ while test $# -gt 0 ; do
 
 *local*)
# First pass through any local machine types.
-   echo $1
+   echo "$1"
exit ;;
 
 * )
@@ -110,561 +110,661 @@ case $# in
 exit 1;;
 esac
 
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | 
kfreebsd*-gnu* | \
-  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
-  kopensolaris*-gnu* | cloudabi*-eabi* | \
-  storm-chaos* | os2-emx* | rtmk-nova*)
-os=-$maybe_os
-basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-;;
-  android-linux)
-os=-linux-android
-basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
-;;
-  *)
-basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-if [ $basic_machine != $1 ]
-then os=`echo $1 | sed 's/.*-/-/'`
-else os=; fi
-;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-   -sun*os*)
-   # Prevent following clause from handling this invalid input.
-   ;;
-   -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-   -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-   -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-   -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-   -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-   -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-   -apple | -axis | -knuth | -cray | -microblaze*)
-   os=
-   basic_machine=$1
-   ;;
-   -bluegene*)
-   os=-cnk
-   ;;
-   -sim | -cisco | -oki | -wec | -winbond)
-   os=
-   basic_machine=$1
-   ;;
-   -scout)
-   ;;
-   -wrs)
-   os=-vxworks
-   basic_machine=$1
-   ;;
-   -chorusos*)
-   os=-chorusos
-   basic_machine=$1
-   ;;
-   -chorusrdb)
-   os=-chorusrdb
-   basic_machine=$1
-   ;;
-   -hiux*)
-   os=-hiuxwe2
-   ;;
-   -sco6)
-   os=-sco5v6
-   basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-   ;;
-   -sco5)
-   os=-sco3.2v5
-   basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-   ;;
-   -sco4)
-   os=-sco3.2v4
-   basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-   ;;
-   -sco3.2.[4-9]*)
-   os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-   basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-   ;;
-   -sco3.2v[4-9]*)
-   # Don't forget version if it is 3.2v4 or newer.
-   basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-   ;;
-   -sco5v6*)
-   # Don't forget version if it is 3.2v4 or newer.
-   basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+# Split fields of configuration type
+IFS="-" read -r field1 field2 field3 field4 <&2
+   exit 1
;;
-   -sco*)
-   os=-sco3.2v2
-   basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+   *-*-*-*)
+   basic_machine=$field1-$field2
+   os=$field3-$field4
;;
-   -udk*)
-   basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+   *-*-*)
+   # Ambiguous whether COMPANY is present, or skipped and 
KERNEL-OS is two
+   # parts
+   maybe_os=$field2-$field3
+   case $maybe_os in
+   nto-qnx* | linux-gnu* | linux-android* | 

svn commit: r1838873 [2/2] - in /tomcat/jk/trunk: native/iis/pcre/config.guess native/iis/pcre/config.sub xdocs/miscellaneous/changelog.xml

[rjung]

Modified: tomcat/jk/trunk/native/iis/pcre/config.sub
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/config.sub?rev=1838873=1838872=1838873=diff
==
--- tomcat/jk/trunk/native/iis/pcre/config.sub (original)
+++ tomcat/jk/trunk/native/iis/pcre/config.sub Fri Aug 24 14:45:18 2018
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2018 Free Software Foundation, Inc.
+#   Copyright 1992-2017 Free Software Foundation, Inc.
 
-timestamp='2018-08-24'
+timestamp='2017-04-02'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@ timestamp='2018-08-24'
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, see .
+# along with this program; if not, see .
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -33,7 +33,7 @@ timestamp='2018-08-24'
 # Otherwise, we print the canonical config type on stdout and succeed.
 
 # You can get the latest version of this script from:
-# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
 
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
@@ -57,7 +57,7 @@ Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIA
 
 Canonicalize a configuration name.
 
-Options:
+Operation modes:
   -h, --help print this help, then exit
   -t, --time-stamp   print date of last modification, then exit
   -v, --version  print version number, then exit
@@ -67,7 +67,7 @@ Report bugs and patches to &2
-   exit 1
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | 
kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
+  kopensolaris*-gnu* | cloudabi*-eabi* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
+os=-$maybe_os
+basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+;;
+  android-linux)
+os=-linux-android
+basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+;;
+  *)
+basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+if [ $basic_machine != $1 ]
+then os=`echo $1 | sed 's/.*-/-/'`
+else os=; fi
+;;
+esac
+
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work.  We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+   -sun*os*)
+   # Prevent following clause from handling this invalid input.
;;
-   *-*-*-*)
-   basic_machine=$field1-$field2
-   os=$field3-$field4
+   -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+   -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+   -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+   -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+   -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+   -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+   -apple | -axis | -knuth | -cray | -microblaze*)
+   os=
+   basic_machine=$1
+   ;;
+   -bluegene*)
+   os=-cnk
+   ;;
+   -sim | -cisco | -oki | -wec | -winbond)
+   os=
+   basic_machine=$1
+   ;;
+   -scout)
+   ;;
+   -wrs)
+   os=-vxworks
+   basic_machine=$1
+   ;;
+   -chorusos*)
+   os=-chorusos
+   basic_machine=$1
+   ;;
+   -chorusrdb)
+   os=-chorusrdb
+   basic_machine=$1
+   ;;
+   -hiux*)
+   os=-hiuxwe2
+   ;;
+   -sco6)
+   os=-sco5v6
+   basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+   ;;
+   -sco5)
+   os=-sco3.2v5
+   basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+   ;;
+   -sco4)
+   os=-sco3.2v4
+   basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
-   *-*-*)
-   # Ambiguous whether COMPANY is 

svn commit: r1838873 [1/2] - in /tomcat/jk/trunk: native/iis/pcre/config.guess native/iis/pcre/config.sub xdocs/miscellaneous/changelog.xml

[rjung]

Author: rjung
Date: Fri Aug 24 14:45:18 2018
New Revision: 1838873

URL: http://svn.apache.org/viewvc?rev=1838873=rev
Log:
Revert 1838870 because the wrong config.guess
and config.sub were updated.

Modified:
tomcat/jk/trunk/native/iis/pcre/config.guess
tomcat/jk/trunk/native/iis/pcre/config.sub
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/jk/trunk/native/iis/pcre/config.guess
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/config.guess?rev=1838873=1838872=1838873=diff
==
--- tomcat/jk/trunk/native/iis/pcre/config.guess (original)
+++ tomcat/jk/trunk/native/iis/pcre/config.guess Fri Aug 24 14:45:18 2018
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2018 Free Software Foundation, Inc.
+#   Copyright 1992-2017 Free Software Foundation, Inc.
 
-timestamp='2018-08-02'
+timestamp='2017-05-27'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@ timestamp='2018-08-02'
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, see .
+# along with this program; if not, see .
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -27,7 +27,7 @@ timestamp='2018-08-02'
 # Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
 #
 # You can get the latest version of this script from:
-# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 #
 # Please send patches to .
 
@@ -39,7 +39,7 @@ Usage: $0 [OPTION]
 
 Output the configuration name of the system \`$me' is run on.
 
-Options:
+Operation modes:
   -h, --help print this help, then exit
   -t, --time-stamp   print date of last modification, then exit
   -v, --version  print version number, then exit
@@ -50,7 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2018 Free Software Foundation, Inc.
+Copyright 1992-2017 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -84,6 +84,8 @@ if test $# != 0; then
   exit 1
 fi
 
+trap 'exit 1' 1 2 15
+
 # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
 # compiler to aid in system detection is discouraged as it requires
 # temporary files to be created and, as you can see below, it is a
@@ -94,39 +96,34 @@ fi
 
 # Portable tmp directory creation inspired by the Autoconf team.
 
-tmp=
-# shellcheck disable=SC2172
-trap 'test -z "$tmp" || rm -fr "$tmp"' 1 2 13 15
-trap 'exitcode=$?; test -z "$tmp" || rm -fr "$tmp"; exit $exitcode' 0
-
-set_cc_for_build() {
-: "${TMPDIR=/tmp}"
-# shellcheck disable=SC2039
-{ tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXX") 2>/dev/null` && test -n 
"$tmp" && test -d "$tmp" ; } ||
-   { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir 
"$tmp" 2>/dev/null) ; } ||
-   { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo 
"Warning: creating insecure temp directory" >&2 ; } ||
-   { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 
1 ; }
-dummy=$tmp/dummy
-case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in
-   ,,)echo "int x;" > "$dummy.c"
-  for driver in cc gcc c89 c99 ; do
-  if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; 
then
-  CC_FOR_BUILD="$driver"
-  break
-  fi
-  done
-  if test x"$CC_FOR_BUILD" = x ; then
-  CC_FOR_BUILD=no_compiler_found
-  fi
-  ;;
-   ,,*)   CC_FOR_BUILD=$CC ;;
-   ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac
-}
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && 
exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 
;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXX") 2>/dev/null` && test -n 
"$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) 
; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating 
insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } 
;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)echo "int x;" > $dummy.c ;
+  

svn commit: r1838871 - in /tomcat/jk/trunk/native: apache-2.0/mod_jk.c common/jk_global.h common/jk_uri_worker_map.c common/jk_uri_worker_map.h iis/jk_isapi_plugin.c

[markt]

Author: markt
Date: Fri Aug 24 14:42:42 2018
New Revision: 1838871

URL: http://svn.apache.org/viewvc?rev=1838871=rev
Log:
Remove unnecessary processing of CollapseSlashes option

Modified:
tomcat/jk/trunk/native/apache-2.0/mod_jk.c
tomcat/jk/trunk/native/common/jk_global.h
tomcat/jk/trunk/native/common/jk_uri_worker_map.c
tomcat/jk/trunk/native/common/jk_uri_worker_map.h
tomcat/jk/trunk/native/iis/jk_isapi_plugin.c

Modified: tomcat/jk/trunk/native/apache-2.0/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/mod_jk.c?rev=1838871=1838870=1838871=diff
==
--- tomcat/jk/trunk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-2.0/mod_jk.c Fri Aug 24 14:42:42 2018
@@ -713,18 +713,6 @@ static void dump_options(server_rec *srv
 jk_log(conf->log, JK_LOG_DEBUG, "JkOption '%s' set in server '%s'%s",
"RejectUnsafeURI", server_name,
JK_OPT_DEFAULT & JK_OPT_REJECTUNSAFE ? " (default)" : "");
-if (options & JK_OPT_COLLAPSEALL)
-jk_log(conf->log, JK_LOG_DEBUG, "JkOption '%s' set in server '%s'%s",
-   "CollapseSlashesAll", server_name,
-   JK_OPT_DEFAULT & JK_OPT_COLLAPSEALL ? " (default)" : "");
-if (options & JK_OPT_COLLAPSENONE)
-jk_log(conf->log, JK_LOG_DEBUG, "JkOption '%s' set in server '%s'%s",
-   "CollapseSlashesNone", server_name,
-   JK_OPT_DEFAULT & JK_OPT_COLLAPSENONE ? " (default)" : "");
-if (options & JK_OPT_COLLAPSEUNMOUNT)
-jk_log(conf->log, JK_LOG_DEBUG, "JkOption '%s' set in server '%s'%s",
-   "CollapseSlashesUnmount", server_name,
-   JK_OPT_DEFAULT & JK_OPT_COLLAPSEUNMOUNT ? " (default)" : "");
 }
 
 /* = */
@@ -2307,11 +2295,10 @@ static const char *jk_set_options(cmd_pa
 mask = 0;
 
 if (action == '-' &&
-(!strncasecmp(w, "ForwardURI", strlen("ForwardURI")) ||
- !strncasecmp(w, "CollapseSlashes", strlen("CollapseSlashes"
+(!strncasecmp(w, "ForwardURI", strlen("ForwardURI" {
 return apr_pstrcat(cmd->pool, "JkOptions: Illegal option '-", w,
"': option can not be disabled", NULL);
-
+}
 if (!strcasecmp(w, "ForwardURICompat")) {
 opt = JK_OPT_FWDURICOMPAT;
 mask = JK_OPT_FWDURIMASK;
@@ -3700,21 +3687,9 @@ static int jk_post_config(apr_pool_t * p
 uri_worker_map_switch(sconf->uw_map, sconf->log);
 uri_worker_map_load(sconf->uw_map, sconf->log);
 }
-switch (sconf->options & JK_OPT_COLLAPSEMASK) {
-case JK_OPT_COLLAPSEALL:
-sconf->uw_map->collapse_slashes = JK_COLLAPSE_ALL;
-break;
-case JK_OPT_COLLAPSENONE:
-sconf->uw_map->collapse_slashes = JK_COLLAPSE_NONE;
-break;
-case JK_OPT_COLLAPSEUNMOUNT:
-sconf->uw_map->collapse_slashes = 
JK_COLLAPSE_UNMOUNT;
-break;
-default:
+if (sconf->options & JK_OPT_COLLAPSEMASK) {
 ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s,
- "Collapse slashes value %d ignored, 
setting to %d",
- sconf->options & JK_OPT_COLLAPSEMASK, 
JK_COLLAPSE_DEFAULT);
-sconf->uw_map->collapse_slashes = 
JK_COLLAPSE_DEFAULT;
+ "Deprecated CollapseSlashes setting 
ignored");
 }
 }
 else {

Modified: tomcat/jk/trunk/native/common/jk_global.h
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_global.h?rev=1838871=1838870=1838871=diff
==
--- tomcat/jk/trunk/native/common/jk_global.h (original)
+++ tomcat/jk/trunk/native/common/jk_global.h Fri Aug 24 14:42:42 2018
@@ -277,7 +277,7 @@ extern "C"
 #define JK_OPT_COLLAPSENONE 0x2000
 #define JK_OPT_COLLAPSEUNMOUNT  0x4000
 
-#define JK_OPT_DEFAULT  (JK_OPT_FWDURIDEFAULT | JK_OPT_FWDKEYSIZE 
| JK_OPT_COLLAPSEUNMOUNT)
+#define JK_OPT_DEFAULT  (JK_OPT_FWDURIDEFAULT | JK_OPT_FWDKEYSIZE)
 
 /* Check for EBCDIC systems */
 

Modified: tomcat/jk/trunk/native/common/jk_uri_worker_map.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_uri_worker_map.c?rev=1838871=1838870=1838871=diff
==
--- 

svn commit: r1838870 [2/2] - in /tomcat/jk/trunk: native/iis/pcre/config.guess native/iis/pcre/config.sub xdocs/miscellaneous/changelog.xml

[rjung]

Modified: tomcat/jk/trunk/native/iis/pcre/config.sub
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/config.sub?rev=1838870=1838869=1838870=diff
==
--- tomcat/jk/trunk/native/iis/pcre/config.sub (original)
+++ tomcat/jk/trunk/native/iis/pcre/config.sub Fri Aug 24 14:40:51 2018
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2017 Free Software Foundation, Inc.
+#   Copyright 1992-2018 Free Software Foundation, Inc.
 
-timestamp='2017-04-02'
+timestamp='2018-08-24'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@ timestamp='2017-04-02'
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, see .
+# along with this program; if not, see .
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -33,7 +33,7 @@ timestamp='2017-04-02'
 # Otherwise, we print the canonical config type on stdout and succeed.
 
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
 
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
@@ -57,7 +57,7 @@ Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIA
 
 Canonicalize a configuration name.
 
-Operation modes:
+Options:
   -h, --help print this help, then exit
   -t, --time-stamp   print date of last modification, then exit
   -v, --version  print version number, then exit
@@ -67,7 +67,7 @@ Report bugs and patches to &2
+   exit 1
;;
-   -udk*)
-   basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+   *-*-*-*)
+   basic_machine=$field1-$field2
+   os=$field3-$field4
;;
-   -isc)
-   os=-isc2.2
-   basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+   *-*-*)
+   # Ambiguous whether COMPANY is present, or skipped and 
KERNEL-OS is two
+   # parts
+   maybe_os=$field2-$field3
+   case $maybe_os in
+   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc 
\
+   | linux-newlib* | linux-musl* | linux-uclibc* | 
uclinux-uclibc* \
+   | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | 
netbsd*-gnu* \
+   | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
+   | storm-chaos* | os2-emx* | rtmk-nova*)
+   basic_machine=$field1
+   os=$maybe_os
+   ;;
+   android-linux)
+   basic_machine=$field1-unknown
+   os=linux-android
+   ;;
+   *)
+   basic_machine=$field1-$field2
+   os=$field3
+   ;;
+   esac
;;
-   -clix*)
-   basic_machine=clipper-intergraph
+   *-*)
+   # A lone config we happen to match not fitting any patern
+   case $field1-$field2 in
+   decstation-3100)
+   basic_machine=mips-dec
+   os=
+   ;;
+   *-*)
+   # Second component is usually, but not always 
the OS
+   case $field2 in
+   # Prevent following clause from 
handling this valid os
+   sun*os*)
+   basic_machine=$field1
+   os=$field2
+   ;;
+   # Manufacturers
+   dec* | mips* | sequent* | encore* | 
pc533* | sgi* | sony* \
+   | att* | 7300* | 3300* | delta* | 
motorola* | sun[234]* \
+   | unicom* | ibm* | next | hp | isi* | 
apollo | altos* \
+   | convergent* | ncr* | news | 32* | 
3600* | 3100* \
+   | hitachi* | c[123]* | convex* | sun | 
crds | omron* | dg \
+   | ultra | tti* | harris | dolphin | 
highlevel | gould \
+   | 

svn commit: r1838870 [1/2] - in /tomcat/jk/trunk: native/iis/pcre/config.guess native/iis/pcre/config.sub xdocs/miscellaneous/changelog.xml

[rjung]

Author: rjung
Date: Fri Aug 24 14:40:51 2018
New Revision: 1838870

URL: http://svn.apache.org/viewvc?rev=1838870=rev
Log:
Update config.guess and config.sub from
https://git.savannah.gnu.org/git/config.git

Modified:
tomcat/jk/trunk/native/iis/pcre/config.guess
tomcat/jk/trunk/native/iis/pcre/config.sub
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/jk/trunk/native/iis/pcre/config.guess
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/config.guess?rev=1838870=1838869=1838870=diff
==
--- tomcat/jk/trunk/native/iis/pcre/config.guess (original)
+++ tomcat/jk/trunk/native/iis/pcre/config.guess Fri Aug 24 14:40:51 2018
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2017 Free Software Foundation, Inc.
+#   Copyright 1992-2018 Free Software Foundation, Inc.
 
-timestamp='2017-05-27'
+timestamp='2018-08-02'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@ timestamp='2017-05-27'
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, see .
+# along with this program; if not, see .
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -27,7 +27,7 @@ timestamp='2017-05-27'
 # Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
 #
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 #
 # Please send patches to .
 
@@ -39,7 +39,7 @@ Usage: $0 [OPTION]
 
 Output the configuration name of the system \`$me' is run on.
 
-Operation modes:
+Options:
   -h, --help print this help, then exit
   -t, --time-stamp   print date of last modification, then exit
   -v, --version  print version number, then exit
@@ -50,7 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2017 Free Software Foundation, Inc.
+Copyright 1992-2018 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -84,8 +84,6 @@ if test $# != 0; then
   exit 1
 fi
 
-trap 'exit 1' 1 2 15
-
 # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
 # compiler to aid in system detection is discouraged as it requires
 # temporary files to be created and, as you can see below, it is a
@@ -96,34 +94,39 @@ trap 'exit 1' 1 2 15
 
 # Portable tmp directory creation inspired by the Autoconf team.
 
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && 
exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 
;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXX") 2>/dev/null` && test -n 
"$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) 
; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating 
insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } 
;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)echo "int x;" > $dummy.c ;
-   for c in cc gcc c89 c99 ; do
- if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-CC_FOR_BUILD="$c"; break ;
- fi ;
-   done ;
-   if test x"$CC_FOR_BUILD" = x ; then
- CC_FOR_BUILD=no_compiler_found ;
-   fi
-   ;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
+tmp=
+# shellcheck disable=SC2172
+trap 'test -z "$tmp" || rm -fr "$tmp"' 1 2 13 15
+trap 'exitcode=$?; test -z "$tmp" || rm -fr "$tmp"; exit $exitcode' 0
+
+set_cc_for_build() {
+: "${TMPDIR=/tmp}"
+# shellcheck disable=SC2039
+{ tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXX") 2>/dev/null` && test -n 
"$tmp" && test -d "$tmp" ; } ||
+   { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir 
"$tmp" 2>/dev/null) ; } ||
+   { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo 
"Warning: creating insecure temp directory" >&2 ; } ||
+   { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 
1 ; }
+dummy=$tmp/dummy
+case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in
+   ,,)echo "int x;" > "$dummy.c"
+  for driver in cc gcc c89 c99 ; do
+  if ($driver 

svn commit: r1838867 [7/8] - in /tomcat/jk/trunk: native/iis/pcre/ native/iis/pcre/doc/html/ native/iis/pcre/m4/ native/iis/pcre/sljit/ native/iis/pcre/testdata/ xdocs/miscellaneous/

[rjung]

Modified: tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativePPC_common.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativePPC_common.c?rev=1838867=1838866=1838867=diff
==
--- tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativePPC_common.c (original)
+++ tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativePPC_common.c Fri Aug 24 
14:36:12 2018
@@ -93,20 +93,23 @@ static void ppc_cache_flush(sljit_ins *f
 
 #define TMP_REG1   (SLJIT_NUMBER_OF_REGISTERS + 2)
 #define TMP_REG2   (SLJIT_NUMBER_OF_REGISTERS + 3)
-#define TMP_REG3   (SLJIT_NUMBER_OF_REGISTERS + 4)
-#define TMP_ZERO   (SLJIT_NUMBER_OF_REGISTERS + 5)
+#define TMP_ZERO   (SLJIT_NUMBER_OF_REGISTERS + 4)
 
 #if (defined SLJIT_PASS_ENTRY_ADDR_TO_CALL && SLJIT_PASS_ENTRY_ADDR_TO_CALL)
-#define TMP_CALL_REG   (SLJIT_NUMBER_OF_REGISTERS + 6)
+#define TMP_CALL_REG   (SLJIT_NUMBER_OF_REGISTERS + 5)
 #else
 #define TMP_CALL_REG   TMP_REG2
 #endif
 
-#define TMP_FREG1  (0)
-#define TMP_FREG2  (SLJIT_NUMBER_OF_FLOAT_REGISTERS + 1)
+#define TMP_FREG1  (SLJIT_NUMBER_OF_FLOAT_REGISTERS + 1)
+#define TMP_FREG2  (SLJIT_NUMBER_OF_FLOAT_REGISTERS + 2)
 
 static const sljit_u8 reg_map[SLJIT_NUMBER_OF_REGISTERS + 7] = {
-   0, 3, 4, 5, 6, 7, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 
27, 28, 29, 30, 1, 8, 9, 10, 31, 12
+   0, 3, 4, 5, 6, 7, 8, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 
26, 27, 28, 29, 30, 1, 9, 10, 31, 12
+};
+
+static const sljit_u8 freg_map[SLJIT_NUMBER_OF_FLOAT_REGISTERS + 3] = {
+   0, 1, 2, 3, 4, 5, 6, 0, 7
 };
 
 /* - */
@@ -117,11 +120,11 @@ static const sljit_u8 reg_map[SLJIT_NUMB
 #define A(a)   (reg_map[a] << 16)
 #define B(b)   (reg_map[b] << 11)
 #define C(c)   (reg_map[c] << 6)
-#define FD(fd) ((fd) << 21)
-#define FS(fs) ((fs) << 21)
-#define FA(fa) ((fa) << 16)
-#define FB(fb) ((fb) << 11)
-#define FC(fc) ((fc) << 6)
+#define FD(fd) (freg_map[fd] << 21)
+#define FS(fs) (freg_map[fs] << 21)
+#define FA(fa) (freg_map[fa] << 16)
+#define FB(fb) (freg_map[fb] << 11)
+#define FC(fc) (freg_map[fc] << 6)
 #define IMM(imm)   ((imm) & 0x)
 #define CRD(d) ((d) << 21)
 
@@ -536,7 +539,6 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit
return 1;
 #endif
 
-   case SLJIT_HAS_PRE_UPDATE:
case SLJIT_HAS_CLZ:
return 1;
 
@@ -554,46 +556,40 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit
 /* Creates an index in data_transfer_insts array. */
 #define LOAD_DATA  0x01
 #define INDEXED0x02
-#define WRITE_BACK 0x04
+#define SIGNED_DATA0x04
+
 #define WORD_DATA  0x00
 #define BYTE_DATA  0x08
 #define HALF_DATA  0x10
 #define INT_DATA   0x18
-#define SIGNED_DATA0x20
 /* Separates integer and floating point registers */
-#define GPR_REG0x3f
-#define DOUBLE_DATA0x40
+#define GPR_REG0x1f
+#define DOUBLE_DATA0x20
 
 #define MEM_MASK   0x7f
 
 /* Other inp_flags. */
 
-#define ARG_TEST   0x000100
 /* Integer opertion and set flags -> requires exts on 64 bit systems. */
-#define ALT_SIGN_EXT   0x000200
+#define ALT_SIGN_EXT   0x000100
 /* This flag affects the RC() and OERC() macros. */
 #define ALT_SET_FLAGS  0x000400
-#define ALT_KEEP_CACHE 0x000800
-#define ALT_FORM1  0x01
-#define ALT_FORM2  0x02
-#define ALT_FORM3  0x04
-#define ALT_FORM4  0x08
-#define ALT_FORM5  0x10
+#define ALT_FORM1  0x001000
+#define ALT_FORM2  0x002000
+#define ALT_FORM3  0x004000
+#define ALT_FORM4  0x008000
+#define ALT_FORM5  0x01
 
 /* Source and destination is register. */
 #define REG_DEST   0x01
 #define REG1_SOURCE0x02
 #define REG2_SOURCE0x04
-/* getput_arg_fast returned true. */
-#define FAST_DEST  0x08
-/* Multiple instructions are required. */
-#define SLOW_DEST  0x10
 /*
-ALT_SIGN_EXT   0x000200
-ALT_SET_FLAGS  0x000400
-ALT_FORM1  0x01
+ALT_SIGN_EXT   0x000100
+ALT_SET_FLAGS  0x000200
+ALT_FORM1  0x001000
 ...
-ALT_FORM5  0x10 */
+ALT_FORM5  0x01 */
 
 #if (defined SLJIT_CONFIG_PPC_32 && SLJIT_CONFIG_PPC_32)
 #include "sljitNativePPC_32.c"
@@ -610,14 +606,14 @@ ALT_FORM5 0x10 */
 #endif
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler 
*compiler,
-   sljit_s32 options, sljit_s32 args, sljit_s32 scratches, sljit_s32 
saveds,
+   sljit_s32 options, sljit_s32 arg_types, sljit_s32 scratches, sljit_s32 
saveds,
sljit_s32 fscratches, sljit_s32 fsaveds, sljit_s32 local_size)
 {
-   sljit_s32 i, tmp, offs;
+   sljit_s32 args, i, tmp, offs;
 
   

svn commit: r1838867 [4/8] - in /tomcat/jk/trunk: native/iis/pcre/ native/iis/pcre/doc/html/ native/iis/pcre/m4/ native/iis/pcre/sljit/ native/iis/pcre/testdata/ xdocs/miscellaneous/

[rjung]

Modified: tomcat/jk/trunk/native/iis/pcre/sljit/sljitLir.h
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/sljit/sljitLir.h?rev=1838867=1838866=1838867=diff
==
--- tomcat/jk/trunk/native/iis/pcre/sljit/sljitLir.h (original)
+++ tomcat/jk/trunk/native/iis/pcre/sljit/sljitLir.h Fri Aug 24 14:36:12 2018
@@ -153,8 +153,8 @@ of sljitConfigInternal.h */
 is not available at all.
 */
 
-/* When SLJIT_UNUSED is specified as the destination of sljit_emit_op1 and
-   and sljit_emit_op2 operations the result is discarded. If no status
+/* When SLJIT_UNUSED is specified as the destination of sljit_emit_op1
+   or sljit_emit_op2 operations the result is discarded. If no status
flags are set, no instructions are emitted for these operations. Data
prefetch is a special exception, see SLJIT_MOV operation. Other SLJIT
operations do not support SLJIT_UNUSED as a destination operand. */
@@ -213,14 +213,6 @@ of sljitConfigInternal.h */
 
 #define SLJIT_RETURN_REG   SLJIT_R0
 
-/* x86 prefers specific registers for special purposes. In case of shift
-   by register it supports only SLJIT_R2 for shift argument
-   (which is the src2 argument of sljit_emit_op2). If another register is
-   used, sljit must exchange data between registers which cause a minor
-   slowdown. Other architectures has no such limitation. */
-
-#define SLJIT_PREF_SHIFT_REG   SLJIT_R2
-
 /* - */
 /*  Floating point registers */
 /* - */
@@ -258,6 +250,79 @@ of sljitConfigInternal.h */
 #define SLJIT_FIRST_SAVED_FLOAT_REG (SLJIT_FS0 - 
SLJIT_NUMBER_OF_SAVED_FLOAT_REGISTERS + 1)
 
 /* - */
+/*  Argument type definitions*/
+/* - */
+
+/* Argument type definitions.
+   Used by SLJIT_[DEF_]ARGx and SLJIT_[DEF]_RET macros. */
+
+#define SLJIT_ARG_TYPE_VOID 0
+#define SLJIT_ARG_TYPE_SW 1
+#define SLJIT_ARG_TYPE_UW 2
+#define SLJIT_ARG_TYPE_S32 3
+#define SLJIT_ARG_TYPE_U32 4
+#define SLJIT_ARG_TYPE_F32 5
+#define SLJIT_ARG_TYPE_F64 6
+
+/* The following argument type definitions are used by sljit_emit_enter,
+   sljit_set_context, sljit_emit_call, and sljit_emit_icall functions.
+   The following return type definitions are used by sljit_emit_call
+   and sljit_emit_icall functions.
+
+   When a function is called, the first integer argument must be placed
+   in SLJIT_R0, the second in SLJIT_R1, and so on. Similarly the first
+   floating point argument must be placed in SLJIT_FR0, the second in
+   SLJIT_FR1, and so on.
+
+   Example function definition:
+ sljit_f32 SLJIT_FUNC example_c_callback(sljit_sw arg_a,
+ sljit_f64 arg_b, sljit_u32 arg_c, sljit_f32 arg_d);
+
+   Argument type definition:
+ SLJIT_DEF_RET(SLJIT_ARG_TYPE_F32)
+| SLJIT_DEF_ARG1(SLJIT_ARG_TYPE_SW) | 
SLJIT_DEF_ARG2(SLJIT_ARG_TYPE_F64)
+| SLJIT_DEF_ARG3(SLJIT_ARG_TYPE_U32) | 
SLJIT_DEF_ARG2(SLJIT_ARG_TYPE_F32)
+
+   Short form of argument type definition:
+ SLJIT_RET(F32) | SLJIT_ARG1(SW) | SLJIT_ARG2(F64)
+| SLJIT_ARG3(S32) | SLJIT_ARG4(F32)
+
+   Argument passing:
+ arg_a must be placed in SLJIT_R0
+ arg_c must be placed in SLJIT_R1
+ arg_b must be placed in SLJIT_FR0
+ arg_d must be placed in SLJIT_FR1
+
+Note:
+   The SLJIT_ARG_TYPE_VOID type is only supported by
+   SLJIT_DEF_RET, and SLJIT_ARG_TYPE_VOID is also the
+   default value when SLJIT_DEF_RET is not specified. */
+#define SLJIT_DEF_SHIFT 4
+#define SLJIT_DEF_RET(type) (type)
+#define SLJIT_DEF_ARG1(type) ((type) << SLJIT_DEF_SHIFT)
+#define SLJIT_DEF_ARG2(type) ((type) << (2 * SLJIT_DEF_SHIFT))
+#define SLJIT_DEF_ARG3(type) ((type) << (3 * SLJIT_DEF_SHIFT))
+#define SLJIT_DEF_ARG4(type) ((type) << (4 * SLJIT_DEF_SHIFT))
+
+/* Short form of the macros above.
+
+   For example the following definition:
+   SLJIT_DEF_RET(SLJIT_ARG_TYPE_SW) | SLJIT_DEF_ARG1(SLJIT_ARG_TYPE_F32)
+
+   can be shortened to:
+   SLJIT_RET(SW) | SLJIT_ARG1(F32)
+
+Note:
+   The VOID type is only supported by SLJIT_RET, and
+   VOID is also the default value when SLJIT_RET is
+   not specified. */
+#define SLJIT_RET(type) SLJIT_DEF_RET(SLJIT_ARG_TYPE_ ## type)
+#define SLJIT_ARG1(type) SLJIT_DEF_ARG1(SLJIT_ARG_TYPE_ ## type)
+#define SLJIT_ARG2(type) SLJIT_DEF_ARG2(SLJIT_ARG_TYPE_ ## type)
+#define SLJIT_ARG3(type) SLJIT_DEF_ARG3(SLJIT_ARG_TYPE_ ## type)
+#define SLJIT_ARG4(type) SLJIT_DEF_ARG4(SLJIT_ARG_TYPE_ ## type)
+
+/* - */
 /*  Main structures and functions*/
 /* 

svn commit: r1838867 [5/8] - in /tomcat/jk/trunk: native/iis/pcre/ native/iis/pcre/doc/html/ native/iis/pcre/m4/ native/iis/pcre/sljit/ native/iis/pcre/testdata/ xdocs/miscellaneous/

[rjung]

Modified: tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativeARM_64.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativeARM_64.c?rev=1838867=1838866=1838867=diff
==
--- tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativeARM_64.c (original)
+++ tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativeARM_64.c Fri Aug 24 
14:36:12 2018
@@ -36,15 +36,19 @@ typedef sljit_u32 sljit_ins;
 
 #define TMP_REG1   (SLJIT_NUMBER_OF_REGISTERS + 2)
 #define TMP_REG2   (SLJIT_NUMBER_OF_REGISTERS + 3)
-#define TMP_REG3   (SLJIT_NUMBER_OF_REGISTERS + 4)
-#define TMP_LR (SLJIT_NUMBER_OF_REGISTERS + 5)
-#define TMP_SP (SLJIT_NUMBER_OF_REGISTERS + 6)
+#define TMP_LR (SLJIT_NUMBER_OF_REGISTERS + 4)
+#define TMP_FP (SLJIT_NUMBER_OF_REGISTERS + 5)
 
-#define TMP_FREG1  (0)
-#define TMP_FREG2  (SLJIT_NUMBER_OF_FLOAT_REGISTERS + 1)
+#define TMP_FREG1  (SLJIT_NUMBER_OF_FLOAT_REGISTERS + 1)
+#define TMP_FREG2  (SLJIT_NUMBER_OF_FLOAT_REGISTERS + 2)
 
+/* r18 - platform register, currently not used */
 static const sljit_u8 reg_map[SLJIT_NUMBER_OF_REGISTERS + 8] = {
-  31, 0, 1, 2, 3, 4, 5, 6, 7, 12, 13, 14, 15, 16, 17, 8, 28, 27, 26, 25, 24, 
23, 22, 21, 20, 19, 29, 9, 10, 11, 30, 31
+   31, 0, 1, 2, 3, 4, 5, 6, 7, 11, 12, 13, 14, 15, 16, 17, 8, 28, 27, 26, 
25, 24, 23, 22, 21, 20, 19, 31, 9, 10, 30, 29
+};
+
+static const sljit_u8 freg_map[SLJIT_NUMBER_OF_FLOAT_REGISTERS + 3] = {
+   0, 0, 1, 2, 3, 4, 5, 6, 7
 };
 
 #define W_OP (1 << 31)
@@ -53,10 +57,10 @@ static const sljit_u8 reg_map[SLJIT_NUMB
 #define RN(rn) (reg_map[rn] << 5)
 #define RT2(rt2) (reg_map[rt2] << 10)
 #define RM(rm) (reg_map[rm] << 16)
-#define VD(vd) (vd)
-#define VT(vt) (vt)
-#define VN(vn) ((vn) << 5)
-#define VM(vm) ((vm) << 16)
+#define VD(vd) (freg_map[vd])
+#define VT(vt) (freg_map[vt])
+#define VN(vn) (freg_map[vn] << 5)
+#define VM(vm) (freg_map[vm] << 16)
 
 /* - */
 /*  Instrucion forms */
@@ -64,6 +68,7 @@ static const sljit_u8 reg_map[SLJIT_NUMB
 
 #define ADC 0x9a00
 #define ADD 0x8b00
+#define ADDE 0x8b20
 #define ADDI 0x9100
 #define AND 0x8a00
 #define ANDI 0x9200
@@ -92,7 +97,8 @@ static const sljit_u8 reg_map[SLJIT_NUMB
 #define FSUB 0x1e603800
 #define LDRI 0xf940
 #define LDP 0xa940
-#define LDP_PST 0xa8c0
+#define LDP_PRE 0xa9c0
+#define LDR_PRE 0xf8400c00
 #define LSLV 0x9ac02000
 #define LSRV 0x9ac02400
 #define MADD 0x9b00
@@ -112,10 +118,13 @@ static const sljit_u8 reg_map[SLJIT_NUMB
 #define SMULH 0x9b403c00
 #define STP 0xa900
 #define STP_PRE 0xa980
+#define STRB 0x38206800
+#define STRBI 0x3900
 #define STRI 0xf900
 #define STR_FI 0x3d00
 #define STR_FR 0x3c206800
 #define STUR_FI 0x3c00
+#define STURBI 0x3800
 #define SUB 0xcb00
 #define SUBI 0xd100
 #define SUBS 0xeb00
@@ -193,6 +202,7 @@ static SLJIT_INLINE sljit_s32 detect_jum
code_ptr[-2] = code_ptr[0];
return 2;
}
+
if (target_addr <= 0xl) {
if (jump->flags & IS_COND)
code_ptr[-5] -= (1 << 5);
@@ -335,7 +345,6 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit
return 1;
 #endif
 
-   case SLJIT_HAS_PRE_UPDATE:
case SLJIT_HAS_CLZ:
case SLJIT_HAS_CMOV:
return 1;
@@ -394,12 +403,14 @@ static sljit_ins logical_imm(sljit_sw im
 
SLJIT_ASSERT((len == 32 && imm != 0 && imm != -1)
|| (len == 16 && (sljit_s32)imm != 0 && (sljit_s32)imm != -1));
+
uimm = (sljit_uw)imm;
while (1) {
if (len <= 0) {
SLJIT_UNREACHABLE();
return 0;
}
+
mask = ((sljit_uw)1 << len) - 1;
if ((uimm & mask) != ((uimm >> len) & mask))
break;
@@ -448,39 +459,42 @@ static sljit_s32 load_immediate(struct s
sljit_s32 i, zeros, ones, first;
sljit_ins bitmask;
 
+   /* Handling simple immediates first. */
if (imm <= 0x)
return push_inst(compiler, MOVZ | RD(dst) | (imm << 5));
 
-   if (simm >= -0x1 && simm < 0)
+   if (simm < 0 && simm >= -0x1)
return push_inst(compiler, MOVN | RD(dst) | ((~imm & 0x) << 
5));
 
if (imm <= 0xl) {
+   if ((imm & 0x) == 0)
+   return push_inst(compiler, MOVZ | RD(dst) | ((imm >> 
16) << 5) | (1 << 21));
if ((imm & 0xl) == 0x)
return push_inst(compiler, (MOVN ^ W_OP) | RD(dst) | 
((~imm & 0x) << 5));
if ((imm & 0x) == 0x)
return push_inst(compiler, (MOVN ^ W_OP) | RD(dst) 

svn commit: r1838867 [6/8] - in /tomcat/jk/trunk: native/iis/pcre/ native/iis/pcre/doc/html/ native/iis/pcre/m4/ native/iis/pcre/sljit/ native/iis/pcre/testdata/ xdocs/miscellaneous/

[rjung]

Modified: tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativeMIPS_32.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativeMIPS_32.c?rev=1838867=1838866=1838867=diff
==
--- tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativeMIPS_32.c (original)
+++ tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativeMIPS_32.c Fri Aug 24 
14:36:12 2018
@@ -435,3 +435,232 @@ SLJIT_API_FUNC_ATTRIBUTE void sljit_set_
inst = (sljit_ins *)SLJIT_ADD_EXEC_OFFSET(inst, executable_offset);
SLJIT_CACHE_FLUSH(inst, inst + 2);
 }
+
+static sljit_s32 call_with_args(struct sljit_compiler *compiler, sljit_s32 
arg_types, sljit_ins *ins_ptr)
+{
+   sljit_s32 stack_offset = 0;
+   sljit_s32 arg_count = 0;
+   sljit_s32 float_arg_count = 0;
+   sljit_s32 word_arg_count = 0;
+   sljit_s32 types = 0;
+   sljit_s32 arg_count_save, types_save;
+   sljit_ins prev_ins = NOP;
+   sljit_ins ins = NOP;
+   sljit_u8 offsets[4];
+
+   SLJIT_ASSERT(reg_map[TMP_REG1] == 4 && freg_map[TMP_FREG1] == 12);
+
+   arg_types >>= SLJIT_DEF_SHIFT;
+
+   while (arg_types) {
+   types = (types << SLJIT_DEF_SHIFT) | (arg_types & 
SLJIT_DEF_MASK);
+
+   switch (arg_types & SLJIT_DEF_MASK) {
+   case SLJIT_ARG_TYPE_F32:
+   offsets[arg_count] = (sljit_u8)stack_offset;
+
+   if (word_arg_count == 0 && arg_count <= 1)
+   offsets[arg_count] = 254 + arg_count;
+
+   stack_offset += sizeof(sljit_f32);
+   arg_count++;
+   float_arg_count++;
+   break;
+   case SLJIT_ARG_TYPE_F64:
+   if (stack_offset & 0x7)
+   stack_offset += sizeof(sljit_sw);
+   offsets[arg_count] = (sljit_u8)stack_offset;
+
+   if (word_arg_count == 0 && arg_count <= 1)
+   offsets[arg_count] = 254 + arg_count;
+
+   stack_offset += sizeof(sljit_f64);
+   arg_count++;
+   float_arg_count++;
+   break;
+   default:
+   offsets[arg_count] = (sljit_u8)stack_offset;
+   stack_offset += sizeof(sljit_sw);
+   arg_count++;
+   word_arg_count++;
+   break;
+   }
+
+   arg_types >>= SLJIT_DEF_SHIFT;
+   }
+
+   /* Stack is aligned to 16 bytes, max two doubles can be placed on the 
stack. */
+   if (stack_offset > 16)
+   FAIL_IF(push_inst(compiler, ADDIU | S(SLJIT_SP) | T(SLJIT_SP) | 
IMM(-16), DR(SLJIT_SP)));
+
+   types_save = types;
+   arg_count_save = arg_count;
+
+   while (types) {
+   switch (types & SLJIT_DEF_MASK) {
+   case SLJIT_ARG_TYPE_F32:
+   arg_count--;
+   if (offsets[arg_count] < 254)
+   ins = SWC1 | S(SLJIT_SP) | FT(float_arg_count) 
| IMM(offsets[arg_count]);
+   float_arg_count--;
+   break;
+   case SLJIT_ARG_TYPE_F64:
+   arg_count--;
+   if (offsets[arg_count] < 254)
+   ins = SDC1 | S(SLJIT_SP) | FT(float_arg_count) 
| IMM(offsets[arg_count]);
+   float_arg_count--;
+   break;
+   default:
+   if (offsets[arg_count - 1] >= 16)
+   ins = SW | S(SLJIT_SP) | T(word_arg_count) | 
IMM(offsets[arg_count - 1]);
+   else if (arg_count != word_arg_count)
+   ins = ADDU | S(word_arg_count) | TA(0) | DA(4 + 
(offsets[arg_count - 1] >> 2));
+   else if (arg_count == 1)
+   ins = ADDU | S(SLJIT_R0) | TA(0) | DA(4);
+
+   arg_count--;
+   word_arg_count--;
+   break;
+   }
+
+   if (ins != NOP) {
+   if (prev_ins != NOP)
+   FAIL_IF(push_inst(compiler, prev_ins, 
MOVABLE_INS));
+   prev_ins = ins;
+   ins = NOP;
+   }
+
+   types >>= SLJIT_DEF_SHIFT;
+   }
+
+   types = types_save;
+   arg_count = arg_count_save;
+
+   while (types) {
+   switch (types & SLJIT_DEF_MASK) {
+   case SLJIT_ARG_TYPE_F32:
+   arg_count--;
+   if (offsets[arg_count] == 254)
+   ins = MOV_S | FMT_S | FS(SLJIT_FR0) | 
FD(TMP_FREG1);
+   else if (offsets[arg_count] < 16)
+ 

svn commit: r1838867 [8/8] - in /tomcat/jk/trunk: native/iis/pcre/ native/iis/pcre/doc/html/ native/iis/pcre/m4/ native/iis/pcre/sljit/ native/iis/pcre/testdata/ xdocs/miscellaneous/

[rjung]

Modified: tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativeX86_32.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativeX86_32.c?rev=1838867=1838866=1838867=diff
==
--- tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativeX86_32.c (original)
+++ tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativeX86_32.c Fri Aug 24 
14:36:12 2018
@@ -64,29 +64,28 @@ static sljit_u8* generate_far_jump_code(
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler 
*compiler,
-   sljit_s32 options, sljit_s32 args, sljit_s32 scratches, sljit_s32 
saveds,
+   sljit_s32 options, sljit_s32 arg_types, sljit_s32 scratches, sljit_s32 
saveds,
sljit_s32 fscratches, sljit_s32 fsaveds, sljit_s32 local_size)
 {
-   sljit_s32 size;
+   sljit_s32 args, size;
sljit_u8 *inst;
 
CHECK_ERROR();
-   CHECK(check_sljit_emit_enter(compiler, options, args, scratches, 
saveds, fscratches, fsaveds, local_size));
-   set_emit_enter(compiler, options, args, scratches, saveds, fscratches, 
fsaveds, local_size);
+   CHECK(check_sljit_emit_enter(compiler, options, arg_types, scratches, 
saveds, fscratches, fsaveds, local_size));
+   set_emit_enter(compiler, options, arg_types, scratches, saveds, 
fscratches, fsaveds, local_size);
 
+   args = get_arg_count(arg_types);
compiler->args = args;
 
-#if (defined SLJIT_X86_32_FASTCALL && SLJIT_X86_32_FASTCALL)
-   /* [esp+0] for saving temporaries and third argument for calls. */
-   compiler->saveds_offset = 1 * sizeof(sljit_sw);
-#else
-   /* [esp+0] for saving temporaries and space for maximum three 
arguments. */
-   if (scratches <= 1)
-   compiler->saveds_offset = 1 * sizeof(sljit_sw);
-   else
-   compiler->saveds_offset = ((scratches == 2) ? 2 : 3) * 
sizeof(sljit_sw);
+   /* [esp+0] for saving temporaries and function calls. */
+   compiler->stack_tmp_size = 2 * sizeof(sljit_sw);
+
+#if !(defined SLJIT_X86_32_FASTCALL && SLJIT_X86_32_FASTCALL)
+   if (scratches > 3)
+   compiler->stack_tmp_size = 3 * sizeof(sljit_sw);
 #endif
 
+   compiler->saveds_offset = compiler->stack_tmp_size;
if (scratches > 3)
compiler->saveds_offset += ((scratches > (3 + 6)) ? 6 : 
(scratches - 3)) * sizeof(sljit_sw);
 
@@ -124,34 +123,38 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit
 
 #if (defined SLJIT_X86_32_FASTCALL && SLJIT_X86_32_FASTCALL)
if (args > 0) {
-   *inst++ = MOV_r_rm;
-   *inst++ = MOD_REG | (reg_map[SLJIT_S0] << 3) | 
reg_map[SLJIT_R2];
+   inst[0] = MOV_r_rm;
+   inst[1] = MOD_REG | (reg_map[SLJIT_S0] << 3) | 
reg_map[SLJIT_R2];
+   inst += 2;
}
if (args > 1) {
-   *inst++ = MOV_r_rm;
-   *inst++ = MOD_REG | (reg_map[SLJIT_S1] << 3) | 
reg_map[SLJIT_R1];
+   inst[0] = MOV_r_rm;
+   inst[1] = MOD_REG | (reg_map[SLJIT_S1] << 3) | 
reg_map[SLJIT_R1];
+   inst += 2;
}
if (args > 2) {
-   *inst++ = MOV_r_rm;
-   *inst++ = MOD_DISP8 | (reg_map[SLJIT_S2] << 3) | 0x4 /* esp */;
-   *inst++ = 0x24;
-   *inst++ = sizeof(sljit_sw) * (3 + 2); /* saveds >= 3 as well. */
+   inst[0] = MOV_r_rm;
+   inst[1] = MOD_DISP8 | (reg_map[SLJIT_S2] << 3) | 0x4 /* esp */;
+   inst[2] = 0x24;
+   inst[3] = sizeof(sljit_sw) * (3 + 2); /* saveds >= 3 as well. */
}
 #else
if (args > 0) {
-   *inst++ = MOV_r_rm;
-   *inst++ = MOD_DISP8 | (reg_map[SLJIT_S0] << 3) | 
reg_map[TMP_REG1];
-   *inst++ = sizeof(sljit_sw) * 2;
+   inst[0] = MOV_r_rm;
+   inst[1] = MOD_DISP8 | (reg_map[SLJIT_S0] << 3) | 
reg_map[TMP_REG1];
+   inst[2] = sizeof(sljit_sw) * 2;
+   inst += 3;
}
if (args > 1) {
-   *inst++ = MOV_r_rm;
-   *inst++ = MOD_DISP8 | (reg_map[SLJIT_S1] << 3) | 
reg_map[TMP_REG1];
-   *inst++ = sizeof(sljit_sw) * 3;
+   inst[0] = MOV_r_rm;
+   inst[1] = MOD_DISP8 | (reg_map[SLJIT_S1] << 3) | 
reg_map[TMP_REG1];
+   inst[2] = sizeof(sljit_sw) * 3;
+   inst += 3;
}
if (args > 2) {
-   *inst++ = MOV_r_rm;
-   *inst++ = MOD_DISP8 | (reg_map[SLJIT_S2] << 3) | 
reg_map[TMP_REG1];
-   *inst++ = sizeof(sljit_sw) * 4;
+   inst[0] = MOV_r_rm;
+   inst[1] = MOD_DISP8 | (reg_map[SLJIT_S2] << 3) | 
reg_map[TMP_REG1];
+   inst[2] = sizeof(sljit_sw) * 4;
}
 #endif
 
@@ -171,17 +174,36 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit
compiler->local_size = local_size;
 
 #ifdef _WIN32
-   if (local_size > 1024) {
-#if 

svn commit: r1838867 [1/8] - in /tomcat/jk/trunk: native/iis/pcre/ native/iis/pcre/doc/html/ native/iis/pcre/m4/ native/iis/pcre/sljit/ native/iis/pcre/testdata/ xdocs/miscellaneous/

[rjung]

Author: rjung
Date: Fri Aug 24 14:36:12 2018
New Revision: 1838867

URL: http://svn.apache.org/viewvc?rev=1838867=rev
Log:
Update PCRE bundled with the ISAPI redirector
to 8.42.

Modified:
tomcat/jk/trunk/native/iis/pcre/AUTHORS
tomcat/jk/trunk/native/iis/pcre/ChangeLog
tomcat/jk/trunk/native/iis/pcre/INSTALL
tomcat/jk/trunk/native/iis/pcre/LICENCE
tomcat/jk/trunk/native/iis/pcre/Makefile.in
tomcat/jk/trunk/native/iis/pcre/NEWS
tomcat/jk/trunk/native/iis/pcre/NON-AUTOTOOLS-BUILD
tomcat/jk/trunk/native/iis/pcre/aclocal.m4
tomcat/jk/trunk/native/iis/pcre/ar-lib
tomcat/jk/trunk/native/iis/pcre/compile
tomcat/jk/trunk/native/iis/pcre/config.guess
tomcat/jk/trunk/native/iis/pcre/config.h.generic
tomcat/jk/trunk/native/iis/pcre/config.hw
tomcat/jk/trunk/native/iis/pcre/config.sub
tomcat/jk/trunk/native/iis/pcre/configure
tomcat/jk/trunk/native/iis/pcre/configure.ac
tomcat/jk/trunk/native/iis/pcre/depcomp
tomcat/jk/trunk/native/iis/pcre/doc/html/NON-AUTOTOOLS-BUILD.txt
tomcat/jk/trunk/native/iis/pcre/install-sh
tomcat/jk/trunk/native/iis/pcre/ltmain.sh
tomcat/jk/trunk/native/iis/pcre/m4/libtool.m4
tomcat/jk/trunk/native/iis/pcre/m4/ltoptions.m4
tomcat/jk/trunk/native/iis/pcre/m4/ltsugar.m4
tomcat/jk/trunk/native/iis/pcre/m4/ltversion.m4
tomcat/jk/trunk/native/iis/pcre/m4/lt~obsolete.m4
tomcat/jk/trunk/native/iis/pcre/missing
tomcat/jk/trunk/native/iis/pcre/pcre.h.generic
tomcat/jk/trunk/native/iis/pcre/pcre.h.in
tomcat/jk/trunk/native/iis/pcre/pcre_compile.c
tomcat/jk/trunk/native/iis/pcre/pcre_dfa_exec.c
tomcat/jk/trunk/native/iis/pcre/pcre_exec.c
tomcat/jk/trunk/native/iis/pcre/pcre_jit_compile.c
tomcat/jk/trunk/native/iis/pcre/pcregrep.c
tomcat/jk/trunk/native/iis/pcre/pcreposix.c
tomcat/jk/trunk/native/iis/pcre/sljit/sljitConfig.h
tomcat/jk/trunk/native/iis/pcre/sljit/sljitConfigInternal.h
tomcat/jk/trunk/native/iis/pcre/sljit/sljitLir.c
tomcat/jk/trunk/native/iis/pcre/sljit/sljitLir.h
tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativeARM_32.c
tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativeARM_64.c
tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativeARM_T2_32.c
tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativeMIPS_32.c
tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativeMIPS_64.c
tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativeMIPS_common.c
tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativePPC_64.c
tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativePPC_common.c
tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativeSPARC_32.c
tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativeSPARC_common.c
tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativeX86_32.c
tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativeX86_64.c
tomcat/jk/trunk/native/iis/pcre/sljit/sljitNativeX86_common.c
tomcat/jk/trunk/native/iis/pcre/sljit/sljitUtils.c
tomcat/jk/trunk/native/iis/pcre/test-driver
tomcat/jk/trunk/native/iis/pcre/testdata/testinput2
tomcat/jk/trunk/native/iis/pcre/testdata/testinput5
tomcat/jk/trunk/native/iis/pcre/testdata/testoutput2
tomcat/jk/trunk/native/iis/pcre/testdata/testoutput5
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/jk/trunk/native/iis/pcre/AUTHORS
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/AUTHORS?rev=1838867=1838866=1838867=diff
==
--- tomcat/jk/trunk/native/iis/pcre/AUTHORS (original)
+++ tomcat/jk/trunk/native/iis/pcre/AUTHORS Fri Aug 24 14:36:12 2018
@@ -8,7 +8,7 @@ Email domain: cam.ac.uk
 University of Cambridge Computing Service,
 Cambridge, England.
 
-Copyright (c) 1997-2017 University of Cambridge
+Copyright (c) 1997-2018 University of Cambridge
 All rights reserved
 
 
@@ -19,7 +19,7 @@ Written by:   Zoltan Herczeg
 Email local part: hzmester
 Emain domain: freemail.hu
 
-Copyright(c) 2010-2017 Zoltan Herczeg
+Copyright(c) 2010-2018 Zoltan Herczeg
 All rights reserved.
 
 
@@ -30,7 +30,7 @@ Written by:   Zoltan Herczeg
 Email local part: hzmester
 Emain domain: freemail.hu
 
-Copyright(c) 2009-2017 Zoltan Herczeg
+Copyright(c) 2009-2018 Zoltan Herczeg
 All rights reserved.
 
 

Modified: tomcat/jk/trunk/native/iis/pcre/ChangeLog
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/ChangeLog?rev=1838867=1838866=1838867=diff
==
--- tomcat/jk/trunk/native/iis/pcre/ChangeLog (original)
+++ tomcat/jk/trunk/native/iis/pcre/ChangeLog Fri Aug 24 14:36:12 2018
@@ -4,6 +4,59 @@ ChangeLog for PCRE
 Note that the PCRE 8.xx series (PCRE1) is now in a bugfix-only state. All
 development is happening in the PCRE2 10.xx series.
 
+
+Version 8.42 20-March-2018
+--
+
+1.  Fixed a MIPS issue in the JIT compiler reported by Joshua Kinard.
+
+2.  Fixed 

svn commit: r1838867 [3/8] - in /tomcat/jk/trunk: native/iis/pcre/ native/iis/pcre/doc/html/ native/iis/pcre/m4/ native/iis/pcre/sljit/ native/iis/pcre/testdata/ xdocs/miscellaneous/

[rjung]

Modified: tomcat/jk/trunk/native/iis/pcre/pcre_jit_compile.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/pcre_jit_compile.c?rev=1838867=1838866=1838867=diff
==
--- tomcat/jk/trunk/native/iis/pcre/pcre_jit_compile.c (original)
+++ tomcat/jk/trunk/native/iis/pcre/pcre_jit_compile.c Fri Aug 24 14:36:12 2018
@@ -164,7 +164,6 @@ typedef struct jit_arguments {
   const pcre_uchar *begin;
   const pcre_uchar *end;
   int *offsets;
-  pcre_uchar *uchar_ptr;
   pcre_uchar *mark_ptr;
   void *callout_data;
   /* Everything else after. */
@@ -214,7 +213,7 @@ enum control_types {
   type_then_trap = 1
 };
 
-typedef int (SLJIT_CALL *jit_function)(jit_arguments *args);
+typedef int (SLJIT_FUNC *jit_function)(jit_arguments *args);
 
 /* The following structure is the key data type for the recursive
 code generator. It is allocated by compile_matchingpath, and contains
@@ -489,9 +488,24 @@ typedef struct compare_context {
 /* Used for accessing the elements of the stack. */
 #define STACK(i)  ((i) * (int)sizeof(sljit_sw))
 
+#ifdef SLJIT_PREF_SHIFT_REG
+#if SLJIT_PREF_SHIFT_REG == SLJIT_R2
+/* Nothing. */
+#elif SLJIT_PREF_SHIFT_REG == SLJIT_R3
+#define SHIFT_REG_IS_R3
+#else
+#error "Unsupported shift register"
+#endif
+#endif
+
 #define TMP1  SLJIT_R0
+#ifdef SHIFT_REG_IS_R3
+#define TMP2  SLJIT_R3
+#define TMP3  SLJIT_R2
+#else
 #define TMP2  SLJIT_R2
 #define TMP3  SLJIT_R3
+#endif
 #define STR_PTR   SLJIT_S0
 #define STR_END   SLJIT_S1
 #define STACK_TOP SLJIT_R1
@@ -520,13 +534,10 @@ the start pointers when the end of the c
 
 #if defined COMPILE_PCRE8
 #define MOV_UCHAR  SLJIT_MOV_U8
-#define MOVU_UCHAR SLJIT_MOVU_U8
 #elif defined COMPILE_PCRE16
 #define MOV_UCHAR  SLJIT_MOV_U16
-#define MOVU_UCHAR SLJIT_MOVU_U16
 #elif defined COMPILE_PCRE32
 #define MOV_UCHAR  SLJIT_MOV_U32
-#define MOVU_UCHAR SLJIT_MOVU_U32
 #else
 #error Unsupported compiling mode
 #endif
@@ -2383,12 +2394,25 @@ if (length < 8)
   }
 else
   {
-  GET_LOCAL_BASE(SLJIT_R1, 0, OVECTOR_START);
-  OP1(SLJIT_MOV, SLJIT_R2, 0, SLJIT_IMM, length - 1);
-  loop = LABEL();
-  OP1(SLJIT_MOVU, SLJIT_MEM1(SLJIT_R1), sizeof(sljit_sw), SLJIT_R0, 0);
-  OP2(SLJIT_SUB | SLJIT_SET_Z, SLJIT_R2, 0, SLJIT_R2, 0, SLJIT_IMM, 1);
-  JUMPTO(SLJIT_NOT_ZERO, loop);
+  if (sljit_emit_mem(compiler, SLJIT_MOV | SLJIT_MEM_SUPP | SLJIT_MEM_STORE | 
SLJIT_MEM_PRE, SLJIT_R0, SLJIT_MEM1(SLJIT_R1), sizeof(sljit_sw)) == 
SLJIT_SUCCESS)
+{
+GET_LOCAL_BASE(SLJIT_R1, 0, OVECTOR_START);
+OP1(SLJIT_MOV, SLJIT_R2, 0, SLJIT_IMM, length - 1);
+loop = LABEL();
+sljit_emit_mem(compiler, SLJIT_MOV | SLJIT_MEM_STORE | SLJIT_MEM_PRE, 
SLJIT_R0, SLJIT_MEM1(SLJIT_R1), sizeof(sljit_sw));
+OP2(SLJIT_SUB | SLJIT_SET_Z, SLJIT_R2, 0, SLJIT_R2, 0, SLJIT_IMM, 1);
+JUMPTO(SLJIT_NOT_ZERO, loop);
+}
+  else
+{
+GET_LOCAL_BASE(SLJIT_R1, 0, OVECTOR_START + sizeof(sljit_sw));
+OP1(SLJIT_MOV, SLJIT_R2, 0, SLJIT_IMM, length - 1);
+loop = LABEL();
+OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_R1), 0, SLJIT_R0, 0);
+OP2(SLJIT_ADD, SLJIT_R1, 0, SLJIT_R1, 0, SLJIT_IMM, sizeof(sljit_sw));
+OP2(SLJIT_SUB | SLJIT_SET_Z, SLJIT_R2, 0, SLJIT_R2, 0, SLJIT_IMM, 1);
+JUMPTO(SLJIT_NOT_ZERO, loop);
+}
   }
 }
 
@@ -2421,12 +2445,25 @@ if (length < 8)
   }
 else
   {
-  GET_LOCAL_BASE(TMP2, 0, OVECTOR_START + sizeof(sljit_sw));
-  OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_IMM, length - 2);
-  loop = LABEL();
-  OP1(SLJIT_MOVU, SLJIT_MEM1(TMP2), sizeof(sljit_sw), TMP1, 0);
-  OP2(SLJIT_SUB | SLJIT_SET_Z, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, 1);
-  JUMPTO(SLJIT_NOT_ZERO, loop);
+  if (sljit_emit_mem(compiler, SLJIT_MOV | SLJIT_MEM_SUPP | SLJIT_MEM_STORE | 
SLJIT_MEM_PRE, TMP1, SLJIT_MEM1(TMP2), sizeof(sljit_sw)) == SLJIT_SUCCESS)
+{
+GET_LOCAL_BASE(TMP2, 0, OVECTOR_START + sizeof(sljit_sw));
+OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_IMM, length - 2);
+loop = LABEL();
+sljit_emit_mem(compiler, SLJIT_MOV | SLJIT_MEM_STORE | SLJIT_MEM_PRE, 
TMP1, SLJIT_MEM1(TMP2), sizeof(sljit_sw));
+OP2(SLJIT_SUB | SLJIT_SET_Z, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, 1);
+JUMPTO(SLJIT_NOT_ZERO, loop);
+}
+  else
+{
+GET_LOCAL_BASE(TMP2, 0, OVECTOR_START + 2 * sizeof(sljit_sw));
+OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_IMM, length - 2);
+loop = LABEL();
+OP1(SLJIT_MOV, SLJIT_MEM1(TMP2), 0, TMP1, 0);
+OP2(SLJIT_ADD, TMP2, 0, TMP2, 0, SLJIT_IMM, sizeof(sljit_sw));
+OP2(SLJIT_SUB | SLJIT_SET_Z, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, 1);
+JUMPTO(SLJIT_NOT_ZERO, loop);
+}
   }
 
 OP1(SLJIT_MOV, STACK_TOP, 0, ARGUMENTS, 0);
@@ -2436,10 +2473,10 @@ if (common->control_head_ptr != 0)
   OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->control_head_ptr, SLJIT_IMM, 0);
 OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(STACK_TOP), 
SLJIT_OFFSETOF(jit_arguments, stack));
 OP1(SLJIT_MOV, TMP1, 0, 

svn commit: r1838867 [2/8] - in /tomcat/jk/trunk: native/iis/pcre/ native/iis/pcre/doc/html/ native/iis/pcre/m4/ native/iis/pcre/sljit/ native/iis/pcre/testdata/ xdocs/miscellaneous/

[rjung]

Modified: tomcat/jk/trunk/native/iis/pcre/doc/html/NON-AUTOTOOLS-BUILD.txt
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/doc/html/NON-AUTOTOOLS-BUILD.txt?rev=1838867=1838866=1838867=diff
==
--- tomcat/jk/trunk/native/iis/pcre/doc/html/NON-AUTOTOOLS-BUILD.txt (original)
+++ tomcat/jk/trunk/native/iis/pcre/doc/html/NON-AUTOTOOLS-BUILD.txt Fri Aug 24 
14:36:12 2018
@@ -760,13 +760,14 @@ The character code used is EBCDIC, not A
 applications can be supported through UNIX System Services, and in such an
 environment PCRE can be built in the same way as in other systems. However, in
 native z/OS (without UNIX System Services) and in z/VM, special ports are
-required. For details, please see this web site:
+required. PCRE1 version 8.39 is available in file 882 on this site:
 
-  http://www.zaconsultants.net
+  http://www.cbttape.org
 
-You may download PCRE from WWW.CBTTAPE.ORG, file 882.  Everything, source and
-executable, is in EBCDIC and native z/OS file formats and this is the
-recommended download site.
+Everything, source and executable, is in EBCDIC and native z/OS file formats.
+However, this software is not maintained and will not be upgraded. If you are
+new to PCRE you should be looking at PCRE2 (version 10.30 or later).
 
-==
-Last Updated: 25 June 2015
+===
+Last Updated: 13 September 2017
+===

Modified: tomcat/jk/trunk/native/iis/pcre/install-sh
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/install-sh?rev=1838867=1838866=1838867=diff
==
--- tomcat/jk/trunk/native/iis/pcre/install-sh (original)
+++ tomcat/jk/trunk/native/iis/pcre/install-sh Fri Aug 24 14:36:12 2018
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2013-12-25.23; # UTC
+scriptversion=2016-01-11.22; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -496,6 +496,6 @@ done
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:

Modified: tomcat/jk/trunk/native/iis/pcre/ltmain.sh
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/ltmain.sh?rev=1838867=1838866=1838867=diff
==
--- tomcat/jk/trunk/native/iis/pcre/ltmain.sh (original)
+++ tomcat/jk/trunk/native/iis/pcre/ltmain.sh Fri Aug 24 14:36:12 2018
@@ -1,12 +1,12 @@
 #! /bin/sh
 ## DO NOT EDIT - This file generated from ./build-aux/ltmain.in
-##   by inline-source v2014-01-03.01
+##   by inline-source v2016-02-21.11
 
-# libtool (GNU libtool) 2.4.6
+# libtool (GNU libtool) 2.4.6.40-6ca5-dirty
 # Provide generalized library-building support services.
 # Written by Gordon Matzigkeit , 1996
 
-# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -31,8 +31,8 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION=2.4.6
-package_revision=2.4.6
+VERSION=2.4.6.40-6ca5-dirty
+package_revision=2.4.6.40
 
 
 ## -- ##
@@ -64,34 +64,25 @@ package_revision=2.4.6
 # libraries, which are installed to $pkgauxdir.
 
 # Set a version string for this script.
-scriptversion=2015-01-20.17; # UTC
+scriptversion=2017-04-19.12; # UTC
 
 # General shell script boiler plate, and helper functions.
 # Written by Gary V. Vaughan, 2004
 
-# Copyright (C) 2004-2015 Free Software Foundation, Inc.
-# This is free software; see the source for copying conditions.  There is NO
-# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-
-# As a special exception to the GNU General Public License, if you distribute
-# this file as part of a program or library that is built using GNU Libtool,
-# you may include this file under the same distribution terms that you use
-# for the rest of that program.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNES FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program. If 

svn commit: r1838859 - /tomcat/jk/trunk/native/apache-2.0/mod_jk.c

[markt]

Author: markt
Date: Fri Aug 24 13:46:41 2018
New Revision: 1838859

URL: http://svn.apache.org/viewvc?rev=1838859=rev
Log:
Typos

Modified:
tomcat/jk/trunk/native/apache-2.0/mod_jk.c

Modified: tomcat/jk/trunk/native/apache-2.0/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/mod_jk.c?rev=1838859=1838858=1838859=diff
==
--- tomcat/jk/trunk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-2.0/mod_jk.c Fri Aug 24 13:46:41 2018
@@ -382,7 +382,7 @@ static int JK_METHOD ws_start_response(j
 ap_content_type_tolower(tmp);
 /* It should be done like this in Apache 2.0 */
 /* This way, Apache 2.0 will be able to set the output filter */
-/* and it make jk useable with deflate using */
+/* and it make jk usable with deflate using */
 /* AddOutputFilterByType DEFLATE text/html */
 ap_set_content_type(r, tmp);
 }
@@ -991,13 +991,13 @@ static int init_ws_service(apache_privat
  *
  * We use JkOptions to determine which method to be used
  *
- * ap_escape_uri is the latest recommanded but require
+ * ap_escape_uri is the latest recommended but require
  *   some java decoding (in TC 3.3 rc2)
  *
  * unparsed_uri is used for strict compliance with spec and
  *  old Tomcat (3.2.3 for example)
  *
- * uri is use for compatibilty with mod_rewrite with old Tomcats
+ * uri is use for compatibility with mod_rewrite with old Tomcats
  */
 
 switch (conf->options & JK_OPT_FWDURIMASK) {
@@ -1974,7 +1974,7 @@ static apr_array_header_t *parse_request
  *  otherwise an empty string)
  * %r - First line of request
  * %s - request HTTP status code
- * %T - Requset duration, elapsed time to handle request in seconds '.' micro 
seconds
+ * %T - Request duration, elapsed time to handle request in seconds '.' micro 
seconds
  * %U - The URL path requested, not including any query string.
  * %v - The canonical ServerName of the server serving the request.
  * %V - The server name according to the UseCanonicalName setting.
@@ -2752,7 +2752,7 @@ static int jk_handler(request_rec * r)
 worker_name = apr_table_get(r->subprocess_env, 
xconf->worker_indicator);
 if (worker_name) {
   /* The JkWorkerIndicator environment variable has
-   * been used to explicitely set the worker without JkMount.
+   * been used to explicitly set the worker without JkMount.
* This is useful in combination with LocationMatch or mod_rewrite.
*/
 if (JK_IS_DEBUG_LEVEL(xconf->log))
@@ -2774,7 +2774,7 @@ static int jk_handler(request_rec * r)
   /** We have a single worker ( the common case ).
   ( lb is a bit special, it should count as a single worker but
   I'm not sure how ). We also have a manual config directive that
-  explicitely give control to us. */
+  explicitly give control to us. */
 worker_name = worker_env.worker_list[0];
 if (JK_IS_DEBUG_LEVEL(xconf->log))
 jk_log(xconf->log, JK_LOG_DEBUG,



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

svn commit: r1838857 - in /tomcat/jk/trunk/native: apache-2.0/mod_jk.c common/jk_uri_worker_map.c common/jk_util.c common/jk_util.h

[markt]

Author: markt
Date: Fri Aug 24 13:43:34 2018
New Revision: 1838857

URL: http://svn.apache.org/viewvc?rev=1838857=rev
Log:
Further normalization clean-up

Modified:
tomcat/jk/trunk/native/apache-2.0/mod_jk.c
tomcat/jk/trunk/native/common/jk_uri_worker_map.c
tomcat/jk/trunk/native/common/jk_util.c
tomcat/jk/trunk/native/common/jk_util.h

Modified: tomcat/jk/trunk/native/apache-2.0/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/mod_jk.c?rev=1838857=1838856=1838857=diff
==
--- tomcat/jk/trunk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-2.0/mod_jk.c Fri Aug 24 13:43:34 2018
@@ -2791,7 +2791,14 @@ static int jk_handler(request_rec * r)
 }
 else {
 rule_extension_t *e;
-worker_name = map_uri_to_worker_ext(xconf->uw_map, r->uri,
+char *clean_uri;
+clean_uri = apr_pstrdup(r->pool, r->uri);
+rc = jk_servlet_normalize(clean_uri, xconf->log);
+if (rc != 0) {
+   return HTTP_NOT_FOUND;
+}
+
+worker_name = map_uri_to_worker_ext(xconf->uw_map, clean_uri,
 NULL, , NULL, 
xconf->log);
 rconf = (jk_request_conf_t 
*)ap_get_module_config(r->request_config,
   _module);

Modified: tomcat/jk/trunk/native/common/jk_uri_worker_map.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_uri_worker_map.c?rev=1838857=1838856=1838857=diff
==
--- tomcat/jk/trunk/native/common/jk_uri_worker_map.c (original)
+++ tomcat/jk/trunk/native/common/jk_uri_worker_map.c Fri Aug 24 13:43:34 2018
@@ -1175,12 +1175,6 @@ const char *map_uri_to_worker_ext(jk_uri
 jk_log(l, JK_LOG_DEBUG, "Found session identifier '%s' in url 
'%s'",
url_rewrite, uri);
 }
-if (collapse_slashes == JK_COLLAPSE_ALL) {
-/* Remove multiple slashes
- * No need to copy url, because it is local and
- * the unchanged url is no longer needed */
-jk_no2slash(url);
-}
 if (JK_IS_DEBUG_LEVEL(l))
 jk_log(l, JK_LOG_DEBUG, "Attempting to map URI '%s' from %d maps",
url, IND_THIS(uw_map->size));
@@ -1193,13 +1187,6 @@ const char *map_uri_to_worker_ext(jk_uri
 /* In case we found a match, check for the unmounts. */
 if (rv >= 0 && IND_THIS(uw_map->nosize)) {
 int rc;
-if (collapse_slashes == JK_COLLAPSE_UNMOUNT) {
-/* Remove multiple slashes when looking for
- * unmount to prevent trivial unmount bypass attack.
- * No need to copy url, because it is local and
- * the unchanged url is no longer needed */
-jk_no2slash(url);
-}
 /* Again first including vhost. */
 rc = is_nomatch(uw_map, url, rv, l);
 /* If no unmount was found, try without vhost. */

Modified: tomcat/jk/trunk/native/common/jk_util.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_util.c?rev=1838857=1838856=1838857=diff
==
--- tomcat/jk/trunk/native/common/jk_util.c (original)
+++ tomcat/jk/trunk/native/common/jk_util.c Fri Aug 24 13:43:34 2018
@@ -2177,25 +2177,6 @@ int jk_wildchar_match(const char *str, c
 return (str[x] != '\0');
 }
 
-void jk_no2slash(char *name)
-{
-char *d, *s;
-
-s = d = name;
-
-while (*s) {
-if ((*d++ = *s) == '/') {
-do {
-++s;
-} while (*s == '/');
-}
-else {
-++s;
-}
-}
-*d = '\0';
-}
-
 int jk_servlet_normalize(char *path, jk_logger_t *logger)
 {
 int l, w;

Modified: tomcat/jk/trunk/native/common/jk_util.h
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_util.h?rev=1838857=1838856=1838857=diff
==
--- tomcat/jk/trunk/native/common/jk_util.h (original)
+++ tomcat/jk/trunk/native/common/jk_util.h Fri Aug 24 13:43:34 2018
@@ -248,8 +248,6 @@ int is_http_status_fail(unsigned int htt
 
 int jk_wildchar_match(const char *str, const char *exp, int icase);
 
-void jk_no2slash(char *name);
-
 int jk_servlet_normalize(char *path, jk_logger_t *logger);
 
 #define JK_NORMALIZE_BAD_PATH  -1



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

svn commit: r1838843 - in /tomcat/jk/trunk: conf/httpd-jk.conf xdocs/miscellaneous/changelog.xml xdocs/reference/apache.xml xdocs/reference/iis.xml xdocs/webserver_howto/apache.xml

[markt]

Author: markt
Date: Fri Aug 24 13:00:12 2018
New Revision: 1838843

URL: http://svn.apache.org/viewvc?rev=1838843=rev
Log:
Update the docs to note that CollapseSlashes options no longer have an effect 
(effectively hard-coded to all)

Modified:
tomcat/jk/trunk/conf/httpd-jk.conf
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
tomcat/jk/trunk/xdocs/reference/apache.xml
tomcat/jk/trunk/xdocs/reference/iis.xml
tomcat/jk/trunk/xdocs/webserver_howto/apache.xml

Modified: tomcat/jk/trunk/conf/httpd-jk.conf
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/conf/httpd-jk.conf?rev=1838843=1838842=1838843=diff
==
--- tomcat/jk/trunk/conf/httpd-jk.conf (original)
+++ tomcat/jk/trunk/conf/httpd-jk.conf Fri Aug 24 13:00:12 2018
@@ -48,12 +48,6 @@ LoadModule jk_module modules/mod_jk.so
 # Since: 1.2.24
 # JkOptions +RejectUnsafeURI
 
-# This option will collapse multiple adjacent slashes
-# in request URLs before looking for mount or unmount
-# matches.
-# Since: 1.2.41
-# JkOptions +CollapseSlashesAll
-
 # After setting JkStripSession to "On", mod_jk will
 # strip all ";jsessionid=..." from request URLs it
 # does *not* forward to a backend.

Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1838843=1838842=1838843=diff
==
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Fri Aug 24 13:00:12 2018
@@ -83,6 +83,11 @@
 the normalisation implementation for mod_jk with that implemented by
 Tomcat. (markt)
   
+  
+Add a note to the documentation that the CollapseSlashes options are
+now effectively hard-coded to CollpaseSlashesAll due to the changes
+made to align normalization with that implemented in Tomcat. (markt)
+  

   
 

Modified: tomcat/jk/trunk/xdocs/reference/apache.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/reference/apache.xml?rev=1838843=1838842=1838843=diff
==
--- tomcat/jk/trunk/xdocs/reference/apache.xml (original)
+++ tomcat/jk/trunk/xdocs/reference/apache.xml Fri Aug 24 13:00:12 2018
@@ -800,37 +800,18 @@ but also slightly more complicated.
 
 
 
-JkOptions CollapseSlashesAll will collapse multiple
-adjacent slashes in request URLs before looking for mount or unmount
-matches.
-
-  JkOptions +CollapseSlashesAll
-
-
-
+JkOptions CollapseSlashesAll is deprecated as of 1.2.44 and will be
+ignored if used.
 
 
 
-JkOptions CollapseSlashesUnmount will collapse multiple
-adjacent slashes in request URLs only before looking for unmount
-matches. This is the default value.
-
-  JkOptions +CollapseSlashesUnmount
-
-
-
+JkOptions CollapseSlashesUnmount is deprecated as of 1.2.44 and will be
+ignored if used.
 
 
 
-JkOptions CollapseSlashesNone will never collapse multiple
-adjacent slashes in request URLs before looking for mount or unmount
-matches. Using this value might make you vulnerable for attacks
-bypassing your unmount rules.
-
-  JkOptions +CollapseSlashesNone
-
-
-
+JkOptions CollapseSlashesNone is deprecated as of 1.2.44 and will be
+ignored if used.
 
 
 

Modified: tomcat/jk/trunk/xdocs/reference/iis.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/reference/iis.xml?rev=1838843=1838842=1838843=diff
==
--- tomcat/jk/trunk/xdocs/reference/iis.xml (original)
+++ tomcat/jk/trunk/xdocs/reference/iis.xml Fri Aug 24 13:00:12 2018
@@ -207,20 +207,14 @@ The default value is false.
 This directive has been added in version 1.2.24
 
 
-One of the string values "all", "none" or "unmount".
-It controls whether multiple adjacent slashes in request URLs are
-collapsed before looking for a mount or unmount match.
-
-
-Value "all" will result in collapsing before mount and unmount
-checks, value "none" will result in never collapsing, value
-"unmount" will check mount rules without collapsing but unmount
-with collapsing.
+This options is deprecated as of 1.2.44 and will be ignored if used.
 
 
 Before version 1.2.41 collapsing was never done. Starting with
 version 1.2.41 collapsing before looking for unmount matches
 is the default to prevent easy bypassing of unmount rules.
+As of 1.2.44, collpasing is always performed before looking for mount
+or unmount rules.
 
 This directive has been added in version 1.2.41
 

Modified: tomcat/jk/trunk/xdocs/webserver_howto/apache.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/webserver_howto/apache.xml?rev=1838843=1838842=1838843=diff
==
--- 

Re: svn commit: r1838836 - in /tomcat/jk/trunk: native/apache-2.0/mod_jk.c native/common/jk_util.c native/common/jk_util.h native/iis/jk_isapi_plugin.c xdocs/miscellaneous/changelog.xml

[Mark Thomas]

On 24/08/18 13:31, ma...@apache.org wrote:
> Author: markt
> Date: Fri Aug 24 12:31:54 2018
> New Revision: 1838836
> 
> URL: http://svn.apache.org/viewvc?rev=1838836=rev
> Log:
> Refactor normalisation of request URIs to a common location and align the 
> normalisation implementation for mod_jk with that implemented by Tomcat.

Note: This makes the CollapseSlashes options effectively NO-OPs. I plan
to remove much of the associated code, update the docs and possibly log
a warning if the option is used (depends on how simple the code to do
that turns out to be).

Once I've completed the above I plan to tag 1.2.44 and start the release
process.

Mark

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

svn commit: r1838836 - in /tomcat/jk/trunk: native/apache-2.0/mod_jk.c native/common/jk_util.c native/common/jk_util.h native/iis/jk_isapi_plugin.c xdocs/miscellaneous/changelog.xml

[markt]

Author: markt
Date: Fri Aug 24 12:31:54 2018
New Revision: 1838836

URL: http://svn.apache.org/viewvc?rev=1838836=rev
Log:
Refactor normalisation of request URIs to a common location and align the 
normalisation implementation for mod_jk with that implemented by Tomcat.

Modified:
tomcat/jk/trunk/native/apache-2.0/mod_jk.c
tomcat/jk/trunk/native/common/jk_util.c
tomcat/jk/trunk/native/common/jk_util.h
tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/jk/trunk/native/apache-2.0/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/mod_jk.c?rev=1838836=1838835=1838836=diff
==
--- tomcat/jk/trunk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-2.0/mod_jk.c Fri Aug 24 12:31:54 2018
@@ -3790,7 +3790,10 @@ static int jk_translate(request_rec * r)
   _module);
 
 if (conf) {
+char *clean_uri;
+int rc;
 const char *worker;
+
 if ((r->handler != NULL) && (!strcmp(r->handler, JK_HANDLER))) {
 /* Somebody already set the handler, probably manual config
  * or "native" configuration, no need for extra overhead
@@ -3810,6 +3813,12 @@ static int jk_translate(request_rec * r)
 return DECLINED;
 }
 
+clean_uri = apr_pstrdup(r->pool, r->uri);
+rc = jk_servlet_normalize(clean_uri, conf->log);
+if (rc != 0) {
+   return HTTP_NOT_FOUND;
+}
+
 /* Special case to make sure that apache can serve a directory
listing if there are no matches for the DirectoryIndex and
Tomcat webapps are mapped into apache using JkAutoAlias. */
@@ -3819,11 +3828,8 @@ static int jk_translate(request_rec * r)
 
 /* Append the request uri to the JkAutoAlias directory and
determine if the file exists. */
-char *clean_uri;
 apr_finfo_t finfo;
 finfo.filetype = APR_NOFILE;
-clean_uri = apr_pstrdup(r->pool, r->uri);
-ap_no2slash(clean_uri);
 /* Map uri to a context static file */
 if (strlen(clean_uri) > 1) {
 char *context_path = NULL;
@@ -3855,7 +3861,7 @@ static int jk_translate(request_rec * r)
 }
 else {
 rule_extension_t *e;
-worker = map_uri_to_worker_ext(conf->uw_map, r->uri,
+worker = map_uri_to_worker_ext(conf->uw_map, clean_uri,
NULL, , NULL, conf->log);
 rconf->rule_extensions = e;
 ap_set_module_config(r->request_config, _module, rconf);
@@ -3875,8 +3881,6 @@ static int jk_translate(request_rec * r)
 return OK;
 }
 else if (conf->alias_dir != NULL) {
-char *clean_uri = apr_pstrdup(r->pool, r->uri);
-ap_no2slash(clean_uri);
 /* Automatically map uri to a context static file */
 if (JK_IS_DEBUG_LEVEL(conf->log))
 jk_log(conf->log, JK_LOG_DEBUG,
@@ -3994,7 +3998,10 @@ static int jk_map_to_storage(request_rec
   _module);
 
 if (conf) {
+char *clean_uri;
+int rc;
 const char *worker;
+
 if ((r->handler != NULL) && (!strcmp(r->handler, JK_HANDLER))) {
 /* Somebody already set the handler, probably manual config
  * or "native" configuration, no need for extra overhead
@@ -4013,6 +4020,13 @@ static int jk_map_to_storage(request_rec
 
 return DECLINED;
 }
+
+clean_uri = apr_pstrdup(r->pool, r->uri);
+rc = jk_servlet_normalize(clean_uri, conf->log);
+if (rc != 0) {
+   return HTTP_NOT_FOUND;
+}
+
 if (!conf->uw_map) {
 if (JK_IS_DEBUG_LEVEL(conf->log))
 jk_log(conf->log, JK_LOG_DEBUG,
@@ -4023,7 +4037,7 @@ static int jk_map_to_storage(request_rec
 }
 else {
 rule_extension_t *e;
-worker = map_uri_to_worker_ext(conf->uw_map, r->uri,
+worker = map_uri_to_worker_ext(conf->uw_map, clean_uri,
NULL, , NULL, conf->log);
 rconf->rule_extensions = e;
 ap_set_module_config(r->request_config, _module, rconf);

Modified: tomcat/jk/trunk/native/common/jk_util.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_util.c?rev=1838836=1838835=1838836=diff

svn commit: r1838834 - /tomcat/jk/trunk/native/common/jk_util.h

[markt]

Author: markt
Date: Fri Aug 24 12:26:57 2018
New Revision: 1838834

URL: http://svn.apache.org/viewvc?rev=1838834=rev
Log:
Fix compilation warning

Modified:
tomcat/jk/trunk/native/common/jk_util.h

Modified: tomcat/jk/trunk/native/common/jk_util.h
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_util.h?rev=1838834=1838833=1838834=diff
==
--- tomcat/jk/trunk/native/common/jk_util.h (original)
+++ tomcat/jk/trunk/native/common/jk_util.h Fri Aug 24 12:26:57 2018
@@ -131,6 +131,8 @@ const char *jk_get_lb_session_cookie_pat
 
 int jk_get_worker_retries(jk_map_t *m, const char *wname, int def);
 
+int jk_get_worker_lb_retries(jk_map_t *m, const char *wname, int def);
+
 int jk_get_is_worker_disabled(jk_map_t *m, const char *wname);
 
 int jk_get_is_worker_stopped(jk_map_t *m, const char *wname);



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

[Bug 62408] (New feature) Make configurable the number of retries in case of upstream failures

[bugzilla]

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

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #3 from Mark Thomas  ---
Thanks again for the patch. Applied (with minor changes) to 1.2.x for 1.2.44
onwards.

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

svn commit: r1838830 - in /tomcat/jk/trunk: native/common/ xdocs/miscellaneous/ xdocs/reference/

[markt]

Author: markt
Date: Fri Aug 24 12:12:27 2018
New Revision: 1838830

URL: http://svn.apache.org/viewvc?rev=1838830=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62408
Add the new load-balancer worker property lb_retries to improve the control 
over the number of retries.
Based on a patch provided by Frederik Nosi.

Modified:
tomcat/jk/trunk/native/common/jk_ajp_common.c
tomcat/jk/trunk/native/common/jk_ajp_common.h
tomcat/jk/trunk/native/common/jk_lb_worker.c
tomcat/jk/trunk/native/common/jk_lb_worker.h
tomcat/jk/trunk/native/common/jk_service.h
tomcat/jk/trunk/native/common/jk_util.c
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
tomcat/jk/trunk/xdocs/reference/workers.xml

Modified: tomcat/jk/trunk/native/common/jk_ajp_common.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_ajp_common.c?rev=1838830=1838829=1838830=diff
==
--- tomcat/jk/trunk/native/common/jk_ajp_common.c (original)
+++ tomcat/jk/trunk/native/common/jk_ajp_common.c Fri Aug 24 12:12:27 2018
@@ -3041,6 +3041,10 @@ int ajp_init(jk_worker_t *pThis,
 jk_get_worker_retries(props, p->name,
   JK_RETRIES);
 
+p->lb_retries =
+jk_get_worker_lb_retries(props, p->name,
+  JK_LB_RETRIES);
+
 p->max_packet_size =
 jk_get_max_packet_size(props, p->name);
 

Modified: tomcat/jk/trunk/native/common/jk_ajp_common.h
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_ajp_common.h?rev=1838830=1838829=1838830=diff
==
--- tomcat/jk/trunk/native/common/jk_ajp_common.h (original)
+++ tomcat/jk/trunk/native/common/jk_ajp_common.h Fri Aug 24 12:12:27 2018
@@ -370,6 +370,13 @@ struct ajp_worker
  */
 int retries;
 
+/*
+ * Public property used in load balancer workers, meaning
+ * the maximum number of failover attempts between ajp
+ * workers of cluster.
+ */
+int lb_retries;
+
 unsigned int max_packet_size;  /*  Maximum AJP Packet size */
 
 int retry_interval;/*  Number of milliseconds to sleep before 
doing a retry */

Modified: tomcat/jk/trunk/native/common/jk_lb_worker.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_lb_worker.c?rev=1838830=1838829=1838830=diff
==
--- tomcat/jk/trunk/native/common/jk_lb_worker.c (original)
+++ tomcat/jk/trunk/native/common/jk_lb_worker.c Fri Aug 24 12:12:27 2018
@@ -1225,6 +1225,7 @@ static int JK_METHOD service(jk_endpoint
 if (p->worker->sequence < p->worker->s->h.sequence)
 jk_lb_pull(p->worker, JK_FALSE, l);
 for (i = 0; i < num_of_workers; i++) {
+jk_log(l, JK_LOG_DEBUG, "LB - num_of_workers: %d, retry: %d, 
lb_retries: %d", num_of_workers, i, p->worker->lb_retries);
 lb_sub_worker_t *rec = &(p->worker->lb_workers[i]);
 ajp_worker_t *aw = (ajp_worker_t *)rec->worker->worker_private;
 if (rec->s->state == JK_LB_STATE_BUSY) {
@@ -1272,7 +1273,10 @@ static int JK_METHOD service(jk_endpoint
p->worker->sticky_session, sessionid ? sessionid : "empty");
 
 while (recoverable == JK_TRUE) {
-if (attempt >= num_of_workers) {
+if (JK_IS_DEBUG_LEVEL(l))
+jk_log(l, JK_LOG_DEBUG, "attempt %d, max attempts %d, worker count 
%d",
+attempt, p->worker->lb_retries, num_of_workers);
+if (attempt >= num_of_workers || attempt >= p->worker->lb_retries) {
 retry++;
 if (retry >= p->worker->retries) {
 /* Done with retrying */
@@ -1549,7 +1553,7 @@ static int JK_METHOD service(jk_endpoint
 }
 else {
 /*
- * Reply timeout, bot not yet too many of them.
+ * Reply timeout, but not yet too many of them.
  * Keep previous global state.
  * Do not try to reuse the same node for the same 
request.
  * Failing over to another node could help.
@@ -1903,6 +1907,8 @@ static int JK_METHOD init(jk_worker_t *p
 p->worker.we = we;
 p->retries = jk_get_worker_retries(props, p->name,
JK_RETRIES);
+p->lb_retries = jk_get_worker_lb_retries(props, p->name,
+   JK_LB_RETRIES);
 p->retry_interval =
 jk_get_worker_retry_interval(props, p->name,
 JK_SLEEP_DEF);

Modified: tomcat/jk/trunk/native/common/jk_lb_worker.h
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_lb_worker.h?rev=1838830=1838829=1838830=diff

JDK 11: First Release Candidate available

[Rory O'Donnell]

Hi Mark,

*JDK 11 build 28 is our first JDK 11 Release Candidate [1]
*

 * JDK 11 Early Access  build 28 is available at : - jdk.java.net/11/

*FOSS fixes in recent builds.*

 * Eclipse Jetty - JDK-8207177
    (b27)
 * *Apache Tomcat *  -JDK-8208642
   (b27)
 o *Hope you can confirm that all is ok ?*
 * Netty - JDK-8207029
    (b23),
   JDK-8208166  (b25)

*JDK 12 Early Access build 8 is available at : - jdk.java.net/12/*

 * Release Notes for JDK 12 [2]
 * Changes in this build include
 o JDK-8208350  -
   Disable all DES TLS cipher suites

*OpenJFX Early-Access Build 24 is available at :-* 
*http://jdk.java.net/openjfx/*


 * This library is delivered as a set of modules, along with the native
   code needed to run JavaFX, that can be run using a JDK 10
    build or a JDK 11 EA
    build.
 * This build is intended to allow application developers and OpenJFX
   contributors to test their applications with an unbundled,
   standalone JavaFX library.

Regards,
Rory

[1] 
http://mail.openjdk.java.net/pipermail/jdk-dev/2018-August/001844.html 


[2] http://jdk.java.net/12/release-notes


--
Rgds,Rory O'Donnell
Quality Engineering Manager
Oracle EMEA , Dublin, Ireland

[Bug 62408] (New feature) Make configurable the number of retries in case of upstream failures

[bugzilla]

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

--- Comment #2 from Mark Thomas  ---
Thanks for the patch. I'm testing it now and expect to commit it later today.

A couple of minor points so far:
- The retries options includes the original request so this new option should
  have the same behaviour
- The patch doesn't include any documentation

I've already fixed these locally so this is a suggestion of things to consider
for future submissions rather than a request for an updated 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

[Bug 62652] New: DBCP documentation to fix/clarify

[bugzilla]

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

Bug ID: 62652
   Summary: DBCP documentation to fix/clarify
   Product: Tomcat 8
   Version: 8.0.x-trunk
  Hardware: PC
Status: NEW
  Severity: normal
  Priority: P2
 Component: Documentation
  Assignee: dev@tomcat.apache.org
  Reporter: lbarbar...@gmail.com
  Target Milestone: 

First of all, for none experts, trying to figure out how to set consistently a
DB connection into a context file, has become difficult.

We have DBCP 1, DBCP 2... Tomcat implements its own implementation and there's
no spot clearly specifying what to choose or set...  
Resource factory attribute is not enough mentioned but it's a corner stone.
According to where you look into Tomcat 8+ documentation, at first sight it
seems to be contradictory, because of the fact that old pool implementation
still coexists with the new one, but if it's not clear for you, you don't know
what to believe...

Well, a table clearly identifying all the modifications about this concern
between Tomcat versions, would have been very useful.

But, before that, there's at least one mistake to fix, here
https://tomcat.apache.org/tomcat-8.0-doc/jndi-resources-howto.html#JDBC_Data_Sources
(and onward versions)
because, according to DBCP documentation and Tomcat upgrade guides,
removeAbandoned attribute has become removeAbandonedOnBorrow /
removeAbandonedOnMAintenance. 

Thank you

-- 
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 62626] Tomcat 9.0.10 APR/Native crashes

[bugzilla]

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

--- Comment #20 from jan.pfei...@centrum.cz ---
Calling NIO2+HTTP/2 stable was quite premature. With this config I get out of
memory (5G) every few hours. Strange, peak traffic isnt causing any obvious
problem.

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