svn commit: r31565 - in /dev/tomcat/tomcat-8/v8.5.37/bin: apache-tomcat-8.5.37.exe.asc apache-tomcat-8.5.37.exe.sha512

2018-12-17 Thread markt
Author: markt
Date: Mon Dec 17 10:37:31 2018
New Revision: 31565

Log:
Correct sig and hash for apache-tomcat-8.5.37.exe

Modified:
dev/tomcat/tomcat-8/v8.5.37/bin/apache-tomcat-8.5.37.exe.asc
dev/tomcat/tomcat-8/v8.5.37/bin/apache-tomcat-8.5.37.exe.sha512

Modified: dev/tomcat/tomcat-8/v8.5.37/bin/apache-tomcat-8.5.37.exe.asc
==
--- dev/tomcat/tomcat-8/v8.5.37/bin/apache-tomcat-8.5.37.exe.asc (original)
+++ dev/tomcat/tomcat-8/v8.5.37/bin/apache-tomcat-8.5.37.exe.asc Mon Dec 17 
10:37:31 2018
@@ -1,16 +1,17 @@
--BEGIN PGP SIGNATURE-
-
-iQIzBAABCAAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAlwQ+j0ACgkQEMAcWi9g
-Wef+8w/8DQTjmPD9Y4t5pFAya6plj5zLHGEgC9ZEHFjo7hZ0INw0oslE2oM4+Qck
-mQ2i2jAavQ/rj7HUNHeV+WVcZy3W6BbIlqumdmwfC9s8JNxQTp4OkAKf7hI6L5xF
-EcJ/bVwgLIRh4NG/0nJmjpgbggDtxXLhW/W+tyyf11Bkc6N5/R3rP9BWyY66WWRH
-qetfWlDH5t470DjUXGdylrqxBgt8y66v8VMWZG0gOYlmVCC4Opj8x1zdlWqywnt8
-s6JbE4MEK+sF+JSC9UyWqyASTs6/KI/n3g+LXzkn5qla/k+lR5edZNdNepw2Xu1t
-T+08jP+3WqfPAmGB8hgnLwNQadr8zgEwVQeaMs+TjAt1OtXdZQ8+Dcxg13RcJ1QO
-MZgAx+aQHTYhbcFhsnJueT09tNwBgcmOOCoVPiN0w/cHpA7eqsRbRCQekzjMRT3a
-VwnwUs64d2DrVlVYfoL1g3uG15QLi8KlcedTR8QX6XalIt2cP8kcDCpT9kDzVnzx
-XtUXRc7GlhTJx77s00CbqV61H/wViSkzs16IXT5y4H8QCZzRej3HKQ69Il3NZ+9+
-SmFbB11S8AnrHnWM7XHwhPfVa4hfYkOyYGv0iTsao7vGMIr4fV1EH9jDuB8K1LKY
-ubgpm0NdO06/txfxIr/GM1tYNfTrdE86B22u+ikD7EE0BkJfmmI=
-=c6XZ
--END PGP SIGNATURE-
+-BEGIN PGP SIGNATURE-
+Comment: GPGTools - http://gpgtools.org
+
+iQIzBAABCgAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAlwXfAcACgkQEMAcWi9g
+WedMPhAA2sGRZZg44qfGVBni4eHqv5BGbSOVJHVFW2Ri0obU5Ny2zMWMLS/aRhWd
+jHCYj6R63ccf0QvpzwbPEcVLLv1n0g5j248wP19M121qyG/IhAhuGBtd8tp8upQp
+Qlldw8J+P0vzg9Y1xHg4nvMQRD3OVGtCmHFbJfVXndOSgWjbYgxHoJSwGelV9X5M
+8WaKpDxlEo8r814vQ0Nkggzgj460vAVnIoZEI1gjmGmB0/wboo6j27Lq+daB1UXO
+oRT/Dpxk4mh8xJB1r5tSZEIGWs2QyckS93PQDe9il+q/vQTVmiX45S1U2zI1X/wY
+gDOkGLdkocf5kwHYRxi4TdF4V0VwCuw4hho9ysLwqIyq+Br6alvNZKt8kT81/ooX
+JbSRba5d3bLWi8WIF0LpbhWxh+Am8Z7+vj9yoMr5BQy8kcpWJ1Wat8GOKDeTy7xO
+z6xk3hjtOevGZEWhaVYQwwX7DYdieXTx0fAey07VL/k4cg3S+/NQD70K34ikxbQ2
+78L8gJNcM5VyQtY3yvsAie+7FCcmZevESVEiQab9fKrmu2KYXK6qkDq3zYXiAQ2N
+WpUAxmDF0hpNCDulIF4ZglU8Mb2hvEQbHfHhX1SzmkdwkJnu6UPO+Qw5onMFL3L5
+AZ7TsVDmVRUOitL/s0nAj31TIrUp3dKb/7joZBVcsNnsRKRhMMo=
+=33R5
+-END PGP SIGNATURE-

Modified: dev/tomcat/tomcat-8/v8.5.37/bin/apache-tomcat-8.5.37.exe.sha512
==
--- dev/tomcat/tomcat-8/v8.5.37/bin/apache-tomcat-8.5.37.exe.sha512 (original)
+++ dev/tomcat/tomcat-8/v8.5.37/bin/apache-tomcat-8.5.37.exe.sha512 Mon Dec 17 
10:37:31 2018
@@ -1 +1 @@
-2ef46708f1d04561481ba23dca78a13eaf32cfe0e5c681e58353cc08f446f627da29ef189794df2b38e9190886300e7a8dca69c604ad4f29d9d0871fc553
 *apache-tomcat-8.5.37.exe
