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
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 #708 SslContextFactory: newSslServerSocket/newSslSocket are not customized
2016-07-14 13:44:49 +10:00
Greg Wilkins
45bbde408f
Fix #708 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 #720
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 #669
...
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 #687
...
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
Greg Wilkins
f058054cbe
Issue #644 Modules for logging
...
Added slf4j-jul
2016-07-06 12:14:22 +10:00
Joakim Erdfelt
c4f6d3503e
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-06-29 15:11:55 -07:00
Joakim Erdfelt
d13d3cc3f5
Fixes #675 - Slf4jLog.ignore() now logs at DEBUG level
2016-06-29 15:11:46 -07:00
Joakim Erdfelt
2dfb5f463a
Fixes #677 - Logging of ignore() events now show as "Ignored Exception"
2016-06-29 15:11:37 -07:00
Joakim Erdfelt
a5dc01bbb1
Fixes #676 - JavaUtilLog.ignore() logs at FINEST level now
2016-06-29 15:11:28 -07:00
Joakim Erdfelt
3d988c9ff8
Fixes #675 - Slf4jLog.ignore() now logs at DEBUG level
2016-06-29 15:10:01 -07:00
Joakim Erdfelt
e2058f9787
Fixes #677 - Logging of ignore() events now show as "Ignored Exception"
2016-06-29 15:08:44 -07:00
Joakim Erdfelt
dbc8352aa6
Fixes #676 - JavaUtilLog.ignore() logs at FINEST level now
2016-06-29 15:07:43 -07:00
Joakim Erdfelt
ed8310dbff
Merge branch 'jetty-9.4.x'
2016-06-28 13:48:12 -07:00
Joakim Erdfelt
ac90d2b562
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-06-28 13:47:54 -07:00
Joakim Erdfelt
b20e2ddf18
Fixes #672 - Allow logging configuration announcement to be programmatically disabled
2016-06-28 13:01:16 -07:00
Jan Bartel
ef65639674
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-24 16:22:23 +10:00
Greg Wilkins
26276575e7
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-06-24 15:40:21 +10:00
Greg Wilkins
7df3b83a8e
Issue #644 Modules for logging
...
Added logback classic modules
2016-06-24 14:42:34 +10:00
Greg Wilkins
0e0fc77771
skip symlink test on windows
2016-06-24 14:33:18 +10:00
Simone Bordet
237502932a
Merged branch 'jetty-9.4.x' into 'master'.
2016-06-23 13:04:06 +02:00
Greg Wilkins
0239d6390f
Issue #644 Modules for logging
...
module for direct slf4j to log4j2 bridge
2016-06-23 15:32:18 +10:00
Greg Wilkins
501b8e9dca
Issue #644 Modules for logging
...
Added log4j2.xml configuration
Added jetty-log4j2 mapping module
2016-06-23 15:21:34 +10:00
Jan Bartel
f1d9cf89a4
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-23 12:04:59 +10:00
Greg Wilkins
e4eafd0fee
Issue #644 Modules for logging
...
parameterized logging versions
2016-06-23 09:54:28 +10:00
Greg Wilkins
80903c5ab1
Issue #644 Modules for logging
...
Added a jetty-log4j module that depends internally on slf4j
2016-06-23 08:38:29 +10:00
Jesse McConnell
ae931538ab
[maven-release-plugin] prepare for next development iteration
2016-06-22 13:59:10 -05:00
Jesse McConnell
df1ed4fb03
[maven-release-plugin] prepare release jetty-9.3.11.M0
2016-06-22 13:59:06 -05:00
Jesse McConnell
2b947e8f72
Merge branch 'jetty-9.3.x' into release-9.3.10
2016-06-22 13:22:27 -05:00
Joakim Erdfelt
0a196e2123
Merge branch 'jetty-9.4.x'
2016-06-22 10:43:58 -07:00
Joakim Erdfelt
8157a4533c
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-06-22 10:43:43 -07:00
Joakim Erdfelt
cce7837e64
Fixes #654 - ServletContext.getResourceAsStream("/") should return null
...
+ Jetty 9.2 (and earlier) used a Resource.getInputStream() implementation
that would trigger an IOException on-construction (vs on-first-access)
due its use of java.io.FileInputStream(File) which had a isDirectory
check in its constructor.
+ Jetty 9.3 and onward uses java.nio.file.Files.newInputStream() which
has the bad on-first-access behavior.
+ Changing the behavior of PathResource.getInputStream() to behave the
same way as the prior FileResource.getInputStream(), as well as adding
the Resource.isDirectory() check back into ContextHandler.getResourceAsStream(String)
to prevent creation of the InputStream in the first place.
2016-06-22 09:09:05 -07:00
Jesse McConnell
030ec61837
[maven-release-plugin] prepare for next development iteration
2016-06-22 09:14:25 -05:00
Jesse McConnell
9a4cb41122
[maven-release-plugin] prepare release jetty-9.3.11.M0
2016-06-22 09:14:21 -05:00
Jesse McConnell
e7034117ea
[maven-release-plugin] prepare for next development iteration
2016-06-21 08:50:13 -05:00
Jesse McConnell
16c435c69d
[maven-release-plugin] prepare release jetty-9.3.10.v20160621
2016-06-21 08:50:09 -05:00
Greg Wilkins
7a8edef808
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-17 23:33:45 +10:00
Greg Wilkins
d05c282baa
Issue #644 Modules for enabling logging
...
Improved descriptions
2016-06-17 23:33:26 +10:00
Jan Bartel
003e9cd302
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-17 15:54:02 +10:00
Greg Wilkins
d79b0a7acd
Issue #644 Modules for enabling logging
...
Separated modules for jetty logging
Added JCL
2016-06-17 14:57:25 +10:00
Jan Bartel
1e7b866d6f
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-17 13:36:56 +10:00
Greg Wilkins
07b0127587
Issue #644 rename module
2016-06-17 07:42:57 +10:00
Greg Wilkins
2fbf466393
Issue #644 Modules for enabling logging
2016-06-17 07:39:11 +10:00
Greg Wilkins
8dd61c6d1c
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-15 18:07:01 +10:00
Greg Wilkins
e607acfa4e
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-06-15 18:06:32 +10:00
Greg Wilkins
a8e315a3f5
Fix #663 NPE during context stop
...
Avoid adding null beans
protect against null beans.
2016-06-15 18:04:33 +10:00
Jan Bartel
29fcd50354
Issue #632
...
Fix jetty version number
2016-06-10 16:53:52 +10:00
Simone Bordet
a300ffdc0f
Merged branch 'jetty-9.4.x' into 'master'.
2016-06-03 18:03:51 +02:00
Jesse McConnell
16f3ea82c1
fix javadoc
2016-06-03 09:45:10 -05:00
Greg Wilkins
502f27f43e
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-03 16:22:17 +10:00
Greg Wilkins
723563aa84
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-06-03 16:21:48 +10:00
Greg Wilkins
a2309057dc
Test Harness for #596
...
Test harness to try to repeat problem with #596 of content-length added to a HEAD response.
In the process added a much better getResponse mechanism to the local connector that avoids
using the idle time.
2016-06-03 14:15:25 +10:00
Greg Wilkins
98c328fb23
Jetty 9.4.x 572 ( #614 )
...
* Issue #572 Scheduling Strategy Deadlocks
Implemented dual strategy idea from #572 discussion
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* fixed http2 strategy choice
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* code cleanups
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* clean up seelctor actions/products
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* cleanups
2016-06-03 09:07:00 +10:00
Jesse McConnell
dc4574f380
[maven-release-plugin] prepare for next development iteration
2016-05-17 17:30:17 -05:00
Jesse McConnell
0bbebec1e0
[maven-release-plugin] prepare release jetty-9.3.9.v20160517
2016-05-17 17:30:13 -05:00
Jesse McConnell
d5c6793e6a
[maven-release-plugin] prepare for next development iteration
2016-05-17 15:33:46 -05:00
Jesse McConnell
0bab7e6616
[maven-release-plugin] prepare release jetty-9.2.17.v20160517
2016-05-17 15:33:42 -05:00
Joakim Erdfelt
6c47951fae
Merge branch 'jetty-9.4.x'
2016-05-13 11:59:17 -07:00
Joakim Erdfelt
8305125df0
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-05-13 11:59:02 -07:00
Joakim Erdfelt
97af3d663f
Fixes #556 - Improve Resource.getAlias() checks on Windows
...
+ Reworks PathResource and FileResource alias checking to
use originally passed paths, before Windows JVM has a
chance to normalize and "correct" the bad paths.
2016-05-13 11:57:23 -07:00
Greg Wilkins
8754344ea2
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-05-13 11:22:40 +10:00
Greg Wilkins
d2b0daefb4
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-05-13 11:21:50 +10:00
Greg Wilkins
0a1f4ac98c
Issue #570
...
Encoding mechanism was based on if the first encodable character found was unicode or not. Changed to not be
order dependent!
2016-05-13 10:52:49 +10:00
Simone Bordet
3e3e891636
Merged branch 'jetty-9.4.x' into 'master'.
2016-05-12 19:31:19 +02:00
Simone Bordet
922319c3a3
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-05-12 19:30:50 +02:00
Simone Bordet
51dd5c902c
Fixed Javadoc.
2016-05-12 19:07:06 +02:00
Simone Bordet
242b6b5f66
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2016-05-12 18:59:40 +02:00
Simone Bordet
1937701127
Merged branch 'jetty-9.4.x' into 'master'.
2016-05-12 00:22:56 +02:00
Simone Bordet
2a4cbdd111
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-05-12 00:22:31 +02:00
Simone Bordet
016fc6569f
Fixes #558 - HTTP/2 server hangs when thread pool is low on threads.
...
Modified ExecuteProduceConsume to test for Rejectable tasks when
trying to execute a task in low threads mode, and if so, reject them
immediately.
2016-05-12 00:13:35 +02:00