16206 Commits

Author SHA1 Message Date
Greg Wilkins
978fe59957 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-10-18 15:38:50 +11:00
Greg Wilkins
1dab620fe4 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-10-18 15:38:05 +11:00
Greg Wilkins
8ea8295a4c javadoc 2017-10-18 15:37:41 +11:00
Jan Bartel
1a69841600 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-10-18 12:46:49 +11:00
Jan Bartel
7517e7fdd9 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-10-18 12:44:52 +11:00
Jan Bartel
84ffdf1447 Issue #1213
Update annotation parser for asm 6 support.
2017-10-18 12:42:10 +11:00
Greg Wilkins
7d9645cb11 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-10-18 12:26:40 +11:00
Greg Wilkins
fa1f103da7 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-10-18 12:26:07 +11:00
Greg Wilkins
aa212df4b1 Use java platform not version 2017-10-18 12:24:53 +11:00
Greg Wilkins
c12ba01014 Issue #1797 use platform for MR jars 2017-10-18 12:24:26 +11:00
Greg Wilkins
44a1f1e1a6 Issue #1797 use platform for MR jars 2017-10-18 12:19:33 +11:00
Jan Bartel
6a921b1180 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-10-18 11:44:07 +11:00
Jan Bartel
d2acd1acae Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-10-18 11:24:28 +11:00
Jan Bartel
3cffbdf6be Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-10-18 11:24:04 +11:00
Jan Bartel
87a3fd147b Issue #1213
Exclude module-info.class from jetty-runner
2017-10-18 11:22:58 +11:00
Jan Bartel
37c51710b0 Issue #1213 2017-10-18 10:05:59 +11:00
Greg Wilkins
0552553e71 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-10-17 17:16:13 +11:00
Greg Wilkins
3dbb426a32 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-10-17 17:15:31 +11:00
Greg Wilkins
dd0eaa0f1f Issue #1901 Backport some java9 support to 9.3 2017-10-17 17:14:18 +11:00
Greg Wilkins
a9e98a5a7e Issue #1901 Backport some java9 support to 9.3 2017-10-17 17:08:50 +11:00
Greg Wilkins
22f95ad847 Issue #1901 Backport some java9 support to 9.3 2017-10-17 17:01:21 +11:00
Jan Bartel
050d593056 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-10-17 16:45:31 +11:00
Greg Wilkins
8bcf10395d Fix #1814 Java Version utility 2017-10-17 15:25:25 +11:00
Greg Wilkins
6b7bbbe66a Issue #1797 Multi Release Jar javadoc 2017-10-17 15:09:19 +11:00
Greg Wilkins
5de895af88 Issue #1797
Converted jetty-util to be a multi release jar
Added org/eclipse/jetty/util/MultiReleaseJarFile as botha  java8 and java9 version
deprecated jarScanner
updated AnnotationParser to use MultiReleaseJarFile
2017-10-17 15:06:09 +11:00
Jan Bartel
e00182323b Issue #1692 2017-10-17 14:43:41 +11:00
Joakim Erdfelt
1295dc372d Issue #1797 - Safety checks for Java 9 and Multi-Release JARs during bytecode scanning
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2017-10-17 14:43:14 +11:00
Jan Bartel
15a08f2095 Issue #1900 2017-10-17 14:31:11 +11:00
Greg Wilkins
1b7cfbbf2c Test #1898 2017-10-17 14:13:51 +11:00
Greg Wilkins
0f8bf0a64f Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-10-17 14:08:36 +11:00
Greg Wilkins
52baec434b Test #1898 2017-10-17 14:04:53 +11:00
Simone Bordet
b1cb393060 Merged branch 'jetty-9.4.x' into 'master'. 2017-10-17 00:10:17 +02:00
Simone Bordet
08a43cd0a2 Issue #1807 - HttpChannel events.
Added "dispatchFailure" event, and renamed "request[Before|After]Dispatch"
events to just "[before|after]Dispatch".
2017-10-17 00:09:45 +02:00
Simone Bordet
0ba9c56f85 Merged branch 'jetty-9.4.x' into 'master'. 2017-10-16 18:24:27 +02:00
Simone Bordet
850e70f27c Fixes #1897 - Introduce a round-robin connection pool for HttpClient. 2017-10-16 18:21:36 +02:00
Simone Bordet
81c3fe1507 Merged branch 'jetty-9.4.x' into 'master'. 2017-10-12 12:26:09 +02:00
Simone Bordet
4236f14955 Fixes #1891 - Make HTTP/2 async error notifications configurable.
Introduced HttpConfiguration.notifyRemoteAsyncErrors, true by default.
2017-10-12 12:13:02 +02:00
Simone Bordet
c454ce88e8 Formatting cleanup. 2017-10-12 12:02:00 +02:00
Simone Bordet
17df0bf930 Merged branch 'jetty-9.4.x' into 'master'. 2017-10-11 17:39:45 +02:00
Simone Bordet
91c11f5a64 Fixes #1888 - Implement cookie matching on Path attribute.
Implemented path matching following RFC 6265.
2017-10-11 17:39:06 +02:00
Jan Bartel
1a807b5195 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-10-11 16:19:09 +11:00
Jan Bartel
98f57fa97f Issue #1868
Fix javadoc
2017-10-11 16:18:30 +11:00
Jan Bartel
6df5377634 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-10-11 15:41:54 +11:00
Jan Bartel
5656594b4b Issue #1868 2017-10-11 15:40:55 +11:00
Jan Bartel
a4618a7ca6 Merge pull request #1886 from upthewaterspout/issue/1885
Issue #1885 Fixed rounding error of negative maxInactiveInterval
2017-10-11 09:41:10 +11:00
Dan Smith
a579823f29 Issue #1885 Fixed rounding error of negative maxInactiveInterval
Session.getMaxInactiveInterval should return a negative number if the
the session is configured with a negative maxInactiveInterval. It was
being rounded up to 0 by mistake.

Signed-off-by: Dan Smith <upthewaterspout@apache.org>
2017-10-10 13:59:52 -07:00
Joakim Erdfelt
c3c3881c9f Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-10-10 13:44:22 -07:00
Simone Bordet
a8d08df84f Issue #901 - Overriding SSL context KeyStoreType requires explicit override of TrustStoreType.
Improved code that defaults trustStore parameters from the keyStore parameters.
2017-10-10 21:23:46 +02:00
Joakim Erdfelt
d34f04c559 Issue #1881 - eliminate NPE in id generation against UnixSocketChannel 2017-10-10 12:09:52 -07:00
Joakim Erdfelt
ce039eb4cb Merge branch 'issue-272-ws-blockingwrite' into jetty-9.4.x 2017-10-10 11:23:03 -07:00