Joakim Erdfelt
a0d866687f
Merge branch 'jetty-9.4.x'
2016-07-25 17:03:11 -07:00
Joakim Erdfelt
87c8e1c019
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-07-25 17:02:51 -07:00
Greg Wilkins
e53ea55f48
Issue #752 SETTINGS_MAX_HEADER_LIST_SIZE
...
Defined missing status codes (removed old/wrong javadoc)
Changed use of 413 to 431
Received SETTINGS_MAX_HEADER_LIST_SIZE is set on hpack encoded and warning generated only for large responses.
2016-07-23 12:17:50 +10:00
Jan Bartel
92e91e8695
Revert "Issue #759"
...
This reverts commit 7b6bf03133
.
2016-07-22 16:10:37 +10:00
Jan Bartel
7b6bf03133
Issue #759
2016-07-22 15:50:17 +10:00
Simone Bordet
41315abca3
Merged branch 'jetty-9.4.x' into 'master'.
2016-07-21 18:50:54 +02:00
Simone Bordet
5e3269d3b6
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-07-21 18:50:33 +02:00
Simone Bordet
71eaacf855
Fixed Javadocs.
2016-07-21 18:48:44 +02:00
Simone Bordet
98454b8726
Merged branch 'jetty-9.4.x' into 'master'.
2016-07-21 17:50:51 +02:00
Simone Bordet
cf0ecbd88f
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-07-21 17:50:08 +02:00
Greg Wilkins
f3efded065
Servlet 4.0 getMappings rough implementation #746
2016-07-21 17:07:10 +10:00
Greg Wilkins
b8b9d222eb
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-07-21 16:50:27 +10: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
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