15596 Commits

Author SHA1 Message Date
Greg Wilkins
fa1e190aff Merge branch 'jetty-9.4.x' into jetty-9.4.x-2232-HttpParser-cleanup 2018-03-14 10:21:14 +11:00
Greg Wilkins
01e8cf440e Safer simpler version parsing #2284
For #2284 no longer parse the optional detail of the java version.
Parse failures will result in a guessed JVM platform 8

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-14 10:12:44 +11:00
Greg Wilkins
5524c7e67e removed unused jetty-monitor #2308
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-14 09:42:22 +11:00
Joakim Erdfelt
44f53f8a2f
Merge pull request #2329 from eclipse/jetty-9.4.x-issue-2139-dtd-cleanup
Issue #2139 - updating all DTD references to to configure_9_3.dtd
2018-03-13 17:38:32 -05:00
Greg Wilkins
c1f038d3bf Merge branch 'jetty-9.4.x' into jetty-9.4.x-2232-HttpParser-cleanup 2018-03-14 09:32:51 +11:00
Greg Wilkins
a634b571b3 Improved include handling of trailing / #2275
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-14 08:42:21 +11:00
Joakim Erdfelt
f9658f06b5 Issue #2139 - updating all DTD references to to configure_9_3.dtd
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-03-13 14:36:12 -05:00
Joakim Erdfelt
7374d6563d Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2018-03-13 14:24:57 -05:00
Joakim Erdfelt
aafda1a279 Issue #2280 - adding default utf-8 encoding to application/json 2018-03-13 14:24:37 -05:00
Lachlan Roberts
20c9fb45f8 Reworked the tests on EPILOGUE and multiple content. All tests are passing.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-13 20:21:10 +11:00
Simone Bordet
9338aa171d
Merge pull request #2321 from eclipse/jetty-9.4.x-2318-bad_message_handling
Fixes #2318 - HttpParser.Listener.onBadMessage() should take BadMessageException
2018-03-13 09:36:36 +01:00
Greg Wilkins
faa32f0c71 improved handler signature
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-13 18:25:32 +11:00
Lachlan Roberts
d670b60e4d Merge remote-tracking branch 'eclipse/jetty-9.4.x-1027-Multipart' into jetty-9.4.x-1027-Multipart
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-13 17:58:53 +11:00
Lachlan Roberts
a51542ee03 work in progress EPILOGUE and END states implemented, in process of testing them
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-13 17:52:57 +11:00
Greg Wilkins
46a8fb5dc4 fixes for partial pattern matches and optional CRLF
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-13 17:40:26 +11:00
Greg Wilkins
f35bd03810 Speculative fix for #2233
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-13 16:15:28 +11:00
Lachlan Roberts
0435eea708 work in progress implemented OCTETS
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-13 16:13:07 +11:00
Greg Wilkins
be1a011120 more robust test
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-13 14:26:52 +11:00
Greg Wilkins
a933456089 update etags for all methods #1416
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-13 14:07:37 +11:00
Greg Wilkins
74f5b9898f simplified testSelectorWakeup #2219
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-13 13:42:35 +11:00
Greg Wilkins
915af401e1 HttpParser cleanup #2232
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-13 13:22:01 +11:00
Lachlan Roberts
0d4e202343 Merge remote-tracking branch 'eclipse/jetty-9.4.x-1027-Multipart' into jetty-9.4.x-1027-Multipart 2018-03-13 11:49:00 +11:00
Lachlan Roberts
66a76dae3c work in progress
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-13 11:48:41 +11:00
Greg Wilkins
267150c940 cleanup field parsing
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-13 11:09:14 +11:00
Joakim Erdfelt
dcfa6f0f38 Issue #2307 - applying changes from review
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-03-12 17:34:12 -05:00
Lachlan Roberts
ec05eb1e5f Merge remote-tracking branch 'eclipse/jetty-9.4.x-1027-Multipart' into jetty-9.4.x-1027-Multipart 2018-03-13 09:33:11 +11:00
Lachlan Roberts
244db8c482 Merge branch 'jetty-9.4.x' into jetty-9.4.x-1027-SearchPattern 2018-03-13 09:30:00 +11:00
Joakim Erdfelt
0361cf6cd3 Simplifying testcase, relying on flush not sleep. 2018-03-12 16:33:39 -05:00
Joakim Erdfelt
d3120ee212 Issue #2307 - On sendError() the response character encoding is null
+ Added testcase to replicate
+ Making character encoding from unset during sendError

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-03-12 14:29:36 -05:00
Simone Bordet
8b391a88dd Fixes #2318 - HttpParser.Listener.onBadMessage() should take BadMessageException.
Changed the signature of HttpParser.Listener.onBadMessage()
to take a BadMessageException and updated dependent code.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-03-12 19:51:57 +01:00
Joakim Erdfelt
eaefc6a9c2 Merge branch 'jetty-9.4.x-2282-websocket-test-remove-eventqueue' into jetty-9.4.x 2018-03-12 12:12:02 -05:00
Simone Bordet
ff341fb420 Issue #2313 - Dump HTTP/2 channel state.
Added HTTP/2 stream age to toString().

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-03-12 11:30:00 +01:00
Greg Wilkins
1352be4308 added some unit tests for part content
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-12 17:39:11 +11:00
Greg Wilkins
add08caec0 update after lachlan affb43643337468d0eba8ced9315902e61429017
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-12 17:27:05 +11:00
Greg Wilkins
d9be68c380 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-1027-Multipart 2018-03-12 17:25:43 +11:00
Greg Wilkins
a82964fba1 Merge remote-tracking branch 'lachlan/jetty-9.4.x-1027-SearchPattern' into jetty-9.4.x-1027-Multipart 2018-03-12 17:23:43 +11:00
Simone Bordet
21bdb367fd Fixes #2313 - Dump HTTP/2 channel state.
Dumping also HttpChannelOverHTTP2 when dumping the HTTP2Stream.
The channel is now stored as a field in HTTP2Stream rather than
as an attribute to save the attributes map allocation.
Consequently, IStream has now getter/setter for the property
"attachment" that is used to store the channel without having
a type dependency on HttpChannel.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-03-10 15:11:40 +01:00
Simone Bordet
4c24c457de Fixes #2312 - HTTP/2 Connection.Listener notified after first request.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-03-10 15:05:02 +01:00
Simone Bordet
15729928b3
Merge pull request #2292 from olamy/feature/surefire_upgrade
Upgrade surefire version to 2.21.0
2018-03-09 08:23:02 +01:00
olivier lamy
c22eedac8b upgrade surefire version to 2.21.0
Signed-off-by: olivier lamy <olamy@webtide.com>

