Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-25 08:58:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,985 Commits 55 Branches 466 Tags
Commit Graph

3219 Commits

Author SHA1 Message Date
Jesse McConnell
7346476c92 Merge branch 'jetty-9.4.x' 2016-07-20 15:18:23 -05: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
Simone Bordet
f068780749 Merged branch 'jetty-9.4.x' into 'master'. 2016-07-20 13:19:15 +02: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
Trevor Pounds
60528537c3 Support direct byte buffers. (#348) 
Signed-off-by: Trevor Pounds <trevor.pounds@gmail.com>

I think it is still too coarse, but it is better than hard coded
 2016-07-20 14:22:03 +10:00
Greg Wilkins
53c07a5a83 Servlet 4.0 getMappings rough implementation #746 2016-07-20 13:58:19 +10:00
Jan Bartel
75f4af1355 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-07-20 12:47:44 +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
549bed7540 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-07-20 11:44:34 +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
Simone Bordet
491be7505b Merged branch 'jetty-9.4.x' into 'master'. 2016-07-19 10:34:59 +02:00
Greg Wilkins
86ff9f984d fixed noisy/broken tests 2016-07-19 15:16:14 +10:00
Greg Wilkins
95d77f90c1 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-07-19 08:49:13 +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
0c1cfb350c Merge branch 'jetty-9.4.x' 2016-07-15 14:32:56 -05: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
a1cc30c751 Merged branch 'jetty-9.4.x' into 'master'. 2016-07-15 18:12:46 +02: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
5b892f35c5 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-07-13 11:13:40 +10: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
ba761071f3 Merge branch 'jetty-9.4.x' 2016-07-12 17:50:37 -07: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
c3bcce1ce4 Merge branch 'jetty-9.4.x' 2016-07-12 11:44:57 -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
7ec1f26d1a Merge branch 'jetty-9.4.x' 2016-07-11 10:32:44 -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
2cfc5b1665 Merge branch 'jetty-9.4.x' 2016-07-08 08:40:28 -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
294362954d Merge branch 'jetty-9.4.x' 2016-07-07 13:43:16 -07: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