Greg Wilkins
a799b21eb3
fixed merge
2016-09-01 16:41:49 +10:00
Greg Wilkins
c2621bcad6
Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x
2016-09-01 16:29:00 +10:00
Greg Wilkins
f7c32c5fc7
Issue #882 IPv6 map
...
The new IPv6 capable InetAddressSet has been added as an alternative for IPAddressMap
The IncludeExclude class has been generalized to IncludeExcludeSet that can have a different
Predicate type to the set type and this works well with InetAddressSet.
However for #881 and #883 , this may not be enough and Map semantics may need to be added.
The IPAccessHandler also has path mappings supported, which could need the map semantics, so for now a new InetAccessHandler has been
added that just uses an IncludeExcludeSet<InetAddressSet>, but this has yet to be tested.
The AbstractProxyServlet uses a host:port combinations, so IncludeExcludeSet<InetAddressSet> is not directly applicable.
2016-09-01 16:12:35 +10:00
Joakim Erdfelt
544686255c
Merge branch 'jetty-9.4.x'
2016-08-31 10:19:02 -07:00
Greg Wilkins
5ab9846ac5
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-08-31 20:32:54 +10:00
Simone Bordet
e0c83757aa
Fixes #889 - ConstantThrowable.name can be removed.
2016-08-31 12:25:19 +02:00
Greg Wilkins
f856107301
Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x
2016-08-31 19:05:57 +10:00
Greg Wilkins
0155ae761c
Issue #880 Improve IPv6 support
...
For #880 added the HostPort class, which was used to fix #878 , #879 , #884 and #886
2016-08-31 16:46:11 +10:00
Jan Bartel
c78e0b7565
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-08-31 16:30:31 +10:00
Jan Bartel
088f19704a
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-08-31 16:30:00 +10:00
Jan Bartel
34d465555b
Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x
2016-08-31 16:23:06 +10:00
Grzegorz Grzybek
b70f0fdf15
Issue #868 - Use static Throwables without backtrace/stackTrace
...
Signed-off-by: Grzegorz Grzybek <gr.grzybek@gmail.com>
2016-08-26 10:44:23 +02:00
Simone Bordet
2d5078cc24
Merged branch 'jetty-9.4.x' into 'master'.
2016-08-19 01:48:29 +02:00
Simone Bordet
8de4751c6f
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-08-19 01:47:41 +02:00
Simone Bordet
b316148625
Fixed test failure.
2016-08-19 01:44:14 +02:00
Joakim Erdfelt
692bd60844
Merge branch 'jetty-9.4.x'
2016-08-18 14:42:13 -07:00
Joakim Erdfelt
196f5eeb96
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-08-18 14:30:48 -07:00
Joakim Erdfelt
24b4aeb147
Fixes #854 - other testcase triggers ISE on .destroy() -> .start() as well
2016-08-18 14:30:11 -07:00
Simone Bordet
f0cf67348b
Merged branch 'jetty-9.4.x' into 'master'.
2016-08-18 15:48:22 +02:00
Simone Bordet
66c3603050
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-08-18 15:47:41 +02:00
Simone Bordet
10f994a0a2
Fixes #854 - If container.destroy() is called, calling container.start() again should throw an IllegalStateException.
2016-08-18 15:47:06 +02:00
Simone Bordet
7a7d5e2f1e
Code cleanup.
2016-08-18 15:47:06 +02:00
Simone Bordet
f488bd4118
Merged branch 'jetty-9.4.x' into 'master'.
2016-08-17 21:50:39 +02:00
Simone Bordet
deef53467d
Fixes #855 - JMXify MBeanContainer.
2016-08-17 21:44:35 +02:00
Simone Bordet
00a065b064
Fixes #855 - JMXify MBeanContainer.
2016-08-17 21:28:19 +02:00
Greg Wilkins
07f547782f
Cleanup metadata and HttpURI usage
2016-08-10 16:28:05 +10:00
Simone Bordet
7bb0a00ff4
Merged branch 'jetty-9.4.x' into 'master'.
2016-08-08 23:25:54 +02:00
Simone Bordet
1a88dfa8c0
Code cleanups.
2016-08-08 23:22:51 +02:00
Greg Wilkins
5cb50e5f5d
ignore PathResource test
2016-08-04 14:02:16 +10:00
Greg Wilkins
e33b549c7f
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-08-03 18:49:48 +10:00
Greg Wilkins
d0101dc81a
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-08-03 18:01:42 +10:00
Greg Wilkins
a1885afff8
fix #804 by removing old javadoc reference to org.eclipse.jetty.util.URI.charset
2016-08-03 09:17:15 +10:00
Joakim Erdfelt
2830e51e04
Merge branch 'jetty-9.3.x' into release-9.3.11
2016-07-28 12:20:36 -07:00
Greg Wilkins
7d4a509462
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-07-28 18:45:47 +10:00
Greg Wilkins
1f949d509b
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-07-28 18:18:11 +10:00
Greg Wilkins
35c21d7ced
Utility improvements
...
Add Arrays
XML config get class
2016-07-28 16:50:12 +10:00
Joakim Erdfelt
6e1b1cdb36
Updating to version 9.3.12-SNAPSHOT
2016-07-21 19:07:19 -07:00
Joakim Erdfelt
9fd6d4354e
Updating to version 9.3.11.v20160721
2016-07-21 18:37:09 -07:00
Joakim Erdfelt
0b18340179
Updating to version 9.2.19-SNAPSHOT
2016-07-21 13:10:23 -07:00
Joakim Erdfelt
d3ff3423f0
Updating to version 9.2.18.v20160721
2016-07-21 12:35:26 -07:00
Simone Bordet
8f5985e0e1
Merged branch 'jetty-9.4.x' into 'master'.
2016-07-21 18:16:01 +02:00
Simone Bordet
823ba4add6
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-07-21 18:15:38 +02:00
Greg Wilkins
b8b9d222eb
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-07-21 16:50:27 +10:00
Greg Wilkins
f902181a83
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-07-21 13:02:57 +10:00
Greg Wilkins
21a618e6a8
SLOTH protection #631
...
Exclude all MD5 and SHA1 ciperhs, not just RSA based ones.
2016-07-21 12:39:07 +10:00
Simone Bordet
20b774cc25
Merged branch 'jetty-9.4.x' into 'master'.
2016-07-14 12:44:55 +02:00
Simone Bordet
d976b4d36a
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-07-14 12:44:15 +02:00
Greg Wilkins
f6071ca7fc
Fix #708 SslContextFactory: newSslServerSocket/newSslSocket are not customized
2016-07-14 18:26:51 +10:00
Greg Wilkins
35a64828fb
Fix #708 SslContextFactory: newSslServerSocket/newSslSocket are not customized
2016-07-14 15:17:50 +10:00
Jan Bartel
868eb50625
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-07-14 14:12:12 +10:00