use a property for surefire version and align version

Signed-off-by: olivier lamy <olamy@webtide.com>
2018-03-09 15:12:20 +10:00
Lachlan Roberts
affb436433 changes after review 1
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-09 10:03:28 +11:00
Greg Wilkins
b0325f8299 work in progress
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-09 09:38:23 +11:00
Greg Wilkins
dc67cb5241 Work in progres #1027
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-08 17:47:46 +11:00
Greg Wilkins
25b8933d34 Merge remote-tracking branch 'lachlan/jetty-9.4.x-1027-SearchPattern' into jetty-9.4.x-1027-Multipart 2018-03-08 15:05:35 +11:00
Joakim Erdfelt
5541fcbdba Issue #2282 - final testing tweaks
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-03-07 18:34:03 -06:00
Joakim Erdfelt
e76f6d7baf Issue #2282 - more websocket test stablization
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-03-07 17:42:02 -06:00
Greg Wilkins
a10eb59f82 Added warning against wildcard #1053
From recommendation of @freetom

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-08 10:30:55 +11:00
Simone Bordet
f6c1b76e71 Issue #2131 - Introduce a monitored thread pool. (#2260)
* Issue #2131 - Introduce a monitored thread pool.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>

* Issue #2131 - Introduce a monitored thread pool.

Updated to use SampleStatistic and CounterStatistics.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>

* Issue #2131 - Introduce a monitored thread pool.

Adding statistics fields as beans.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-03-08 08:47:31 +11:00
Greg Wilkins
35be19b818 Also use system property #2298
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-08 08:46:24 +11:00
Greg Wilkins
cf0b6140fe
Merge pull request #2299 from olamy/feature/available_processors
#2298 Override the processor number with an environment variable
2018-03-08 08:36:52 +11:00