\ No newline at end of file
+0d0ed883f57e85d334450a27c5104b17f4a99156eeba9ebf81ea8a0b3a56d021b990b00b7c289163c9b3478e00d54935f0b65d6df9de04d05ba9b3f0ce2437cc
 *apache-tomcat-8.5.37.exe



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



Re: [VOTE] Release Apache Tomcat 8.5.37

2018-12-17 Thread Mark Thomas
On 16/12/2018 16:02, Christopher Schultz wrote:



> I've got a signature problem with the Windows installer (see below).
> Everything else seems okay. I'll hold my +1 until we sort that out.

Ah. That is probably my fault. I managed to kill the release build after
it had completed the Windows installer signing so, rather than
incrementing the version number and starting again (you can't sign the
same version twice), I opted to call each of the remaining targets
manually. I'm guessing I missed the part of the script that re-generates
the GPG sig and hashes for the window installer after the installer had
been signed for Windows.

I keep the build directory structure for a release until I do the next
release in case of issues like this so I'll take a look.

> Works with a standard servlet application.
> 
> Details:
> 
> * Environment
> *  Java (build): java version "1.8.0_181" Java(TM) SE Runtime
> Environment (build 1.8.0_181-b13) Java HotSpot(TM) 64-Bit Server VM
> (build 25.181-b13, mixed mode)
> *  Java (test): java version "1.8.0_181" Java(TM) SE Runtime
> Environment (build 1.8.0_181-b13) Java HotSpot(TM) 64-Bit Server VM
> (build 25.181-b13, mixed mode)
> *  OS:   Linux 2.6.32-312-ec2 x86_64
> *  cc:   cc (Debian 4.7.2-5) 4.7.2
> *  make: GNU Make 3.81
> *  OpenSSL:  OpenSSL 1.1.1 11 Sep 2018
> *  APR:  1.4.6
> * Valid SHA-2512 signature for apache-tomcat-8.5.37.zip
> * Valid GPG signature for apache-tomcat-8.5.37.zip
> * Valid SHA-512 signature for apache-tomcat-8.5.37.tar.gz
> * Valid GPG signature for apache-tomcat-8.5.37.tar.gz
> * !! Invalid SHA-256 signature for apache-tomcat-8.5.37.exe
> 
> Hmm. The SHA512 sig I get is:
> 
> 0d0ed883f57e85d334450a27c5104b17f4a99156eeba9ebf81ea8a0b3a56d021b990b00b
> 7c289163c9b3478e00d54935f0b65d6df9de04d05ba9b3f0ce2437cc
> 
> The sig file says:
> 
> 2ef46708f1d04561481ba23dca78a13eaf32cfe0e5c681e58353cc08f446f627da29ef18
> 9794df2b38e9190886300e7a8dca69c604ad4f29d9d0871fc553
> 
> * !! Invalid GPG signature for apache-tomcat-8.5.37.exe
> 
> $ gpg --verbose --keyring ./apache-keys --no-default-keyring --verify
> apache-tomcat-8.5.37.exe.asc apache-tomcat-8.5.37.exe
> gpg: Signature made Wed 12 Dec 2018 07:08:29 AM EST using RSA key ID
> 2F6059E7
> gpg: using PGP trust model
> gpg: BAD signature from "Mark E D Thomas "
> gpg: binary signature, digest algorithm SHA256
> 
> 
> I got a fresh copy from
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.37/bin/
> and I'm getting the same errors on that file.

Looking at the timestamps, I failed to update that hash and sig. Should
be fixed now.



> * Junit Tests: FAILED
> * Tests that failed:
> * org.apache.catalina.session.TestStandardSessionIntegration.NIO.txt
> 
> I get this error in the above test:
> 
> 14-Dec-2018 17:06:54.042 SEVERE [main]
> org.apache.catalina.tribes.transport.nio.NioReceiver.start Unable to
> start cluster receiver
>  java.net.BindException: Cannot assign requested address
>   at sun.nio.ch.Net.bind0(Native Method)
>   at sun.nio.ch.Net.bind(Net.java:433)
>   at sun.nio.ch.Net.bind(Net.java:425)
>   at
> sun.nio.ch.ServerSocketChannelImpl.bind(ServerSocketChannelImpl.java:223
> )
>   at sun.nio.ch.ServerSocketAdaptor.bind(ServerSocketAdaptor.java:74)
>   at sun.nio.ch.ServerSocketAdaptor.bind(ServerSocketAdaptor.java:67)
>   at
> org.apache.catalina.tribes.transport.ReceiverBase.bind(ReceiverBase.java
> :205)
> 
> 
> I'm not sure what address is being attempted there, but this could be
> an environmental issue. Historically, I've had issues with Tribes
> integration tests, though I have far fewer of them these days. I used
> to think it was because of lack of multicast, but it appears that
> multicast is indeed enabled.
> 
> Re-running the test again also fails. Any ideas for what to look for?

There should be a log message that includes the address - I think before
the exception you quote above. That might provide some clues.

Mark

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



svn commit: r1849075 - /tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java

2018-12-17 Thread remm
Author: remm
Date: Mon Dec 17 10:52:44 2018
New Revision: 1849075

URL: http://svn.apache.org/viewvc?rev=1849075&view=rev
Log:
Add missing code to match the local member.

Modified:

tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java?rev=1849075&r1=1849074&r2=1849075&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java
 Mon Dec 17 10:52:44 2018
