Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-21 22:46:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,796 Commits 55 Branches 466 Tags
Commit Graph

12796 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
7ba4e9c8d2 Minor edits to RequestLog documentation. 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-07-15 13:29:22 -04: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
Simone Bordet
a38e819907 Code cleanups. 2016-07-15 18:09:44 +02:00
Simone Bordet
a3b5e7ebb7 Added guards against NPE in case HttpField.getValue() returns null. 2016-07-15 15:45:50 +02:00
Simone Bordet
389eb68c3c Code cleanups. 2016-07-15 15:45:50 +02:00
Greg Wilkins
29bad418c1 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-15 13:48:15 +10:00
Greg Wilkins
45ead1bb29 jetty http2 client parse error #726 2016-07-15 13:47:41 +10:00
Jesse McConnell
d178f23ec7 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-14 13:29:38 -05:00
Jesse McConnell
37d0caedee Merge pull request #728 from WalkerWatch/jetty-9.3.x 
Fixing SRCDIR references.
 2016-07-14 11:28:47 -07:00
WalkerWatch
ff200043de Fixing SRCDIR references. 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-07-14 14:25:20 -04:00
Jesse McConnell
73d546ceac update for proper branch 2016-07-14 13:18:34 -05:00
Jesse McConnell
37015b8536 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-14 13:18:03 -05:00
Jesse McConnell
312028df15 Update pom.xml 2016-07-14 13:17:10 -05:00
Jesse McConnell
55d9ba9307 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-14 12:47:43 -05:00
Jesse McConnell
1000ba52e0 Merge pull request #719 from WalkerWatch/jetty-9.3.x 
Chapter 9 cleanup and removed doc reference to disablejsr for #706.
 2016-07-14 10:45:48 -07:00
Simone Bordet
9c472f959a Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-07-14 16:19:18 +02:00
Simone Bordet
7172127236 Fixes #694 - http2.client.StreamResetTest.testServerExceptionConsumesQueuedData stack not suppressed in test 2016-07-14 16:18:55 +02:00
WalkerWatch
49f55cf5fc Removed references to Glassfish, updated Java versions. 
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
 2016-07-14 08:12:10 -04:00
Simone Bordet
d976b4d36a Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-07-14 12:44:15 +02:00
Simone Bordet
2387d973ec Made test more robust on slower machines. 2016-07-14 12:43:33 +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
Greg Wilkins
34a9e43c50 restored long test timer 2016-07-14 15:17:50 +10:00
Jan Bartel
05260b63c9 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-14 14:11:45 +10:00
Jan Bartel
c7b80bee8f Issue #704 2016-07-14 14:10:57 +10:00