[Bug 62748] New: Add support for TLS 1.3 (RFC 8446)
https://bz.apache.org/bugzilla/show_bug.cgi?id=62748 Bug ID: 62748 Summary: Add support for TLS 1.3 (RFC 8446) Product: Tomcat Native Version: unspecified Hardware: PC OS: Linux Status: NEW Severity: normal Priority: P2 Component: Library Assignee: dev@tomcat.apache.org Reporter: usma...@ieml.ru Target Milestone: --- Created attachment 36157 --> https://bz.apache.org/bugzilla/attachment.cgi?id=36157&action=edit Screenshots confirming tls connection version and browser used Please add support for TLS 1.3 (RFC 8446) in tomcat-native for use with APR/tomcat. Latest stable OpenSSL version (1.1.1) supports it.Even though OpenSSL 1.1.1 is intended to be a drop-in replacement, using it with tomcat-native 1.2.17 and APR 1.6.3 still producess TLS 1.2 connection , here is tomcat(7.0.70) connector snippet server is started normally(snippet from catalina.out) Sep 19, 2018 11:09:04 AM org.apache.catalina.core.AprLifecycleListener lifecycleEvent INFO: Loaded APR based Apache Tomcat Native library 1.2.17 using APR version 1.6.3. Sep 19, 2018 11:09:04 AM org.apache.catalina.core.AprLifecycleListener lifecycleEvent INFO: APR capabilities: IPv6 [true], sendfile [true], accept filters [false], random [true]. Sep 19, 2018 11:09:04 AM org.apache.catalina.core.AprLifecycleListener initializeSSL INFO: OpenSSL successfully initialized (OpenSSL 1.1.1 11 Sep 2018) Sep 19, 2018 11:09:06 AM org.apache.coyote.AbstractProtocol init INFO: Initializing ProtocolHandler ["http-apr-8080"] Sep 19, 2018 11:09:06 AM org.apache.coyote.AbstractProtocol init INFO: Initializing ProtocolHandler ["http-apr-8443"] Sep 19, 2018 11:09:06 AM org.apache.catalina.startup.Catalina load INFO: Initialization processed in 3684 ms Sep 19, 2018 11:09:06 AM org.apache.catalina.core.StandardService startInternal INFO: Starting service Catalina Sep 19, 2018 11:09:06 AM org.apache.catalina.core.StandardEngine startInternal INFO: Starting Servlet Engine: Sep 19, 2018 11:09:06 AM org.apache.catalina.startup.HostConfig deployDescriptor INFO: Deploying configuration descriptor /opt/tomcat/conf/Catalina/localhost/Education.xml Sep 19, 2018 11:09:32 AM org.apache.catalina.startup.HostConfig deployDescriptor INFO: Deployment of configuration descriptor /opt/tomcat/conf/Catalina/localhost/Education.xml has finished in 26,350 ms Sep 19, 2018 11:09:32 AM org.apache.catalina.startup.HostConfig deployDirectory INFO: Deploying web application directory /opt/tomcat/webapps/yui Sep 19, 2018 11:09:33 AM org.apache.catalina.startup.HostConfig deployDirectory INFO: Deployment of web application directory /opt/tomcat/webapps/yui has finished in 319 ms Sep 19, 2018 11:09:33 AM org.apache.catalina.startup.HostConfig deployDirectory INFO: Deploying web application directory /opt/tomcat/webapps/ROOT Sep 19, 2018 11:09:33 AM org.apache.catalina.startup.HostConfig deployDirectory INFO: Deployment of web application directory /opt/tomcat/webapps/ROOT has finished in 230 ms Sep 19, 2018 11:09:33 AM org.apache.coyote.AbstractProtocol start INFO: Starting ProtocolHandler ["http-apr-8080"] Sep 19, 2018 11:09:33 AM org.apache.coyote.AbstractProtocol start INFO: Starting ProtocolHandler ["http-apr-8443"] Sep 19, 2018 11:09:33 AM org.apache.catalina.startup.Catalina start INFO: Server startup in 27340 ms -- 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: r1841445 - in /tomcat/trunk: java/org/apache/catalina/valves/rewrite/ test/org/apache/catalina/valves/rewrite/ webapps/docs/
Author: remm
Date: Thu Sep 20 09:03:05 2018
New Revision: 1841445
URL: http://svn.apache.org/viewvc?rev=1841445&view=rev
Log:
Implement some simple rewrite fixmes.
Modified:
tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteCond.java
tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteRule.java
tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
tomcat/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteCond.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteCond.java?rev=1841445&r1=1841444&r2=1841445&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteCond.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteCond.java Thu
Sep 20 09:03:05 2018
@@ -88,6 +88,7 @@ public class RewriteCond {
protected String testString = null;
protected String condPattern = null;
+protected String flagsString = null;
public String getCondPattern() {
return condPattern;
@@ -105,6 +106,14 @@ public class RewriteCond {
this.testString = testString;
}
+public final String getFlagsString() {
+return flagsString;
+}
+
+public final void setFlagsString(String flagsString) {
+this.flagsString = flagsString;
+}
+
public void parse(Map maps) {
test = new Substitution();
test.setSub(testString);
@@ -163,8 +172,8 @@ public class RewriteCond {
*/
@Override
public String toString() {
-// FIXME: Add flags if possible
-return "RewriteCond " + testString + " " + condPattern;
+return "RewriteCond " + testString + " " + condPattern
++ ((flagsString != null) ? (" " + flagsString) : "");
}
Modified: tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteRule.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteRule.java?rev=1841445&r1=1841444&r2=1841445&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteRule.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteRule.java Thu
Sep 20 09:03:05 2018
@@ -31,6 +31,7 @@ public class RewriteRule {
protected String patternString = null;
protected String substitutionString = null;
+protected String flagsString = null;
public void parse(Map maps) {
// Parse the substitution
@@ -145,8 +146,8 @@ public class RewriteRule {
*/
@Override
public String toString() {
-// FIXME: Add flags if possible
-return "RewriteRule " + patternString + " " + substitutionString;
+return "RewriteRule " + patternString + " " + substitutionString
++ ((flagsString != null) ? (" " + flagsString) : "");
}
@@ -282,6 +283,15 @@ public class RewriteRule {
protected boolean qsappend = false;
/**
+ * When the requested URI contains a query string, and the target URI does
+ * not, the default behavior of RewriteRule is to copy that query string
+ * to the target URI. Using the [QSD] flag causes the query string
+ * to be discarded.
+ * Using [QSD] and [QSA] together will result in [QSD] taking precedence.
+ */
+protected boolean qsdiscard = false;
+
+/**
* Prefix Substitution with http://thishost[:thisport]/ (which makes the
* new URL a URI) to force a external redirection. If no code is given
* an HTTP response of 302 (FOUND, previously MOVED TEMPORARILY) is used.
@@ -430,6 +440,12 @@ public class RewriteRule {
public void setQsappend(boolean qsappend) {
this.qsappend = qsappend;
}
+public final boolean isQsdiscard() {
+return qsdiscard;
+}
+public final void setQsdiscard(boolean qsdiscard) {
+this.qsdiscard = qsdiscard;
+}
public boolean isRedirect() {
return redirect;
}
@@ -483,6 +499,14 @@ public class RewriteRule {
this.substitutionString = substitutionString;
}
+public final String getFlagsString() {
+return flagsString;
+}
+
+public final void setFlagsString(String flagsString) {
+this.flagsString = flagsString;
+}
+
public boolean isHost() {
return host;
}
Modified: tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java?rev=1841445&r1=1841444&r2=1841445&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.jav
svn commit: r1841449 - /tomcat/jk/trunk/tools/lineends.pl
Author: rjung
Date: Thu Sep 20 09:31:11 2018
New Revision: 1841449
URL: http://svn.apache.org/viewvc?rev=1841449&view=rev
Log:
Tab police.
Modified:
tomcat/jk/trunk/tools/lineends.pl
Modified: tomcat/jk/trunk/tools/lineends.pl
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/tools/lineends.pl?rev=1841449&r1=1841448&r2=1841449&view=diff
==
--- tomcat/jk/trunk/tools/lineends.pl (original)
+++ tomcat/jk/trunk/tools/lineends.pl Thu Sep 20 09:31:11 2018
@@ -93,8 +93,8 @@ OUTCH
}
else {
find(\&totxt, @ARGV[0]);
- print "scanned " . @ARGV[0] . "\n";
- $givenpaths = 1;
+print "scanned " . @ARGV[0] . "\n";
+$givenpaths = 1;
}
shift @ARGV;
}
@@ -106,49 +106,49 @@ if (!$givenpaths) {
sub totxt {
$oname = $_;
- $tname = '.#' . $_;
+$tname = '.#' . $_;
if (!-f) {
return;
}
- @exts = split /\./;
- if ($forceending < 2) {
+@exts = split /\./;
+if ($forceending < 2) {
while ($#exts && ($ext = pop(@exts))) {
if ($ignore =~ m|-$ext-|i) {
return;
}
- }
+}
}
- @ostat = stat($oname);
+@ostat = stat($oname);
$srcfl = new IO::File $oname, "r" or die;
- $dstfl = new IO::File $tname, "w" or die;
+$dstfl = new IO::File $tname, "w" or die;
binmode $srcfl;
- if ($notnative) {
+if ($notnative) {
binmode $dstfl;
- }
- undef $t;
+}
+undef $t;
while (<$srcfl>) {
if (s/(\r*)\n$/\n/) {
- $n = length $1;
- if (!defined $t) {
- $t = $n;
- }
- if (!$forceending && (($n != $t) || m/\r/)) {
- print "mismatch in " .$oname. ":" .$n. " expected " .$t.
"\n";
- undef $t;
- last;
- }
- elsif ($notnative > 0) {
+$n = length $1;
+if (!defined $t) {
+$t = $n;
+}
+if (!$forceending && (($n != $t) || m/\r/)) {
+print "mismatch in " .$oname. ":" .$n. " expected " .$t.
"\n";
+undef $t;
+last;
+}
+elsif ($notnative > 0) {
s/\n$/\r\n/;
}
}
- print $dstfl $_;
- }
- if (defined $t && (tell $srcfl == tell $dstfl)) {
- undef $t;
- }
- undef $srcfl;
- undef $dstfl;
- if (defined $t) {
+print $dstfl $_;
+}
+if (defined $t && (tell $srcfl == tell $dstfl)) {
+undef $t;
+}
+undef $srcfl;
+undef $dstfl;
+if (defined $t) {
unlink $oname or die;
rename $tname, $oname or die;
@anames = ($oname);
@@ -158,8 +158,8 @@ sub totxt {
chmod $ostat[2] & 0, @anames;
chown $ostat[5], $ostat[6], @anames;
print "Converted file " . $oname . " to text in " .
$File::Find::dir . "\n";
- }
- else {
- unlink $tname or die;
- }
+}
+else {
+unlink $tname or die;
+}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1841451 - /tomcat/jk/trunk/tools/lineends.pl
Author: rjung
Date: Thu Sep 20 09:32:35 2018
New Revision: 1841451
URL: http://svn.apache.org/viewvc?rev=1841451&view=rev
Log:
Use perl strict mode.
Modified:
tomcat/jk/trunk/tools/lineends.pl
Modified: tomcat/jk/trunk/tools/lineends.pl
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/tools/lineends.pl?rev=1841451&r1=1841450&r2=1841451&view=diff
==
--- tomcat/jk/trunk/tools/lineends.pl (original)
+++ tomcat/jk/trunk/tools/lineends.pl Thu Sep 20 09:32:35 2018
@@ -28,12 +28,14 @@
# Todo: Handle NULL stdin characters gracefully.
#
+use strict;
+
use IO::File;
use File::Find;
# The ignore list is '-' seperated, with this leading hyphen and
# trailing hyphens in ever concatinated list below.
-$ignore = "-";
+my $ignore = "-";
# Image formats
$ignore .= "gif-jpg-jpeg-png-ico-bmp-";
@@ -53,13 +55,13 @@ $ignore .= "class-so-dll-exe-obj-a-o-lo-
# Some build env files
$ignore .= "mcp-xdc-ncb-opt-pdb-ilk-sbr-";
-$preservedate = 1;
+my $preservedate = 1;
-$forceending = 0;
+my $forceending = 0;
-$givenpaths = 0;
+my $givenpaths = 0;
-$notnative = 0;
+my $notnative = 0;
while (defined $ARGV[0]) {
if ($ARGV[0] eq '--touch') {
@@ -105,22 +107,24 @@ if (!$givenpaths) {
}
sub totxt {
-$oname = $_;
-$tname = '.#' . $_;
+my $oname = $_;
+my $tname = '.#' . $_;
if (!-f) {
return;
}
-@exts = split /\./;
+my @exts = split /\./;
if ($forceending < 2) {
+my $ext;
while ($#exts && ($ext = pop(@exts))) {
if ($ignore =~ m|-$ext-|i) {
return;
}
}
}
-@ostat = stat($oname);
-$srcfl = new IO::File $oname, "r" or die;
-$dstfl = new IO::File $tname, "w" or die;
+my @ostat = stat($oname);
+my $srcfl = new IO::File $oname, "r" or die;
+my $dstfl = new IO::File $tname, "w" or die;
+my ($t, $n);
binmode $srcfl;
if ($notnative) {
binmode $dstfl;
@@ -151,7 +155,7 @@ sub totxt {
if (defined $t) {
unlink $oname or die;
rename $tname, $oname or die;
-@anames = ($oname);
+my @anames = ($oname);
if ($preservedate) {
utime $ostat[9], $ostat[9], @anames;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1841450 - /tomcat/jk/trunk/tools/lineends.pl
Author: rjung
Date: Thu Sep 20 09:32:12 2018
New Revision: 1841450
URL: http://svn.apache.org/viewvc?rev=1841450&view=rev
Log:
Use normal perl array derefence syntax.
Modified:
tomcat/jk/trunk/tools/lineends.pl
Modified: tomcat/jk/trunk/tools/lineends.pl
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/tools/lineends.pl?rev=1841450&r1=1841449&r2=1841450&view=diff
==
--- tomcat/jk/trunk/tools/lineends.pl (original)
+++ tomcat/jk/trunk/tools/lineends.pl Thu Sep 20 09:32:12 2018
@@ -61,24 +61,24 @@ $givenpaths = 0;
$notnative = 0;
-while (defined @ARGV[0]) {
-if (@ARGV[0] eq '--touch') {
+while (defined $ARGV[0]) {
+if ($ARGV[0] eq '--touch') {
$preservedate = 0;
}
-elsif (@ARGV[0] eq '--nocr') {
+elsif ($ARGV[0] eq '--nocr') {
$notnative = -1;
}
-elsif (@ARGV[0] eq '--cr') {
+elsif ($ARGV[0] eq '--cr') {
$notnative = 1;
}
-elsif (@ARGV[0] eq '--force') {
+elsif ($ARGV[0] eq '--force') {
$forceending = 1;
}
-elsif (@ARGV[0] eq '--FORCE') {
+elsif ($ARGV[0] eq '--FORCE') {
$forceending = 2;
}
-elsif (@ARGV[0] =~ m/^-/) {
-die "What is " . @ARGV[0] . " supposed to mean?\n\n"
+elsif ($ARGV[0] =~ m/^-/) {
+die "What is " . $ARGV[0] . " supposed to mean?\n\n"
. "Syntax:\t$0 [option()s] [path(s)]\n\n" . <<'OUTCH'
Where: paths specifies the top level directory to convert (default of '.')
options are;
@@ -92,8 +92,8 @@ Where:paths specifies the top level dir
OUTCH
}
else {
-find(\&totxt, @ARGV[0]);
-print "scanned " . @ARGV[0] . "\n";
+find(\&totxt, $ARGV[0]);
+print "scanned " . $ARGV[0] . "\n";
$givenpaths = 1;
}
shift @ARGV;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1841452 - /tomcat/jk/trunk/tools/lineends.pl
Author: rjung
Date: Thu Sep 20 09:34:18 2018
New Revision: 1841452
URL: http://svn.apache.org/viewvc?rev=1841452&view=rev
Log:
Add a new switch to allow ignoring file conversion
based on a regexp pattern for the full file path name.
Will be used to not convert PCRE testdata (which
is binary).
Modified:
tomcat/jk/trunk/tools/lineends.pl
Modified: tomcat/jk/trunk/tools/lineends.pl
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/tools/lineends.pl?rev=1841452&r1=1841451&r2=1841452&view=diff
==
--- tomcat/jk/trunk/tools/lineends.pl (original)
+++ tomcat/jk/trunk/tools/lineends.pl Thu Sep 20 09:34:18 2018
@@ -55,6 +55,8 @@ $ignore .= "class-so-dll-exe-obj-a-o-lo-
# Some build env files
$ignore .= "mcp-xdc-ncb-opt-pdb-ilk-sbr-";
+my $ignorepat = '';
+
my $preservedate = 1;
my $forceending = 0;
@@ -79,17 +81,22 @@ while (defined $ARGV[0]) {
elsif ($ARGV[0] eq '--FORCE') {
$forceending = 2;
}
+elsif ($ARGV[0] eq '--ignore' && $#ARGV >= 1) {
+shift;
+$ignorepat = $ARGV[0];
+}
elsif ($ARGV[0] =~ m/^-/) {
die "What is " . $ARGV[0] . " supposed to mean?\n\n"
. "Syntax:\t$0 [option()s] [path(s)]\n\n" . <<'OUTCH'
Where: paths specifies the top level directory to convert (default of '.')
options are;
- --cr keep/add one ^M
- --nocr remove ^M's
- --touch the datestamp (default: keeps date/attribs)
- --force mismatched corrections (unbalanced ^M's)
- --FORCE all files regardless of file name!
+ --cr keep/add one ^M
+ --nocrremove ^M's
+ --touch the datestamp (default: keeps date/attribs)
+ --force mismatched corrections (unbalanced ^M's)
+ --FORCE all files regardless of file name!
+ --ignore PAT Do not convert files with full name matching regexp PAT
OUTCH
}
@@ -114,6 +121,9 @@ sub totxt {
}
my @exts = split /\./;
if ($forceending < 2) {
+if ($ignorepat ne '' && $File::Find::name =~ /$ignorepat/o) {
+return;
+}
my $ext;
while ($#exts && ($ext = pop(@exts))) {
if ($ignore =~ m|-$ext-|i) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1841453 - /tomcat/jk/trunk/tools/jkrelease.sh
Author: rjung
Date: Thu Sep 20 09:35:35 2018
New Revision: 1841453
URL: http://svn.apache.org/viewvc?rev=1841453&view=rev
Log:
Ignore PCRE testdata when doing line ends conversion
for the src zip file.
Modified:
tomcat/jk/trunk/tools/jkrelease.sh
Modified: tomcat/jk/trunk/tools/jkrelease.sh
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/tools/jkrelease.sh?rev=1841453&r1=1841452&r2=1841453&view=diff
==
--- tomcat/jk/trunk/tools/jkrelease.sh (original)
+++ tomcat/jk/trunk/tools/jkrelease.sh Thu Sep 20 09:35:35 2018
@@ -315,7 +315,7 @@ cd ../../
# Pack
tar cfz ${JK_DIST}.tar.gz --owner="${JK_OWNER}" --group="${JK_GROUP}"
${JK_DIST} || exit 1
-perl ${JK_DIST}/tools/lineends.pl --cr ${JK_DIST}
+perl ${JK_DIST}/tools/lineends.pl --ignore '.*/pcre/testdata/.*' --cr
${JK_DIST}
zip -9 -r ${JK_DIST}.zip ${JK_DIST}
# Create detached signature and verify it
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1841454 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/valves/rewrite/ test/org/apache/catalina/valves/rewrite/ webapps/docs/
Author: remm Date: Thu Sep 20 09:39:18 2018 New Revision: 1841454 URL: http://svn.apache.org/viewvc?rev=1841454&view=rev Log: Implement some simple rewrite fixmes Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/rewrite/RewriteCond.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/rewrite/RewriteRule.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java tomcat/tc8.5.x/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Sep 20 09:39:18 2018 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409 ,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747 404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1 756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205 3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,17
svn commit: r1841457 - /tomcat/jk/trunk/tools/jkrelease.sh
Author: rjung Date: Thu Sep 20 10:00:49 2018 New Revision: 1841457 URL: http://svn.apache.org/viewvc?rev=1841457&view=rev Log: Add top-level .gitignore to files that should be copied to the source distribution. Modified: tomcat/jk/trunk/tools/jkrelease.sh Modified: tomcat/jk/trunk/tools/jkrelease.sh URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/tools/jkrelease.sh?rev=1841457&r1=1841456&r2=1841457&view=diff == --- tomcat/jk/trunk/tools/jkrelease.sh (original) +++ tomcat/jk/trunk/tools/jkrelease.sh Thu Sep 20 10:00:49 2018 @@ -33,7 +33,7 @@ JK_OWNER="root" JK_GROUP="bin" JK_TOOLS="`pwd`" -COPY_JK="README.txt HOWTO-RELEASE.txt native jkstatus support tools xdocs" +COPY_JK="README.txt HOWTO-RELEASE.txt .gitignore native jkstatus support tools xdocs" COPY_NATIVE="LICENSE NOTICE" COPY_BUILD="docs" COPY_CONF="httpd-jk.conf uriworkermap.properties workers.properties" - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release JK 1.2.45
Partial results (IMHO no show-stoppers so far): - the following zip files previously contained LICENSE, NOTICE and do no longer contain them. The symbol files in addition miss the previously contained README file: - binaries/windows/symbols/tomcat-connectors-1.2.45-windows-i386-symbols.zip - binaries/windows/symbols/tomcat-connectors-1.2.45-windows-x86_64-symbols.zip - binaries/windows/tomcat-connectors-1.2.45-windows-i386-iis.zip - binaries/windows/tomcat-connectors-1.2.45-windows-x86_64-iis.zip You might want to add the files to these artefacts? - The file native/iis/pcre/testdata/grepbinary got currupted by lineends.pl in the source zip. I added a feature to lineends.pl and used it in jk-release.sh to prevent this from happening in the future. - the file .gitignore is missing in the top-level directory of the source distribution. Added to jk-release.sh now for the future. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62749] New: NullPointerException call MimeHeaders.clear , java.lang.ArrayIndexOutOfBoundsException call SocketBufferHandler.setWriteBufferConfiguredForWrite
https://bz.apache.org/bugzilla/show_bug.cgi?id=62749 Bug ID: 62749 Summary: NullPointerException call MimeHeaders.clear , java.lang.ArrayIndexOutOfBoundsException call SocketBufferHandler.setWriteBufferConfiguredForWrite Product: Tomcat 8 Version: 8.5.16 Hardware: PC OS: Linux Status: NEW Severity: normal Priority: P2 Component: Util Assignee: dev@tomcat.apache.org Reporter: xiongshilinem...@163.com Target Milestone: Hi, we have a spring cloud app in which tomcat-embed(verison:8.5.16) is used. Sometimes, there are two exceptions that happen to our app. We can't recur them in our test enviroment.We guess it has something with the high concurrency. Details as below: 1.java.lang.NullPointerException in MimeHeaders: java.lang.NullPointerException: null at org.apache.tomcat.util.http.MimeHeaders.clear(MimeHeaders.java:150) at org.apache.coyote.Response.recycle(Response.java:560) at org.apache.coyote.http11.Http11OutputBuffer.nextRequest(Http11OutputBuffer.java:307) at org.apache.coyote.http11.Http11OutputBuffer.recycle(Http11OutputBuffer.java:290) at org.apache.coyote.http11.Http11Processor.recycle(Http11Processor.java:1652) at org.apache.coyote.AbstractProtocol$ConnectionHandler.release(AbstractProtocol.java:1050) at org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:984) at org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1455) at org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:49) at java.util.concurrent.ThreadPoolExecutor.runWorker(Unknown Source) at java.util.concurrent.ThreadPoolExecutor$Worker.run(Unknown Source) at org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61) at java.lang.Thread.run(Unknown Source) 2.java.lang.ArrayIndexOutOfBoundsException in SocketBufferHandler: java.lang.ArrayIndexOutOfBoundsException: null at java.nio.HeapByteBuffer.compact(Unknown Source) at org.apache.tomcat.util.net.SocketBufferHandler.setWriteBufferConfiguredForWrite(SocketBufferHandler.java:109) at org.apache.tomcat.util.net.SocketBufferHandler.configureWriteBufferForWrite(SocketBufferHandler.java:91) at org.apache.tomcat.util.net.SocketWrapperBase.writeBlocking(SocketWrapperBase.java:447) at org.apache.tomcat.util.net.SocketWrapperBase.write(SocketWrapperBase.java:388) at org.apache.coyote.http11.Http11OutputBuffer$SocketOutputBuffer.doWrite(Http11OutputBuffer.java:644) at org.apache.coyote.http11.filters.ChunkedOutputFilter.doWrite(ChunkedOutputFilter.java:121) at org.apache.coyote.http11.Http11OutputBuffer.doWrite(Http11OutputBuffer.java:235) at org.apache.coyote.Response.doWrite(Response.java:541) at org.apache.catalina.connector.OutputBuffer.realWriteBytes(OutputBuffer.java:351) at org.apache.catalina.connector.OutputBuffer.flushByteBuffer(OutputBuffer.java:815) at org.apache.catalina.connector.OutputBuffer.doFlush(OutputBuffer.java:310) at org.apache.catalina.connector.OutputBuffer.close(OutputBuffer.java:263) at org.apache.catalina.connector.Response.finishResponse(Response.java:484) at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:373) at org.apache.coyote.http11.Http11Processor.service(Http11Processor.java:799) at org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:66) at org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:868) at org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1455) at org.apache.tomcat.util.net.SocketProcessorBase.r -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release JK 1.2.45
On 20/09/18 11:27, Rainer Jung wrote: > Partial results (IMHO no show-stoppers so far): > > - the following zip files previously contained LICENSE, NOTICE That is a show-stopper. But at least I can rebuild the binaries with those files. No need to re-tag. I wonder what went wrong. I don't think I did anything different. > and do no > longer contain them. The symbol files in addition miss the previously > contained README file: Less of an issue but I'll fix that too. > - > binaries/windows/symbols/tomcat-connectors-1.2.45-windows-i386-symbols.zip > - > binaries/windows/symbols/tomcat-connectors-1.2.45-windows-x86_64-symbols.zip > > - binaries/windows/tomcat-connectors-1.2.45-windows-i386-iis.zip > - binaries/windows/tomcat-connectors-1.2.45-windows-x86_64-iis.zip > > You might want to add the files to these artefacts? Will do. > - The file native/iis/pcre/testdata/grepbinary got currupted by > lineends.pl in the source zip. I added a feature to lineends.pl and used > it in jk-release.sh to prevent this from happening in the future. Thanks. > - the file .gitignore is missing in the top-level directory of the > source distribution. Added to jk-release.sh now for the future. And thanks again. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62749] NullPointerException call MimeHeaders.clear , java.lang.ArrayIndexOutOfBoundsException call SocketBufferHandler.setWriteBufferConfiguredForWrite
https://bz.apache.org/bugzilla/show_bug.cgi?id=62749 Mark Thomas changed: What|Removed |Added Status|NEW |NEEDINFO --- Comment #1 from Mark Thomas --- That is a concurrency bug. I can't tell where the root cause is but there are fixes for similar issues in newer versions of Tomcat. Please re-test with the latest 8.5.34 release. Also set the system property org.apache.catalina.connector.RECYCLE_FACADES to true. If the bug is in your app, you'll see NPEs when you try to re-use a request or response object illegally. -- 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: r1841463 - /tomcat/jk/trunk/native/apache-2.0/mod_jk.c
Author: rjung
Date: Thu Sep 20 12:29:27 2018
New Revision: 1841463
URL: http://svn.apache.org/viewvc?rev=1841463&view=rev
Log:
Silence compiler warning (unused variable).
The variable is a leftover from the r1840588
refactoring.
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=1841463&r1=1841462&r2=1841463&view=diff
==
--- tomcat/jk/trunk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-2.0/mod_jk.c Thu Sep 20 12:29:27 2018
@@ -4059,7 +4059,6 @@ static int jk_map_to_storage(request_rec
"no match for %s found",
r->uri);
if (conf->strip_session == JK_TRUE &&
conf->strip_session_name) {
-char *jsessionid;
if (r->uri) {
jk_strip_session_id(r->uri, conf->strip_session_name,
conf->log);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1841502 - /tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestApplicationContextGetRequestDispatcherB.java
Author: rjung
Date: Thu Sep 20 19:25:39 2018
New Revision: 1841502
URL: http://svn.apache.org/viewvc?rev=1841502&view=rev
Log:
Remove svn:executable from
test/org/apache/catalina/core/TestApplicationContextGetRequestDispatcherB.java.
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestApplicationContextGetRequestDispatcherB.java
(props changed)
Propchange:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestApplicationContextGetRequestDispatcherB.java
('svn:executable' removed)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1841515 - in /tomcat/site/trunk: ./ docs/ xdocs/
Author: violetagg Date: Thu Sep 20 20:17:27 2018 New Revision: 1841515 URL: http://svn.apache.org/viewvc?rev=1841515&view=rev Log: Updates (excluding docs) for 7.0.91 release Modified: tomcat/site/trunk/build.properties.default tomcat/site/trunk/docs/doap_Tomcat.rdf tomcat/site/trunk/docs/download-70.html tomcat/site/trunk/docs/index.html tomcat/site/trunk/docs/migration-7.html tomcat/site/trunk/docs/oldnews.html tomcat/site/trunk/docs/whichversion.html tomcat/site/trunk/xdocs/doap_Tomcat.rdf tomcat/site/trunk/xdocs/download-70.xml tomcat/site/trunk/xdocs/index.xml tomcat/site/trunk/xdocs/migration-7.xml tomcat/site/trunk/xdocs/oldnews.xml tomcat/site/trunk/xdocs/whichversion.xml Modified: tomcat/site/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/site/trunk/build.properties.default?rev=1841515&r1=1841514&r2=1841515&view=diff == --- tomcat/site/trunk/build.properties.default (original) +++ tomcat/site/trunk/build.properties.default Thu Sep 20 20:17:27 2018 @@ -36,7 +36,7 @@ tomcat.loc=http://www.apache.org/dist/to # - Tomcat versions - -tomcat70=7.0.90 +tomcat70=7.0.91 tomcat80=8.0.53 tomcat85=8.5.34 tomcat90=9.0.12 Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=1841515&r1=1841514&r2=1841515&view=diff == --- tomcat/site/trunk/docs/doap_Tomcat.rdf (original) +++ tomcat/site/trunk/docs/doap_Tomcat.rdf Thu Sep 20 20:17:27 2018 @@ -81,8 +81,8 @@ Latest Stable 7.0.x Release -2018-07-06 -7.0.90 +2018-09-19 +7.0.91 Modified: tomcat/site/trunk/docs/download-70.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-70.html?rev=1841515&r1=1841514&r2=1841515&view=diff == --- tomcat/site/trunk/docs/download-70.html (original) +++ tomcat/site/trunk/docs/download-70.html Thu Sep 20 20:17:27 2018 @@ -225,7 +225,7 @@ Quick Navigation -[define v]7.0.90[end] +[define v]7.0.91[end] https://www.apache.org/dist/tomcat/tomcat-7/KEYS";>KEYS | [v] | Browse | Modified: tomcat/site/trunk/docs/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1841515&r1=1841514&r2=1841515&view=diff == --- tomcat/site/trunk/docs/index.html (original) +++ tomcat/site/trunk/docs/index.html Thu Sep 20 20:17:27 2018 @@ -248,6 +248,29 @@ project logo are trademarks of the Apach + +2018-09-19 Tomcat 7.0.91 Released + + + +The Apache Tomcat Project is proud to announce the release of version 7.0.91 of +Apache Tomcat. This release contains a number of bug fixes and improvements +compared to version 7.0.90. + + + +Full details of these changes, and all the other changes, are available in the +Tomcat 7 changelog. + + + + + +https://tomcat.apache.org/download-70.cgi";>Download + + + + 2018-09-10 Tomcat 9.0.12 Released @@ -340,40 +363,6 @@ This version fixes a number of bugs foun - - -2018-07-06 Tomcat 7.0.90 Released - - - -The Apache Tomcat Project is proud to announce the release of version 7.0.90 of -Apache Tomcat. This release contains a number of bug fixes and improvements -compared to version 7.0.88. The notable changes compared to 7.0.88 include: - - - -Add the RemoteCIDRFilter and RemoteCIDRValve that can be used to allow/deny -requests based on IPv4 and/or IPv6 client address where the IP ranges are -defined using CIDR notation. Based on a patch by Francis Galiegue. - -Update the packaged version of the Tomcat Native Library to 1.2.17 to pick -up the latest Windows binaries built with APR 1.6.3 and OpenSSL 1.0.2o. - - - - - -Full details of these changes, and all the other changes, are available in the -Tomcat 7 changelog. - - - - - -https://tomcat.apache.org/download-70.cgi";>Download - - - 2018-07-05 Tomcat 8.0.53 Released Modified: tomcat/site/trunk/docs/migration-7.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-7.html?rev=1841515&r1=1841514&r2=1841515&view=diff == --- tomcat/site/trunk/docs/migration-7.html (original) +++ tomcat/site/trunk/docs/migration-7.html Thu Sep 20 20:17:27 2018 @@ -1112,7 +1112,8 @@ of Apache Tomcat. "7.0.85":"1823510", "7.0.86":"1828768", "7.0.88":"1831087", - "7.0.90":"1834866" + "7.0.90":"1834866", + "7.0.91":"1840853" }; formSubmit.action = "http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/"; + @@ -1204,8 +1205,9 @@ of Apache Tomcat. 7.0.84 7.0.85 7.0.86 -
svn commit: r1841517 - in /tomcat/site/trunk/docs: ./ tomcat-7.0-doc/ tomcat-7.0-doc/api/ tomcat-7.0-doc/api/org/apache/catalina/ tomcat-7.0-doc/api/org/apache/catalina/ant/ tomcat-7.0-doc/api/org/apa
Author: violetagg Date: Thu Sep 20 20:26:53 2018 New Revision: 1841517 URL: http://svn.apache.org/viewvc?rev=1841517&view=rev Log: Update docs for Apache Tomcat 7.0.91 release. [This commit notification would consist of 60 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r29555 - /release/tomcat/tomcat-7/v7.0.90/
Author: violetagg Date: Thu Sep 20 20:31:13 2018 New Revision: 29555 Log: Remove 7.0.90 Removed: release/tomcat/tomcat-7/v7.0.90/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[ANN] Apache Tomcat 7.0.91 released
The Apache Tomcat team announces the immediate availability of Apache Tomcat 7.0.91. Apache Tomcat is an open source software implementation of the Java Servlet, JavaServer Pages, Java Expression Language and Java WebSocket technologies. This release contains a number of bug fixes and improvements compared to version 7.0.90. Please refer to the change log for the complete list of changes: http://tomcat.apache.org/tomcat-7.0-doc/changelog.html Apache Tomcat website: http://tomcat.apache.org Downloads: http://tomcat.apache.org/download-70.cgi Migration guides from Apache Tomcat 5.5.x and 6.0.x: http://tomcat.apache.org/migration.html Enjoy The Apache Tomcat team
