Simone Bordet
43f99d8857
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2018-01-17 12:00:13 +01:00
Simone Bordet
53eebd045c
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2018-01-17 11:56:26 +01:00
Simone Bordet
3de4de99d3
Updated ALPN version for JDK 8u161 and 8u162.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-01-17 11:46:12 +01:00
Joakim Erdfelt
41ed9f29f4
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2018-01-09 09:37:25 -06:00
Joakim Erdfelt
fa4c7b0ca9
Issue #2108 - Updating license headers for year 2018
2018-01-09 08:39:37 -06:00
Joakim Erdfelt
067fc5d2d8
Issue #2108 - Upgrade licenses for 2018
2018-01-09 07:42:06 -06:00
Greg Wilkins
6ac4e770a6
Issue #1983 Warn on connection failures
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2017-11-22 11:08:20 +01:00
Simone Bordet
f8ce63c125
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2017-10-18 10:53:16 +02:00
Simone Bordet
55d461ae17
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2017-10-18 10:50:40 +02:00
Simone Bordet
a74ad00b77
Update ALPN support for Java 8u151 and 8u152.
2017-10-18 10:44:18 +02:00
Greg Wilkins
687561e1c9
Issue#215 fixed tests dependencies
2017-09-21 09:02:24 +10:00
Greg Wilkins
31a9b6f2e8
Issue #215 Conscrypt module for SSL and ALPN
...
Squash of the following commits:
commit 53e503b48d290e2ff83b214fd81572bf4cacd9ab
Merge: cc4ed73 d77ba82
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Sep 21 07:27:45 2017 +1000
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-215-conscrypt-alpn
commit cc4ed73ae45e69addbb31221a860dd0984d92ac5
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Sep 21 07:26:45 2017 +1000
Issue #215 Conscrypt module debug
commit f640693f7ef61f8012d1454b2ed364740b330a6e
Author: Simone Bordet <simone.bordet@gmail.com>
Date: Wed Sep 20 18:23:51 2017 +0200
Issue #215 - Consider native ALPN/SSL provider.
Fixed server-side ALPN negotiation for Conscrypt.
commit 669e992624a0f8f23103c70ba895b877dcec2404
Author: Simone Bordet <simone.bordet@gmail.com>
Date: Wed Sep 20 16:56:20 2017 +0200
Issue #215 - Consider native ALPN/SSL provider.
Fixed client-side ALPN negotiation for Conscrypt.
commit aa873263d73c19461890bd1f9a417c796412b3d2
Author: Simone Bordet <simone.bordet@gmail.com>
Date: Wed Sep 20 15:26:45 2017 +0200
Issue #215 - Consider native ALPN/SSL provider.
Code cleanups.
Changed ALPNProcessor.init(boolean) to init().
Removed unnecessary try/catches and simplified exception handling.
commit db9b169c35da956bcc42013f9bb8acddd7238d14
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Sep 20 18:07:30 2017 +1000
Issue #215 Conscrypt SSL pom cleanups
commit 096572e029352428275e86a964fa92dbeee19a65
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Sep 20 15:57:20 2017 +1000
Issue #215 Conscrypt SSL ALPN cleanups
commit b3c1bcb1fa9a7e15517a348270738e24c7b0a820
Merge: c836708 effec06
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Sep 20 15:46:13 2017 +1000
Merge branch 'jetty-9.4.x' into jetty-9.4.x-215-conscrypt-alpn
commit c836708a9bcd5fb61ed26302eb7d71b618cce329
Merge: de039d4 d9ecd5e
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Sep 20 14:56:06 2017 +1000
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-215-conscrypt-alpn
commit de039d42f23f9caa239e5ddee0242b9a83a45441
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Sep 19 17:19:49 2017 +1000
Fix #1823 MimeTypes for ResourceHandler mp4
commit ff1e08434415cd6d909715547c2a54dbd0fc5dee
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Sep 19 14:21:39 2017 +1000
Issue #215
commit 3bb63147ebf4967698f51a65f009d80010038b20
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Sep 19 14:08:05 2017 +1000
Issue #215
Use conscrypt 1.0.0.RC10 uber jar
commit 8b18099fde67f12d0e98d0b414568c9b76835459
Merge: 06f6530 eee4117
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Sep 19 10:35:43 2017 +1000
Merge branch 'jetty-9.4.x' into jetty-9.4.x-conscrypt-alpn
commit 06f65305d536250c5dfa2aaa84ffacdac113c8fc
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Sep 14 16:04:05 2017 +1000
Issue #215 Conscrypt ALPN provider
First attempt at client support
commit 32d77461935263da86fb363233af0aa5a159d1fc
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Sep 14 09:48:43 2017 +1000
Issue #215 Conscrypt ALPN provider
commit bc051dca5e3ea7fed6ddb3a25ba5cecbd1c5b18b
Merge: 573c9f0 6c47126
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Sep 14 08:49:10 2017 +1000
Merge branch 'jetty-9.4.x' into jetty-9.4.x-conscrypt-alpn
commit 573c9f060172b2863b0b0a94c1ec2fb9a8762fa2
Merge: 47e22fe 3399fd3
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Sep 13 15:24:27 2017 +1000
Merge branch 'jetty-9.4.x' into jetty-9.4.x-conscrypt-alpn
commit 47e22fe2e4f8e3cc71f3117ad7d789dc3ea56675
Merge: 63ffa2b 187f37d
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Sep 13 11:04:24 2017 +1000
Merge branch 'jetty-9.4.x' into jetty-9.4.x-conscrypt-alpn
commit 63ffa2bdc13fa85d02459855a3f8e0de4f4b4f1b
Merge: cf1443d a0cb424
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Sep 12 09:04:45 2017 +1000
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-conscrypt-alpn
commit cf1443d3ab71ac1aec7f153c233e869a3d6f783f
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Sep 12 09:03:52 2017 +1000
Issue #215 Conscrypt ALPN provider
commit a37aec327274042e1007f4146a3c3ec06fb424d9
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Sep 7 21:19:28 2017 +1000
Issue #215 Conscrypt ALPN provider
commit 6d7f39b2b0e53570afa61be5abfef2a352f80cf3
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Sep 7 18:22:19 2017 +1000
Issue #215 Conscrypt ALPN provider
commit a7d0f46b57091550724242693559d786180896ff
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Sep 7 18:16:35 2017 +1000
Issue #215 Conscrypt ALPN provider
2017-09-21 07:34:25 +10:00
Joakim Erdfelt
1311052b15
Cleaning up state of branch to match the original jetty-9.4.x
...
+ Does not include changes to /jetty-cdi/
+ Does not include changes to /jetty-websocket/ for javax.websocket-1.1
2017-08-08 09:47:04 -07:00
Joakim Erdfelt
585f126b48
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x-clean
2017-08-08 09:24:41 -07:00
Simone Bordet
a8ca4d23c6
Fixes #1702 - Update ALPN for JDK 8u144.
2017-08-08 09:15:38 -07:00
Simone Bordet
a2d63141e9
Fixed location of ALPN files for JDK 8u141.
2017-08-08 09:15:16 -07:00
Simone Bordet
489f68c708
Fixes #1685 - Update ALPN support for Java 8u141.
2017-08-08 09:15:12 -07:00
Simone Bordet
b616249603
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2017-08-01 11:14:28 +02:00
Simone Bordet
d4d5211ede
Fixes #1702 - Update ALPN for JDK 8u144.
2017-08-01 11:05:30 +02:00
Simone Bordet
6782a6fafd
Fixed location of ALPN files for JDK 8u141.
2017-07-24 10:50:48 +02:00
Simone Bordet
a0026fd9d2
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2017-07-24 10:44:39 +02:00
Simone Bordet
3f94a5d132
Fixes #1685 - Update ALPN support for Java 8u141.
2017-07-24 10:08:10 +02:00
WalkerWatch
8eb3b997de
Removed deprecated [name] section
2017-05-22 12:18:48 -04:00
Simone Bordet
861372c70d
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2017-05-02 22:16:45 +02:00
Simone Bordet
c955fb609e
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2017-05-02 22:12:29 +02:00
Simone Bordet
9ba7b713d2
Fixes #1523 - Update ALPN support for Java 8u131.
2017-05-02 22:01:00 +02:00
Simone Bordet
0c8273f2ca
Happy New Year 2017.
2017-01-19 19:26:41 +01:00
Simone Bordet
07838b057f
Happy New Year 2017.
2017-01-19 18:54:03 +01:00
Simone Bordet
347c48d657
Revert "resolve merge and update license headers"
...
This reverts commit 53b31b03dd
, reversing
changes made to 4565c186d7
.
2017-01-19 18:26:43 +01:00
Jesse McConnell
53b31b03dd
resolve merge and update license headers
2017-01-19 09:33:16 -06:00
Jesse McConnell
ce3e6dafec
update license headers to 2017
2017-01-19 09:30:00 -06:00
Simone Bordet
a7938910b7
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2017-01-18 18:54:47 +01:00
Simone Bordet
53281d3202
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2017-01-18 18:52:20 +01:00
Simone Bordet
79202d1cc6
Updated ALPN version for JDK 8u121.
2017-01-18 18:30:30 +01:00
Simone Bordet
f0b9f1c557
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2017-01-13 19:06:07 +01:00
Simone Bordet
beb8f3270a
Issue #486 - JDK 9 ALPN implementation.
...
Implemented the case where the client does not send ALPN.
2017-01-13 18:44:18 +01:00
Simone Bordet
df08f7fd4e
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2017-01-12 20:01:28 +01:00
Simone Bordet
2a416bbc6b
Issue #1073 - JDK9 support in Jetty 9.3.x.
...
Fixed the compact3 profile and other small fixes.
2017-01-12 19:59:11 +01:00
Simone Bordet
e539d0b1fd
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2017-01-12 17:52:45 +01:00
Simone Bordet
11d669092a
Issue #1073 - JDK9 support in Jetty 9.3.x.
...
* Updated Maven plugins to versions that support JDK 9.
* Added jdk9 profiles to the build files.
* Introduced modules jetty-alpn-java-client and jetty-alpn-java-server
containing a pure JDK 9 implementation of ALPN.
* Wired ALPN connection factories (client and server) to use the proper
ALPN implementation based on the JDK platform version (8 or 9).
2017-01-12 15:41:02 +01:00
Simone Bordet
8421a9b200
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-10-26 11:13:03 +02:00
Simone Bordet
338e924a5d
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2016-10-26 11:10:19 +02:00
Simone Bordet
4cc5178944
Updated ALPN version for JDK 8u111 and 8u112.
2016-10-26 11:03:43 +02:00
Simone Bordet
ae228cc49a
Removed deprecated [name] section from ALPN modules.
...
The [name] section was only needed when ALPN coexisted with NPN.
2016-10-19 16:34:24 +02:00
Simone Bordet
11d0569a75
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-07-20 13:18:26 +02:00
Simone Bordet
c09251fbaf
Updated ALPN version for JDK 8u101 and 8u102.
2016-07-20 13:17:31 +02:00
Simone Bordet
0d74c3ec2c
Updated ALPN version for JDK 8u101 and 8u102.
2016-07-20 13:05:43 +02:00
Greg Wilkins
66f242191c
Issue #515 Alternate start modules
...
Used alternate modules for new session architecture
2016-04-30 09:19:38 +10:00
Simone Bordet
64a8d8819f
Merged branch 'jetty-9.3.x' into 'master'.
2016-04-20 14:29:38 +02:00
Simone Bordet
89efdb3e09
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2016-04-20 14:29:11 +02:00