1
0
mirror of https://github.com/jetty/jetty.project.git synced 2025-03-03 20:39:18 +00:00

2100 Commits

Author SHA1 Message Date
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 - 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 - 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 - JMXify MBeanContainer. 2016-08-17 21:44:35 +02:00
Simone Bordet
00a065b064 Fixes - 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 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
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 SslContextFactory: newSslServerSocket/newSslSocket are not customized 2016-07-14 18:26:51 +10:00
Greg Wilkins
35a64828fb Fix 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
Greg Wilkins
f5d59cacca Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-14 14:04:21 +10:00
Greg Wilkins
112244d6ef Fix SslContextFactory: newSslServerSocket/newSslSocket are not customized 2016-07-14 13:44:49 +10:00
Greg Wilkins
45bbde408f Fix SslContextFactory: newSslServerSocket/newSslSocket/doStart are not customized 2016-07-14 12:17:52 +10:00
Jan Bartel
700d051587 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-07-13 15:32:58 +10:00
Jan Bartel
6628a42d5d Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-13 15:32:03 +10:00
Jan Bartel
37cda79f7b Issue 2016-07-13 15:28:33 +10:00
Greg Wilkins
2ee64a8d56 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-07-07 11:49:00 +10:00
Greg Wilkins
8675c17d92 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-07 11:46:38 +10:00
Greg Wilkins
322fe73869 Suppress stacks during sweeper test 2016-07-07 08:32:36 +10:00
Greg Wilkins
40f816256b Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-07-06 16:48:33 +10:00
Greg Wilkins
c9e6141844 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-06 16:47:58 +10:00
Greg Wilkins
fc36e45795 Support UNC paths in PathResource
Also-by: Marco Signorini <m.signorini@iontrading.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2016-07-06 16:46:22 +10:00
Greg Wilkins
5b50e41e7e Issue
Alias should be absolute not relative
2016-07-06 16:46:22 +10:00
Jan Bartel
c3da8b27eb Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-07-06 13:43:52 +10:00