Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-24 08:28:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,143 Commits 55 Branches 466 Tags
Commit Graph

13143 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Greg Wilkins
6e4abb3339 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-21 12:29:54 +10:00
Greg Wilkins
2db91a88cf HTTP2 SETTINGS_MAX_HEADER_LIST_SIZE #752 2016-07-21 12:28:32 +10:00
Greg Wilkins
950c4d4b70 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-21 11:12:26 +10:00
Greg Wilkins
2f4a6f29b7 Do not use ArrayQueue for HPACK #751 2016-07-21 11:07:55 +10:00
WalkerWatch
fa24eb3541 Resolves #747. 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-07-20 18:14:47 -04:00
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
Jesse McConnell
82943630dd Merge pull request #748 from WalkerWatch/docupdates/jmx 
Updates for Chapter 14.
 2016-07-20 15:17:27 -05:00
WalkerWatch
77a8556ffe Updates images for chapter 14. 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-07-20 16:11:49 -04:00
WalkerWatch
92af8eb8fc Updates for Chapter 14. 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-07-20 16:09:01 -04: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
Simone Bordet
11d0569a75 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-07-20 13:18:26 +02:00
Simone Bordet
c09251fbaf Updated ALPN version for JDK 8u101 and 8u102. 2016-07-20 13:17:31 +02:00
Simone Bordet
0d74c3ec2c Updated ALPN version for JDK 8u101 and 8u102. 2016-07-20 13:05:43 +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
Greg Wilkins
17e39ebb5c Fixes #723 - improves MimeType resource loading and error reporting (#724) 
fixed merge
 2016-07-20 16:04:19 +10:00
Greg Wilkins
77d8ebf1cd Removed --add #627 2016-07-20 14:59:45 +10:00
Greg Wilkins
fce9403ab0 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-20 14:23:24 +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
d6c73118be less verbose #723 2016-07-20 14:19:13 +10:00
Joakim Erdfelt
b58cd5870b Fixes #723 - improves MimeType resource loading and error reporting (#724) 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2016-07-20 14:08:44 +10:00
Greg Wilkins
11ca0079e9 Only README.md #745 2016-07-20 14:02:13 +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
Jan Bartel
9f825dadef Issue #737 2016-07-20 12:26:41 +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
Greg Wilkins
ecdf8ed220 Fix link for #742 2016-07-20 09:31:20 +10:00
Jesse McConnell
af007da091 resolve merge conflict 2016-07-19 14:35:01 -05:00
Jesse McConnell
9071456f8f resolve merge conflict 2016-07-19 14:32:50 -05:00
Jesse McConnell
025d5eda2a Merge pull request #743 from WalkerWatch/jetty-9.3.x 
Chapter 12 and 13 changes and a merge.
 2016-07-19 14:31:05 -05:00
WalkerWatch
fad6776424 Merged from Eclipse 9.3.x. 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-07-19 15:23:33 -04:00
WalkerWatch
45d4415781 Chapter 13 clean up and addition of {MVNCENTRAL} attribute. 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-07-19 15:02:33 -04:00
Simone Bordet
491be7505b Merged branch 'jetty-9.4.x' into 'master'. 2016-07-19 10:34:59 +02:00
Simone Bordet
0d8f1b9e69 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-07-19 10:34:19 +02:00
Simone Bordet
766e5ab2ae Fixes #739 - Illegal WindowUpdate frame with delta=0. 
Using compareAndSet() rather than getAndSet().
 2016-07-19 10:33:43 +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
WalkerWatch
554d0ab4c1 Chapter 12 Updates (#738) 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-07-19 08:42:52 +10:00
WalkerWatch
087fd07007 Chapter 12 Updates 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-07-18 16:37:37 -04: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