@@ -79,6 +79,15 @@ public class DNSMembershipProvider exten
 for (InetAddress inetAddress : inetAddresses) {
 String ip = inetAddress.getHostAddress();
 byte[] id = md5.digest(ip.getBytes());
+// We found ourselves, ignore
+if (inetAddress.getHostName().equals(hostName)) {
+// Update the UID on initial lookup
+Member localMember = service.getLocalMember(false);
+if (localMember.getUniqueId() == 
CloudMembershipService.INITIAL_ID && localMember instanceof MemberImpl) {
+((MemberImpl) localMember).setUniqueId(id);
+}
+continue;
+}
 long aliveTime = -1;
 MemberImpl member = null;
 try {



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



[Bug 63003] Tomcat is closing async connection prematurely when shutdown is initiated.

2018-12-17 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=63003

--- Comment #1 from Mark Thomas  ---
It is the unloadDelay that is most relevant in this use case. If that is
honoured then there should be enough time for the other timeouts to be
honoured. Let me dig into what is going on.

-- 
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 Apache Tomcat 8.5.37

2018-12-17 Thread Christopher Schultz
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Mark,

On 12/17/18 05:49, Mark Thomas wrote:
> On 16/12/2018 16:02, Christopher Schultz wrote:
> 
> 
> 
>> I've got a signature problem with the Windows installer (see
>> below). Everything else seems okay. I'll hold my +1 until we sort
>> that out.
> 
> Ah. That is probably my fault. I managed to kill the release build
> after it had completed the Windows installer signing so, rather
> than incrementing the version number and starting again (you can't
> sign the same version twice), I opted to call each of the remaining
> targets manually. I'm guessing I missed the part of the script that
> re-generates the GPG sig and hashes for the window installer after
> the installer had been signed for Windows.
> 
> I keep the build directory structure for a release until I do the
> next release in case of issues like this so I'll take a look.
> 
> [snip]
> 
> Looking at the timestamps, I failed to update that hash and sig.
> Should be fixed now.

Sigs look good, now:


$ gpg --verbose --keyring ./apache-keys --no-default-keyring --verify
apache-tomcat-8.5.37.exe.asc apache-tomcat-8.5.37.exe
gpg: armor header: Comment: GPGTools - http://gpgtools.org
gpg: Signature made Mon 17 Dec 2018 05:35:51 AM EST using RSA key ID
2F6059E7
gpg: using PGP trust model
gpg: Good signature from "Mark E D Thomas "
gpg: WARNING: This key is not certified with a trusted signature!
gpg:  There is no indication that the signature belongs to the
owner.
Primary key fingerprint: A9C5 DF4D 22E9 9998 D987  5A51 10C0 1C5A 2F60
59E7
gpg: binary signature, digest algorithm SHA512


$ sha512sum -c apache-tomcat-8.5.37.exe.sha512
apache-tomcat-8.5.37.exe: OK



>> * Junit Tests: FAILED * Tests that failed: *
>> org.apache.catalina.session.TestStandardSessionIntegration.NIO.txt
>>
>>
>> 
I get this error in the above test:
>> 
>> 14-Dec-2018 17:06:54.042 SEVERE [main] 
>> org.apache.catalina.tribes.transport.nio.NioReceiver.start Unable
>> to start cluster receiver java.net.BindException: Cannot assign
>> requested address at sun.nio.ch.Net.bind0(Native Method) at
>> sun.nio.ch.Net.bind(Net.java:433) at
>> sun.nio.ch.Net.bind(Net.java:425) at 
>> sun.nio.ch.ServerSocketChannelImpl.bind(ServerSocketChannelImpl.java:
223
>>
>> 
)
>> at
>> sun.nio.ch.ServerSocketAdaptor.bind(ServerSocketAdaptor.java:74) 
>> at
>> sun.nio.ch.ServerSocketAdaptor.bind(ServerSocketAdaptor.java:67) 
>> at 
>> org.apache.catalina.tribes.transport.ReceiverBase.bind(ReceiverBase.j
ava
>>
>> 
:205)
>> 
>> 
>> I'm not sure what address is being attempted there, but this
>> could be an environmental issue. Historically, I've had issues
>> with Tribes integration tests, though I have far fewer of them
>> these days. I used to think it was because of lack of multicast,
>> but it appears that multicast is indeed enabled.
>> 
>> Re-running the test again also fails. Any ideas for what to look
>> for?
> 
> There should be a log message that includes the address - I think
> before the exception you quote above. That might provide some
> clues.

Testsuite: org.apache.catalina.session.TestStandardSessionIntegration
Tests run: 2, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 2.415 se
c
- - Standard Error -
16-Dec-2018 11:01:02.983 INFO [main]
org.apache.catalina.startup.LoggingBaseTest.setUp Starting test case
[testBug56578a]
16-Dec-2018 11:01:03.895 INFO [main]
org.apache.coyote.AbstractProtocol.init Initializing ProtocolHandler
["http-nio-127.0.0.1-auto-1"]
16-Dec-2018 11:01:03.935 INFO [main]
org.apache.tomcat.util.net.NioSelectorPool.getSharedSelector Using a
shared selector for servlet write/read
16-Dec-2018 11:01:03.970 INFO [main]
org.apache.catalina.core.StandardService.startInternal Starting
service [Tomcat]
16-Dec-2018 11:01:03.970 INFO [main]
org.apache.catalina.core.StandardEngine.startInternal Starting Servlet
Engine: Apache Tomcat/8.5.37
16-Dec-2018 11:01:03.990 INFO [main]
org.apache.catalina.ha.tcp.SimpleTcpCluster.startInternal Cluster is
about to start
16-Dec-2018 11:01:04.189 INFO [main]
org.apache.catalina.tribes.transport.ReceiverBase.bind Unable to bind
server socket to:[/:4099] throwing error.
16-Dec-2018 11:01:04.190 SEVERE [main]
org.apache.catalina.tribes.transport.nio.NioReceiver.start Unable to
start cluster receiver
 java.net.BindException: Cannot assign requested address
at sun.nio.ch.Net.bind0(Native Method)
[...]

Is that / before the IP address correct?

The IP address  is an IP address that can be used to
reach this EC2 instance (where I'm running the testing), but it's not
an IP address held by the actual VM, so that's probably the problem.
Is there a way to force the "localhost" IP address for these tests? It
needs to be 10.something.

- -chris
-BEGIN PGP SIGNATURE-
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/

iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAlwXzPcACgkQHPApP6U8
pFgH+xAAkHnTigf52Q5l1mjObCcPnp1sM9A0rF9kACyRX7m

Re: [VOTE] Release Apache Tomcat 8.5.37

2018-12-17 Thread Mark Thomas
On 17/12/2018 16:21, Christopher Schultz wrote:



> 16-Dec-2018 11:01:04.189 INFO [main]
> org.apache.catalina.tribes.transport.ReceiverBase.bind Unable to bind
> server socket to:[/:4099] throwing error.
> 16-Dec-2018 11:01:04.190 SEVERE [main]
> org.apache.catalina.tribes.transport.nio.NioReceiver.start Unable to
> start cluster receiver
>  java.net.BindException: Cannot assign requested address
> at sun.nio.ch.Net.bind0(Native Method)
> [...]
> 
> Is that / before the IP address correct?

Yes. Looking at the toString() implementation it is:



and  is the empty string if the host name is unknown.

> The IP address  is an IP address that can be used to
> reach this EC2 instance (where I'm running the testing), but it's not
> an IP address held by the actual VM, so that's probably the problem.
> Is there a way to force the "localhost" IP address for these tests? It
> needs to be 10.something.

That sounds like an explicit setter needs to be added to the unit test
although I haven't dug into exactly what/where.

Mark

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



Re: JDK 12 enters Rampdown Phase One

2018-12-17 Thread Rory O'Donnell

Great to know, thanks Mark.

Rgds,Rory


On 14/12/2018 15:49, Mark Thomas wrote:

On 14/12/2018 10:47, Rory O'Donnell wrote:

Hi Mark,

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

  * Per the JDK 12 schedule [1], we are now in Rampdown Phase One.
  o For more details , see Mark Reinhold's email to jdk-dev mailing
list [2]
  o The overall feature set is frozen, no further JEPs will be
targeted to this release.
  o We’ve forked the main-line source repository, jdk/jdk, to the
JDK 12 stabilization repository.

I've just built 9.0.x and run through the unit tests on all three
connectors with this latest EA version with no errors.

Simple smoke test (WebSocket snake game exmaple) passes too.

Mark


Changes since the last availability email

  * JEP 189: Shenandoah: A Low-Pause-Time Garbage Collector
(Experimental)  moved to *Targeted*.
  * JEP 334: JVM Constants API  moved
to *Targeted*.
  * JEP 344: Abortable Mixed Collections for G1
 moved  to *Targeted*.
  * JEP 346: Promptly Return Unused Committed Memory from G1
 to *Targeted*.
  * JEP 326: Raw String Literals 
(Preview) *Proposed to drop from JDK 12*
  o link to proposal on jdk-dev
   



Bug fixes reported by Open Source Projects  :

  o JDK-8211051 - fixed in b22 - reported by JUnit5
  o JDK-8211422 - fixed in b23 - reported by Apache Batik

The Java Crypto Roadmap  has been
updated with the following target:

  * With the 2019-04-16 CPU,
  o Targeted Releases - JDK 12, JDK 11, JDK 8, and JDK 7
  o Distrust TLS server certificates anchored by Symantec Root CAs.

Oracle Java SE 8 Release Updates [3]

  * Public updates for Oracle Java SE 8 released after January 2019 will
not be available for business, commercial or production use without
a commercial license.

Rgds, Rory

[1] http://openjdk.java.net/projects/jdk/12/#Schedule
[2]
http://mail.openjdk.java.net/pipermail/jdk-dev/2018-December/002405.html
[3] https://java.com/en/download/release_notice.jsp



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



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


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



Re: [VOTE] Release Apache Tomcat 8.5.37

2018-12-17 Thread Christopher Schultz
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Mark,

On 12/17/18 11:37, Mark Thomas wrote:
> On 17/12/2018 16:21, Christopher Schultz wrote:
> 
> 
> 
>> 16-Dec-2018 11:01:04.189 INFO [main] 
>> org.apache.catalina.tribes.transport.ReceiverBase.bind Unable to
>> bind server socket to:[/:4099] throwing error. 
>> 16-Dec-2018 11:01:04.190 SEVERE [main] 
>> org.apache.catalina.tribes.transport.nio.NioReceiver.start Unable
>> to start cluster receiver java.net.BindException: Cannot assign
>> requested address at sun.nio.ch.Net.bind0(Native Method) [...]
>> 
>> Is that / before the IP address correct?
> 
> Yes. Looking at the toString() implementation it is:
> 
> 
> 
> and  is the empty string if the host name is unknown.
> 
>> The IP address  is an IP address that can be used
>> to reach this EC2 instance (where I'm running the testing), but
>> it's not an IP address held by the actual VM, so that's probably
>> the problem. Is there a way to force the "localhost" IP address
>> for these tests? It needs to be 10.something.
> 
> That sounds like an explicit setter needs to be added to the unit
> test although I haven't dug into exactly what/where.

Okay. This unit test does not represent a general problem, then. I'll
reply separately with my vote.

- -chris
-BEGIN PGP SIGNATURE-
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/

iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAlwX1sQACgkQHPApP6U8
pFi6Dw//SHy7ZNVGDtAU8OnF3yFGsfaK/0Kf/be5ozlbRUmyYCE5RJLN14MdzKtf
YUGhpHP31IolatYSVHmhR3unLa3dd7UXM0fqMmZ22XL2Zf8TRHjhvIpa5St/1PoK
Kf3nR087TK+XRC5m3EdCgQ3DZJusgptVc2HHm+c1tpsD4l2PGr5vDeQBez3xCw4J
jMqSyUSeY5SCEnDzG8nuXSapSUbDu4Z4nLXgazCu6hbhhCCcRsCrN0UwmcoA8916
XCHCDHZojLQUg8QLebc+/nODPtEQhntGY5sJKbs2Qatts4FUlmBD3zPdll13Xt4s
7WAp8Q0kMd/GUjwRVoiAcwsMnv2x8cNIh6BPlqrSE87mkN67twQA0Q/Kk41l+3xx
uMf94091KqcDUq5Vnk12ZOjx8ndOpBt/uOAPa36EPJHF0yjNike7BcNX+im0HXuY
VnJqRIjWNK2SBGuFyHJYBfLCQlQU+bwr/d9oMzqeiD0O+Fpxm/0AhKtNZrt6CLjS
p9LSVd+CROJ6pIls3bqUSTBEDJba12L2D9cBMvi1DPtKHRJQT4Mu/YfoHYzKjx4u
Y1TOf/qPMF6BKlUw+yNSBZJHLzXkvEZj9V9LqjX80umb34J7gqL85DWwwf9KfYQG
66YfjTrgrBcxtpUoYCnboRU10C2Fnx8l3UzRHqsWgjlmwXi6g5c=
=1mNB
-END PGP SIGNATURE-

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



Re: [VOTE] Release Apache Tomcat 8.5.37

2018-12-17 Thread Christopher Schultz
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

All,

Thanks for volunteering to RM this release. Sigs are correct. Unit
test failure is environmental in nature.

+1 to release STABLE 8.5.37

- -chris

On 12/16/18 11:02, Christopher Schultz wrote:
> All,
> 
> On 12/12/18 08:22, Mark Thomas wrote:
>> The proposed Apache Tomcat 8.5.37 release is now available for 
>> voting.
> 
>> The major changes compared to the 8.5.35 release are:
> 
>> - Implement the requirements of section 8.2.2 2.c of the Servlet
>>  specification and prevent a web application from deploying if
>> it has fragments with duplicate names and is configured to use 
>> relative ordering of fragments.
> 
>> - The default Servlet no longer overrides a previously set 
>> content-type.
> 
>> - Update the packaged version of the Tomcat Native Library to 
>> 1.2.19 to pick up the latest Windows binaries built with APR
>> 1.6.5 and OpenSSL 1.1.1a.
> 
>> Along with lots of other bug fixes and improvements.
> 
>> It can be obtained from: 
>> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.37/
>> The Maven staging repo is: 
>> https://repository.apache.org/content/repositories/orgapachetomcat-12
0
>
>> 
1/
> 
> 
> The svn tag is:
>> http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_37/
>
>>  The proposed 8.5.37 release is: [ ] Broken - do not release [ ] 
>> Stable - go ahead and release as 8.5.37
> 
> I've got a signature problem with the Windows installer (see
> below). Everything else seems okay. I'll hold my +1 until we sort
> that out.
> 
> Works with a standard servlet application.
> 
> Details:
> 
> * Environment *  Java (build): java version "1.8.0_181"
> Java(TM) SE Runtime Environment (build 1.8.0_181-b13) Java
> HotSpot(TM) 64-Bit Server VM (build 25.181-b13, mixed mode) *  Java
> (test): java version "1.8.0_181" Java(TM) SE Runtime 
> Environment (build 1.8.0_181-b13) Java HotSpot(TM) 64-Bit Server
> VM (build 25.181-b13, mixed mode) *  OS:   Linux 2.6.32-312-ec2
> x86_64 *  cc:   cc (Debian 4.7.2-5) 4.7.2 *  make: GNU Make
> 3.81 *  OpenSSL:  OpenSSL 1.1.1 11 Sep 2018 *  APR:  1.4.6 *
> Valid SHA-2512 signature for apache-tomcat-8.5.37.zip * Valid GPG
> signature for apache-tomcat-8.5.37.zip * Valid SHA-512 signature
> for apache-tomcat-8.5.37.tar.gz * Valid GPG signature for
> apache-tomcat-8.5.37.tar.gz * !! Invalid SHA-256 signature for
> apache-tomcat-8.5.37.exe
> 
> Hmm. The SHA512 sig I get is:
> 
> 0d0ed883f57e85d334450a27c5104b17f4a99156eeba9ebf81ea8a0b3a56d021b990b0
0b
>
> 
7c289163c9b3478e00d54935f0b65d6df9de04d05ba9b3f0ce2437cc
> 
> The sig file says:
> 
> 2ef46708f1d04561481ba23dca78a13eaf32cfe0e5c681e58353cc08f446f627da29ef
18
>
> 
9794df2b38e9190886300e7a8dca69c604ad4f29d9d0871fc553
> 
> * !! Invalid GPG signature for apache-tomcat-8.5.37.exe
> 
> $ gpg --verbose --keyring ./apache-keys --no-default-keyring
> --verify apache-tomcat-8.5.37.exe.asc apache-tomcat-8.5.37.exe gpg:
> Signature made Wed 12 Dec 2018 07:08:29 AM EST using RSA key ID 
> 2F6059E7 gpg: using PGP trust model gpg: BAD signature from "Mark E
> D Thomas " gpg: binary signature, digest
> algorithm SHA256
> 
> 
> I got a fresh copy from 
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.37/bin/
>
> 
and I'm getting the same errors on that file.
> 
> * Valid SHA512 signature for apache-tomcat-8.5.37-src.zip * Valid
> GPG signature for apache-tomcat-8.5.37-src.zip * Valid SHA512
> signature for apache-tomcat-8.5.37-src.tar.gz * Valid GPG signature
> for apache-tomcat-8.5.37-src.tar.gz * Binary Zip and tarball: Same 
> * Source Zip and tarball: Same * Building dependencies returned: 0 
> * tcnative builds cleanly * Tomcat builds cleanly * Junit Tests:
> FAILED * Tests that failed: *
> org.apache.catalina.session.TestStandardSessionIntegration.NIO.txt
> 
> I get this error in the above test:
> 
> 14-Dec-2018 17:06:54.042 SEVERE [main] 
> org.apache.catalina.tribes.transport.nio.NioReceiver.start Unable
> to start cluster receiver java.net.BindException: Cannot assign
> requested address at sun.nio.ch.Net.bind0(Native Method) at
> sun.nio.ch.Net.bind(Net.java:433) at
> sun.nio.ch.Net.bind(Net.java:425) at 
> sun.nio.ch.ServerSocketChannelImpl.bind(ServerSocketChannelImpl.java:2
23
>
> 
)
> at
> sun.nio.ch.ServerSocketAdaptor.bind(ServerSocketAdaptor.java:74) at
> sun.nio.ch.ServerSocketAdaptor.bind(ServerSocketAdaptor.java:67) 
> at 
> org.apache.catalina.tribes.transport.ReceiverBase.bind(ReceiverBase.ja
va
>
> 
:205)
> 
> 
> I'm not sure what address is being attempted there, but this could
> be an environmental issue. Historically, I've had issues with
> Tribes integration tests, though I have far fewer of them these
> days. I used to think it was because of lack of multicast, but it
> appears that multicast is indeed enabled.
> 
> Re-running the test again also fails. Any ideas for what to look
> for?
> 
> -chris
> 
> -
>
> 
To

svn commit: r1849109 - /tomcat/jk/trunk/xdocs/tomcat-docs.xsl

2018-12-17 Thread csutherl
Author: csutherl
Date: Mon Dec 17 17:10:48 2018
New Revision: 1849109

URL: http://svn.apache.org/viewvc?rev=1849109&view=rev
Log:
Revert temporary fix in r1848972 and correctly fix the problem

Modified:
tomcat/jk/trunk/xdocs/tomcat-docs.xsl

Modified: tomcat/jk/trunk/xdocs/tomcat-docs.xsl
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/tomcat-docs.xsl?rev=1849109&r1=1849108&r2=1849109&view=diff
==
--- tomcat/jk/trunk/xdocs/tomcat-docs.xsl (original)
+++ tomcat/jk/trunk/xdocs/tomcat-docs.xsl Mon Dec 17 17:10:48 2018
@@ -46,7 +46,6 @@
   https://bz.apache.org/bugzilla/show_bug.cgi?id='"/>
   https://svn.apache.org/viewvc?view=rev&rev='"/>
   https://tomcat.apache.org/connectors-doc'"/>
-  
   https://tomcat.apache.org/security-jk.html'"/>
   https://tomcat.apache.org/download-connectors.cgi'"/>
   
@@ -247,14 +246,7 @@
 
   
 
-
-  
-
-  
-  
-
-  
-
+
   
 
 



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



svn commit: r1849111 - /tomcat/jk/trunk/xdocs/build.xml

2018-12-17 Thread csutherl
Author: csutherl
Date: Mon Dec 17 17:24:14 2018
New Revision: 1849111

URL: http://svn.apache.org/viewvc?rev=1849111&view=rev
Log:
Follow up on r1849109, utilize subdir param to include correct project.xml in 
subdirectory pages

Modified:
tomcat/jk/trunk/xdocs/build.xml

Modified: tomcat/jk/trunk/xdocs/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/build.xml?rev=1849111&r1=1849110&r2=1849111&view=diff
==
--- tomcat/jk/trunk/xdocs/build.xml (original)
+++ tomcat/jk/trunk/xdocs/build.xml Mon Dec 17 17:24:14 2018
@@ -89,6 +89,7 @@
   excludes="project.xml"
   includes="*.xml">
   
+  
 
 
 
   
   
+  
 
 
 
@@ -109,6 +111,7 @@
   excludes="project.xml"
   includes="*.xml">
   
+  
 
 
 
   
   
+  
 
 
 
@@ -129,6 +133,7 @@
   excludes="project.xml"
   includes="*.xml">
   
+  
 
 
 
   
   
+  
 
 
 
@@ -149,6 +155,7 @@
   excludes="project.xml"
   includes="*.xml">
   
+  
 
 
 
   
   
+  
 
 
 
@@ -169,6 +177,7 @@
   excludes="project.xml"
   includes="*.xml">
   
+  
 
 
 
   
   
+  
 
 
 
@@ -189,6 +199,7 @@
   excludes="project.xml"
   includes="*.xml">
   
+  
 
 
 
   
   
+  
 
  
   



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



svn commit: r1849112 - /tomcat/jk/trunk/HOWTO-RELEASE.txt

2018-12-17 Thread csutherl
Author: csutherl
Date: Mon Dec 17 17:26:45 2018
New Revision: 1849112

URL: http://svn.apache.org/viewvc?rev=1849112&view=rev
Log:
Update release guide to include up-to-date instructions for documentation 
release

Modified:
tomcat/jk/trunk/HOWTO-RELEASE.txt

Modified: tomcat/jk/trunk/HOWTO-RELEASE.txt
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/HOWTO-RELEASE.txt?rev=1849112&r1=1849111&r2=1849112&view=diff
==
--- tomcat/jk/trunk/HOWTO-RELEASE.txt (original)
+++ tomcat/jk/trunk/HOWTO-RELEASE.txt Mon Dec 17 17:26:45 2018
@@ -103,8 +103,9 @@ cd xdocs
 ant
 
 
-Check the documentation carefully (produced in build/docs)
-and copy it to people.apache.org:/x1/www/tomcat.apache.org/connectors-doc
+After checking the documentation carefully (produced in build/docs),
+see https://svn.apache.org/viewvc/tomcat/site/trunk/README.txt?view=markup
+for instructions on how to deploy the site docs.
 
 Create the new source distribution
 --



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



svn commit: r1849113 - in /tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud: CloudMembershipProvider.java DNSMembershipProvider.java KubernetesMembershipProvider.java

2018-12-17 Thread remm
Author: remm
Date: Mon Dec 17 17:26:52 2018
New Revision: 1849113

URL: http://svn.apache.org/viewvc?rev=1849113&view=rev
Log:
Use ip rather than name to match the local member.

Modified:

tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipProvider.java

tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java

tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/KubernetesMembershipProvider.java

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipProvider.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipProvider.java?rev=1849113&r1=1849112&r2=1849113&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipProvider.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipProvider.java
 Mon Dec 17 17:26:52 2018
@@ -52,8 +52,8 @@ public abstract class CloudMembershipPro
 
 protected Map headers = new HashMap<>();
 
+protected String localIp;
 protected int port;
-protected String hostName;
 
 protected long expirationTime = 5000;
 
@@ -87,7 +87,7 @@ public abstract class CloudMembershipPro
 connectionTimeout = 
Integer.parseInt(properties.getProperty("connectionTimeout", "1000"));
 readTimeout = Integer.parseInt(properties.getProperty("readTimeout", 
"1000"));
 
-hostName = InetAddress.getLocalHost().getHostName();
+localIp = InetAddress.getLocalHost().getHostAddress();
 port = Integer.parseInt(properties.getProperty("tcpListenPort"));
 
 expirationTime = 
Long.parseLong(properties.getProperty("expirationTime", "5000"));

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java?rev=1849113&r1=1849112&r2=1849113&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java
 Mon Dec 17 17:26:52 2018
@@ -80,7 +80,7 @@ public class DNSMembershipProvider exten
 String ip = inetAddress.getHostAddress();
 byte[] id = md5.digest(ip.getBytes());
 // We found ourselves, ignore
-if (inetAddress.getHostName().equals(hostName)) {
+if (localIp.equals(ip)) {
 // Update the UID on initial lookup
 Member localMember = service.getLocalMember(false);
 if (localMember.getUniqueId() == 
CloudMembershipService.INITIAL_ID && localMember instanceof MemberImpl) {

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/KubernetesMembershipProvider.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/KubernetesMembershipProvider.java?rev=1849113&r1=1849112&r2=1849113&view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/KubernetesMembershipProvider.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/KubernetesMembershipProvider.java
 Mon Dec 17 17:26:52 2018
@@ -174,7 +174,6 @@ public class KubernetesMembershipProvide
 
log.warn(sm.getString("kubernetesMembershipProvider.invalidPod"));
 continue;
 }
-String name = nameObject.toString();
 Object objectUid = metadata.get("uid");
 Object creationTimestampObject = 
metadata.get("creationTimestamp");
 if (creationTimestampObject == null) {
@@ -201,7 +200,7 @@ public class KubernetesMembershipProvide
 String uid = (objectUid == null) ? podIP : 
objectUid.toString();
 
 // We found ourselves, ignore
-if (name.equals(hostName)) {
+if (localIp.equals(podIP)) {
 // Update the UID on initial lookup
 Member localMember = service.getLocalMember(false);
 if (localMember.getUniqueId() == 
CloudMembershipService.INITIAL_ID && localMember instanceof MemberImpl) {



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



svn commit: r1849114 - in /tomcat/trunk: java/org/apache/catalina/tribes/membership/Membership.java webapps/docs/changelog.xml

2018-12-17 Thread remm
Author: remm
Date: Mon Dec 17 17:28:35 2018
New Revision: 1849114

URL: http://svn.apache.org/viewvc?rev=1849114&view=rev
Log:
Never expire a local member from the membership object.

Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/Membership.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/membership/Membership.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/Membership.java?rev=1849114&r1=1849113&r2=1849114&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/membership/Membership.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/membership/Membership.java Mon 
Dec 17 17:28:35 2018
@@ -343,8 +343,7 @@ public class Membership implements Clone
  * false
  */
 public boolean hasExpired(long maxtime) {
-long delta = System.currentTimeMillis() - lastHeardFrom;
-return delta > maxtime;
+return !mbr.isLocal() && (System.currentTimeMillis() - 
lastHeardFrom) > maxtime;
 }
 }
 }

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1849114&r1=1849113&r2=1849114&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Dec 17 17:28:35 2018
@@ -79,6 +79,9 @@
 than getting the pod list but it does not indicate pod status.
 Submitted by by Maxime Beck. (remm)
   
+  
+Never expire the local member from a Membership. (remm)
+  
 
   
 



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



svn commit: r1849117 - in /tomcat/jk/trunk/xdocs: ./ ajp/ common_howto/ miscellaneous/ news/ reference/ webserver_howto/

2018-12-17 Thread csutherl
Author: csutherl
Date: Mon Dec 17 17:37:40 2018
New Revision: 1849117

URL: http://svn.apache.org/viewvc?rev=1849117&view=rev
Log:
Unify page titles with navbar links and correct title casing

Modified:
tomcat/jk/trunk/xdocs/ajp/project.xml
tomcat/jk/trunk/xdocs/common_howto/loadbalancers.xml
tomcat/jk/trunk/xdocs/common_howto/project.xml
tomcat/jk/trunk/xdocs/miscellaneous/faq.xml
tomcat/jk/trunk/xdocs/miscellaneous/project.xml
tomcat/jk/trunk/xdocs/news/project.xml
tomcat/jk/trunk/xdocs/project.xml
tomcat/jk/trunk/xdocs/reference/project.xml
tomcat/jk/trunk/xdocs/webserver_howto/nes.xml
tomcat/jk/trunk/xdocs/webserver_howto/project.xml

Modified: tomcat/jk/trunk/xdocs/ajp/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/ajp/project.xml?rev=1849117&r1=1849116&r2=1849117&view=diff
==
--- tomcat/jk/trunk/xdocs/ajp/project.xml (original)
+++ tomcat/jk/trunk/xdocs/ajp/project.xml Mon Dec 17 17:37:40 2018
@@ -30,8 +30,8 @@
 
 
 
-
-
+
+
 
 
 
@@ -57,7 +57,7 @@
 
 
 
-
+
 
 http://issues.apache.org/bugzilla/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&product=Tomcat+Connectors&long_desc_type=substring&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&keywords_type=allwords&keywords=&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&emailassigned_to1=1&emailtype1=substring&email1=&emailassigned_to2=1&emailreporter2=1&emailcc2=1&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0="/>
 

Modified: tomcat/jk/trunk/xdocs/common_howto/loadbalancers.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/common_howto/loadbalancers.xml?rev=1849117&r1=1849116&r2=1849117&view=diff
==
--- tomcat/jk/trunk/xdocs/common_howto/loadbalancers.xml (original)
+++ tomcat/jk/trunk/xdocs/common_howto/loadbalancers.xml Mon Dec 17 17:37:40 
2018
@@ -22,7 +22,7 @@
limitations under the License.
 
 
-LoadBalancer HowTo
+Load Balancing HowTo
 Mladen Turk
 $Date$
 

Modified: tomcat/jk/trunk/xdocs/common_howto/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/common_howto/project.xml?rev=1849117&r1=1849116&r2=1849117&view=diff
==
--- tomcat/jk/trunk/xdocs/common_howto/project.xml (original)
+++ tomcat/jk/trunk/xdocs/common_howto/project.xml Mon Dec 17 17:37:40 2018
@@ -30,8 +30,8 @@
 
 
 
-
-
+
+
 
 
 
@@ -57,7 +57,7 @@
 
 
 
-
+
 
 http://issues.apache.org/bugzilla/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&product=Tomcat+Connectors&long_desc_type=substring&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&keywords_type=allwords&keywords=&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&emailassigned_to1=1&emailtype1=substring&email1=&emailassigned_to2=1&emailreporter2=1&emailcc2=1&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0="/>
 

Modified: tomcat/jk/trunk/xdocs/miscellaneous/faq.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/faq.xml?rev=1849117&r1=1849116&r2=1849117&view=diff
==
--- tomcat/jk/trunk/xdocs/miscellaneous/faq.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/faq.xml Mon Dec 17 17:37:40 2018
@@ -22,7 +22,7 @@
limitations under the License.
 
 
-FAQ
+Frequently Asked Questions
 Henri Gomez
 $Date$
 
@@ -92,7 +92,7 @@ For JK 1.2.x, you should read:
 
 
 
-For the impatient
+Quick Start
 
 
 

Modified: tomcat/jk/trunk/xdocs/miscellaneous/project.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/project.xml?rev=1849117&r1=1849116&r2=1849117&view=diff
==
--- tomcat/jk/trunk/xdocs/miscellaneous/project.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/project.xml Mon Dec 17 17:37:40 2018
@@ -30,8 +30,8 @@
 
 
 
-
-
+
+
 
 
 
@@ -57,7 +57,7 @@
 
 
 
-
+
 
 http://issues.apache.org/bugzilla/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&product=Tomcat+Connectors&long_desc_type=substring&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&keywords_type=allwords&keywords=&bug

svn commit: r1849118 [4/9] - in /tomcat/site/trunk/docs/connectors-doc: ./ ajp/ ajp/printer/ common_howto/ common_howto/printer/ miscellaneous/ miscellaneous/printer/ news/ news/printer/ printer/ refe

2018-12-17 Thread csutherl
Modified: tomcat/site/trunk/docs/connectors-doc/miscellaneous/reporttools.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/miscellaneous/reporttools.html?rev=1849118&r1=1849117&r2=1849118&view=diff
==
--- tomcat/site/trunk/docs/connectors-doc/miscellaneous/reporttools.html 
(original)
+++ tomcat/site/trunk/docs/connectors-doc/miscellaneous/reporttools.html Mon 
Dec 17 17:40:26 2018
@@ -1,5 +1,5 @@
 
-The Apache Tomcat Connectors: mod_jk, ISAPI redirector, 
NSAPI redirector (1.2.x) - Reporting Tools
+The Apache Tomcat Connectors - Miscellaneous 
Documentation (1.2.x) - Reporting Tools