3681 Commits

Author SHA1 Message Date
Joakim Erdfelt
298de714f6 More windows build fixes 2017-03-08 15:29:54 -07:00
Joakim Erdfelt
0963a1c287 Fixes to windows build 2017-03-08 13:10:53 -07:00
Joakim Erdfelt
13259d2dc0 Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2017-03-08 10:39:54 -07:00
Joakim Erdfelt
65275ec42a Fixes to windows build 2017-03-08 10:38:00 -07:00
Jan Bartel
7ceab7dd5d Issue #1379 2017-03-08 11:28:37 +11:00
Greg Wilkins
0bcdd7ef4a Issue 1363 comments 2017-03-07 07:46:35 +11:00
Simone Bordet
ed535db2d5 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-03-06 16:16:28 +01:00
Simone Bordet
36b48c35c3 Fixes #1378 - Slow TLS clients may hang the server.
Properly overridden DecryptedEndPoint._writeCallback.isNonBlocking().
2017-03-06 16:10:59 +01:00
Greg Wilkins
4a0dd14a81 Jetty 9.4.x 1363 (#1376)
* Issue #1363

This is just some renaming withing HttpInput to improve it's understandability, plus a small
amount of refactoring for EOF handling.

This does not yet fix the deadlock, but is working towards better EOF handling so that state
can be pushed from HttpInput to HttpChannelState and avoid the need to query HttpInput state.

* Issue #1363

Fixed #1363 deadlock by removing the call from HttpChannelState#unhandle to HttpInput This backed out the fix for #1317, which was fixed differently:
 + HttpChannelState#onReadEof now always sets _asyncReadPossible to true and _asyncRead to REGISTERED, so that the tests in both #handling and #unhandle will be true and return an Action.READ_CALLBACK
 + HttpInput#run now moves the state from AEOF to EOF if it directly consumes EOF from interceptedContent
 + HttpInput#run no longer calls onAllDataRead after a onDataAvailable, instead relying on the #onReadEof call to make #unhandle return Action.READ_CALLBACK
 so that onAllDataRead is called on a subsequent execution of #run
2017-03-06 20:00:15 +09:00
Greg Wilkins
0a2da4822d Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-03-06 14:20:23 +11:00
Simone Bordet
daa2a217e3 Fixes #1184 - IllegalStateException for HEAD requests responded with 404.
Fixed additional code path for requests with Accept header and non-404 response.
2017-02-26 16:20:28 +01:00
Greg Wilkins
45232639ba rename Interest 2017-02-25 12:37:21 +09:00
Joakim Erdfelt
523fab30bd Updating to version 9.4.3-SNAPSHOT 2017-02-20 08:13:31 -07:00
Joakim Erdfelt
4a674b9cc9 Updating to version 9.4.2.v20170220 2017-02-20 06:22:45 -07:00
Joakim Erdfelt
4eda32ddca Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-02-15 11:54:19 -07:00
Joakim Erdfelt
8fe94cd110 Issue #1328 - Making Response.setBufferSize(int) ISE more clear 2017-02-15 11:40:17 -07:00
Greg Wilkins
50e87c05a7 improved naming of context log 2017-02-10 16:00:39 +11:00
Greg Wilkins
b4e4e65994 Issue #612
TODO in Response for using HttpGenerator trailer mechanism
2017-02-10 08:46:46 +11:00
Simone Bordet
d2ada49bb2 Issue #1317 - AsyncProxyServletLoadTest fails.
Removed leftover code.
2017-02-09 22:09:02 +01:00
Simone Bordet
8b76358208 Code cleanups. 2017-02-09 16:11:36 +01:00
Greg Wilkins
046cbe4bc6 Issue #1317
Cleaned up Interest enum
2017-02-09 23:59:14 +11:00
Greg Wilkins
e7c0e2b288 Issue #1317
Fix by checking for the need to call onAllDataRead in unhandle
2017-02-09 23:42:49 +11:00
Greg Wilkins
633b68dc72 Issue #1313 Send 500 if insufficient bytes not committed 2017-02-09 16:22:15 +11:00
Greg Wilkins
1d4825c6c8 fixed merge 2017-02-08 17:10:59 +11:00
Greg Wilkins
a8bc125f5c Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-02-08 16:33:10 +11:00
Greg Wilkins
10b7326c3c Issue #1047 - ReadPendingException and then thread death.
Tidy up write side.
It cannot be the same as the read side as there is no registration for write interest.  There is only write operations and the
callbacks associated with them.
2017-02-08 15:58:35 +11:00
Greg Wilkins
8ecfbab79f Issue #1047 - ReadPendingException and then thread death.
Alternate fix. Tracking needed vs interested state within HttpChannelState rather
that ignoring duplicate interest registrations.
2017-02-08 15:58:35 +11:00
Jan Bartel
b11ad33ae4 Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-1150 2017-02-08 14:16:19 +11:00
Jan Bartel
f76dafebc3 Issue #1307 2017-02-08 13:05:48 +11:00
Joakim Erdfelt
5920e14c9b Merge pull request #1191 from CaoTianze/jetty-9.3.x
delete redundant addBean(serverChannel) invoke
2017-02-07 16:58:09 -07:00
Simone Bordet
e01636d109 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-02-07 22:31:06 +01:00
Simone Bordet
369c73ab45 Issue #1047 - ReadPendingException and then thread death.
Fixed by calling tryFillInterested() rather than fillInterested() to
cope with the race between reads scheduling read interest and
setWriteListener() that also executes code in
HttpChannelState.unhandle() that wants to schedule read interest.
2017-02-07 22:23:52 +01:00
Joakim Erdfelt
98688052ef Disabling InsufficientBytes tests in 9.3 (fixed in 9.4+) 2017-02-06 11:06:12 -07:00
Joakim Erdfelt
cdc58b4008 Fixing InsufficientBytes test cases
+ Because of issues #1045 and #1185 insufficient bytes on a response results in a closed connection
2017-02-06 10:18:26 -07:00
Joakim Erdfelt
0a1eee1c28 Fixing surefire breaking HttpManyWayToCommitTest
+ Reverting change to HttpTester.parseResponse(Input)
+ Providing new HttpTester.parsePartialResponse(Input)
+ InsufficientBytes tests no longer assert content strings with invalid
  characters (this was breaks the surefire report xml)
2017-02-06 10:18:26 -07:00
Joakim Erdfelt
25a95b83f9 Bad tests take too long 2017-02-06 10:17:56 -07:00
Joakim Erdfelt
2bd1029d1b Fixing InsufficientBytes test cases
+ Because of issues #1045 and #1185 insufficient bytes on a response results in a closed connection
2017-02-03 10:29:27 -07:00
Joakim Erdfelt
472a40806e Fixing surefire breaking HttpManyWayToCommitTest
+ Reverting change to HttpTester.parseResponse(Input)
+ Providing new HttpTester.parsePartialResponse(Input)
+ InsufficientBytes tests no longer assert content strings with invalid
  characters (this was breaks the surefire report xml)
2017-02-03 06:25:23 -07:00
Joakim Erdfelt
43c203b606 Bad tests take too long 2017-02-02 19:28:16 -07:00
Joakim Erdfelt
5e57b9562f Merge branch 'jetty-9.3.x' into jetty-9.4.x 2017-02-02 16:14:10 -07:00
Joakim Erdfelt
0254854299 Merge branch 'jetty-9.3.x' of github.com:eclipse/jetty.project into jetty-9.3.x 2017-02-02 15:54:27 -07:00
Joakim Erdfelt
9a8f22d5dd Testing Updates
+ Upgrading to jetty-test-helper 4.0
+ Removing use of org.eclipse.jetty.toolchain.test.SimpleRequest
+ Removing use of org.eclipse.jetty.toolchain.test.http.SimpleHttpParser
+ Removing use of org.eclipse.jetty.toolchain.test.http.SimpleHttpResponse
+ Updating long since deprecated (and now removed) known quirky methods
  in jetty-test-helper and the test classes.
2017-02-02 15:51:38 -07:00
Greg Wilkins
80386028c1 Trailers for generated requests 2017-02-02 13:27:12 +11:00
Simone Bordet
7923032582 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-02-02 00:24:51 +01:00
Greg Wilkins
461c6082ae Issue #1296 - Introduce HTTP parser "content complete" event. 2017-02-01 23:54:36 +01:00
Jan Bartel
0391c52e4c Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-1150 2017-02-01 17:40:33 +11:00
Jan Bartel
a2e1dd3a30 Issue #1284
Ensured session expired in db but resident in memory is not expired.
2017-02-01 14:23:28 +11:00
Simone Bordet
7e7459d825 Fixes #612 - Support HTTP Trailer.
Implemented support in the generic HttpChannel and Request classes.
Linked HTTP/1.1 and HTTP/2 trailers to call HttpChannel, so that trailers
are now available in Servlet APIs by casting to Jetty's Request class.
The semantic is that trailers will only be available _after_ reading
the request content.
2017-01-30 15:17:59 +01:00
Jesse McConnell
d0c33ebe8b Updating to version 9.4.2-SNAPSHOT 2017-01-20 10:49:06 -06:00
Jesse McConnell
556ecbcdcf Updating to version 9.4.1.v20170120 2017-01-20 09:47:53 -06:00