3159 Commits

Author SHA1 Message Date
Simone Bordet
cf0ecbd88f Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-07-21 17:50:08 +02:00
Greg Wilkins
3c0859d034 improve commit debug 2016-07-21 15:59: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
5718726a8c Incorrect default ALPN protocol #671
Correctly handle protocol aliases
2016-07-21 13:01:25 +10:00
Jesse McConnell
4a2d471537 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-20 15:17:57 -05:00
Greg Wilkins
e82ed5afb9 Fix #671 Incorrect default ALPN protocol 2016-07-20 23:16:50 +10:00
Greg Wilkins
0a7903485a Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-20 17:01:21 +10:00
Greg Wilkins
7e16731b9d fix #592 2016-07-20 16:59:28 +10:00
Jan Bartel
6de88fcee9 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-20 12:33:39 +10:00
Greg Wilkins
25341e9ac4 Calling onWritePossible in race with write #730
This commit cleans up the combination of the prior fix to #730 in 0433a8c
and the prior cleanup in 86ff9f9.   More comments have been added to explain.
2016-07-20 11:10:52 +10:00
Greg Wilkins
5afbcd4c6a Allow setCharacterEncoding after getOutputStream #733 2016-07-20 09:56:25 +10:00
Greg Wilkins
86ff9f984d fixed noisy/broken tests 2016-07-19 15:16:14 +10:00
Greg Wilkins
cca9027285 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-19 00:55:13 +10:00
Greg Wilkins
35bb6620a1 Extensible ErrorHandler for different mimetypes #230 2016-07-18 21:12:48 +10:00
Greg Wilkins
3765efad2b Extensible ErrorHandler for different mimetpyes #727 2016-07-18 11:38:10 +10:00
Jesse McConnell
8718f4e1bf Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-15 14:32:30 -05:00
Jesse McConnell
1e3cef80ee Merge pull request #735 from WalkerWatch/jetty-9.3.x
Updated RequestLog xml/module/documentation. Resolves #734
2016-07-15 14:32:03 -05:00
WalkerWatch
00b3738536 Updated RequestLog xml/module/documentation. Resolves #734
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-07-15 13:08:30 -04:00
Simone Bordet
6adb5eb031 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-07-15 18:12:02 +02:00
Simone Bordet
0433a8ca73 Issue #730 - "Slow" client causes IllegalStateException.
Fixed by allowing state ASYNC to call onWritePossible().
2016-07-15 18:11:28 +02:00
Greg Wilkins
9c881525b7 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-13 11:12:33 +10:00
Greg Wilkins
4055146dcd Fix #671 Incorrect default SLPN protocol 2016-07-13 11:09:53 +10:00
Joakim Erdfelt
232a077b9d Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-12 17:50:16 -07:00
Joakim Erdfelt
35de3899b6 Issue #706 - Removing org.apache.jasper.compiler.disablejsr199 references 2016-07-12 17:49:11 -07:00
Joakim Erdfelt
bdefbdfcf0 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-12 11:44:16 -07:00
Joakim Erdfelt
0e6833b770 Issue #687 - Simplifying AllowSymLinkAliasChecker logic 2016-07-12 11:39:58 -07:00
Joakim Erdfelt
bc9007a9ed Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-11 10:32:33 -07:00
Joakim Erdfelt
596e372c7a Fixes #687 - Normalizing resolved symlinks 2016-07-11 10:31:07 -07:00
Joakim Erdfelt
369a105524 Issue #695 - Flagging with method level @Deprecated for improved IDE experience 2016-07-08 08:38:43 -07:00
Greg Wilkins
16c43727bf Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-08 21:19:53 +10:00
Greg Wilkins
adf3281ba8 Issue #696 Improve testing of LocalConnector
Fixed some races in the implementation
2016-07-08 21:15:36 +10:00
Greg Wilkins
0d74658ab6 fixed bad tests 2016-07-08 13:37:41 +10:00
Joakim Erdfelt
5c6e271b2c Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-07 13:43:01 -07:00
Joakim Erdfelt
602222182c Merge branch 'jetty-9.3.x' of github.com:eclipse/jetty.project into jetty-9.3.x 2016-07-07 09:12:09 -07:00
Joakim Erdfelt
a6276c3017 Issue #687 - Adding AllowSymLinkAliasCheckerTest
+ Replicated, in test case form, the example present in the
  filed issue.  All tests pass.
2016-07-07 09:11:19 -07:00
Greg Wilkins
5d77bb4d8f fixed bad unit test 2016-07-08 00:30:53 +10:00
Greg Wilkins
e38ec83de9 Issue #695 use the getResponse methods 2016-07-07 18:13:44 +10:00
Greg Wilkins
a40002bd74 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-07 16:37:45 +10:00
Greg Wilkins
183e3acabb Issue #695 improve getResponse methods 2016-07-07 16:36:46 +10:00
Greg Wilkins
0c0ed00747 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-06 12:16:01 +10:00
Greg Wilkins
5af61cfc38 fix #685 SecureRequestCustomizer SslSession attribute 2016-07-06 11:55:41 +10:00
Greg Wilkins
d0d11244b3 Issue #644 Modules for logging
Added module for logback-access
2016-06-24 18:40:00 +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
cfe5abf8e6 Issue #660 NPE in Request
Made request more robust for calls after reset.
2016-06-24 14:33:18 +10:00
Greg Wilkins
e3936d2046 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-06-23 14:11:29 +10:00
Greg Wilkins
c3173932f0 Revert "Issue #660 - simplifying parameter extraction to prevent NPE"
This reverts commit ecea486d0795299a3ef04538a62c64e71f5d66c3.
2016-06-23 12:43:29 +10:00
Jan Bartel
a0e7b21180 Make SessionDataMap a LifeCycle 2016-06-23 12:25:33 +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