Commit Graph

3528 Commits

Author SHA1 Message Date
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
Jesse McConnell 66b43ecda8 Updating to version 9.3.17-SNAPSHOT 2017-01-20 09:33:43 -06:00
Jesse McConnell df03355d00 Updating to version 9.3.16.v20170120 2017-01-20 09:06:48 -06:00
Greg Wilkins 389ef2a2a3 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-01-20 15:57:33 +11:00
Greg Wilkins f9c829f7cc Issue #1269
report inferred encoding
2017-01-20 11:38:21 +11:00
Greg Wilkins 91987d4233 Issue #1269
Stop call to getCharacterEncoding forcing a choice.
2017-01-20 11:18:23 +11:00
Simone Bordet 0c8273f2ca Happy New Year 2017. 2017-01-19 19:26:41 +01:00
Simone Bordet 07838b057f Happy New Year 2017. 2017-01-19 18:54:03 +01:00
Simone Bordet 347c48d657 Revert "resolve merge and update license headers"
This reverts commit 53b31b03dd, reversing
changes made to 4565c186d7.
2017-01-19 18:26:43 +01:00
Jesse McConnell 53b31b03dd resolve merge and update license headers 2017-01-19 09:33:16 -06:00
Jesse McConnell ce3e6dafec update license headers to 2017 2017-01-19 09:30:00 -06:00
Simone Bordet a7938910b7 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-01-18 18:54:47 +01:00
Simone Bordet 53281d3202 Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2017-01-18 18:52:20 +01:00
Simone Bordet 6222ccba14 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-01-18 17:28:18 +01:00
Simone Bordet f97396b131 Fixes #1275 - Get rid of Mockito.
Converted the 2 tests that were using Mockito and removed from the POMs.
2017-01-18 17:09:57 +01:00
Jan Bartel 76df903feb Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-1150 2017-01-18 15:25:21 +11:00
Greg Wilkins c6e910cf12 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-01-18 14:39:20 +11:00
Greg Wilkins 70866690e4 Issue #1270 Avoid GzipHandler rework by DispatcherType exclusion 2017-01-18 14:11:25 +11:00
Greg Wilkins a4dd1672da Fixes #1269 extensible assumed mimetypes 2017-01-18 13:42:42 +11:00
Greg Wilkins fb8ecf9970 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-01-17 15:27:22 +11:00
Greg Wilkins 76e9849fcd Issue #1262 Avoid reflection in isMappedBuffer 2017-01-17 15:23:26 +11:00
Jan Bartel ec193693a2 Issue #1150 2017-01-13 22:30:44 +11:00
Simone Bordet e539d0b1fd Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-01-12 17:52:45 +01:00
Simone Bordet 11d669092a Issue #1073 - JDK9 support in Jetty 9.3.x.
* Updated Maven plugins to versions that support JDK 9.
* Added jdk9 profiles to the build files.
* Introduced modules jetty-alpn-java-client and jetty-alpn-java-server
containing a pure JDK 9 implementation of ALPN.
* Wired ALPN connection factories (client and server) to use the proper
ALPN implementation based on the JDK platform version (8 or 9).
2017-01-12 15:41:02 +01:00
Greg Wilkins fd33ea26f3 Fix #1254 2017-01-12 12:18:33 +11:00
Greg Wilkins df0f645aa4 fix #1248 2017-01-12 11:29:56 +11:00
Greg Wilkins 0d45c412e9 Fixed #1239 2017-01-12 10:51:31 +11:00
Greg Wilkins 73609ff7a6 removed println 2017-01-12 10:43:02 +11:00
Greg Wilkins 1d0d601694 Issue #1242 Added a quiet exception 2017-01-12 09:25:54 +11:00
Juha Paananen 46b7037ca8 add test for isShutdown
Signed-off-by: Juha Paananen <juha.paananen@gmail.com>
2017-01-11 14:44:35 +02:00
Juha Paananen 59625b1332 simplify
Signed-off-by: Juha Paananen <juha.paananen@gmail.com>
2017-01-11 14:44:26 +02:00
Juha Paananen ccb62f5137 fix comment
Signed-off-by: Juha Paananen <juha.paananen@gmail.com>
2017-01-11 14:44:17 +02:00
Juha Paananen 44658812c0 initialize _availability variable to prevent NPE in isShutdown
Signed-off-by: Juha Paananen <juha.paananen@gmail.com>
2017-01-11 14:36:02 +02:00
Greg Wilkins 611e79945c Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-01-11 18:10:50 +11:00
Greg Wilkins 36dcf47f18 Issue #1234 onBadMessage
Added a boolean to determine if headerComplete has been called, and if so then earlyEOF is called
2017-01-11 17:36:04 +11:00
David Barri ced72c52bd Fix broken XML in jetty-gzip.xml (#1227)
thanks
2017-01-10 16:05:05 +11:00
Jan Bartel e71f9442b2 Issue #1223
Update comment to clarify null workername is coerced internally to empty string.
2017-01-09 12:10:49 +11:00
Jan Bartel 69babbf38c Issue #1224
This reverts commit 3d35484dc7 and provides different solution.
2017-01-09 12:07:29 +11:00
Jan Bartel 04a2777603 Issue #1223 2017-01-07 15:54:44 +11:00
Olivier Lamy 9bc4cd32fc backport of fixes for #592 (#1208)
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-01-01 20:33:51 +11:00
Simone Bordet e215b065df Improved error reporting. 2016-12-30 22:01:33 +01:00
Simone Bordet 0f422475ad Improved error reporting. 2016-12-30 18:58:14 +01:00
Jan Bartel 8597fe57e6 Issue #1203 2016-12-26 17:09:22 +11:00
Greg Wilkins b950a2e2e4 Fixes #1201 2016-12-23 13:44:19 +11:00
Joakim Erdfelt 7494914ff6 Updating to version 9.3.16-SNAPSHOT 2016-12-20 13:09:32 -07:00
Joakim Erdfelt 680ecd646b Updating to version 9.3.15.v20161220 2016-12-20 12:31:58 -07:00
cao tianze 0a97b66b14 delete redundant addBean(serverChannel) invoke
Signed-off-by: cao tianze <hnrcao@qq.com>
2016-12-20 01:15:32 +08:00
WalkerWatch 22f48ac369 Issue #1188 - Fixed dependency.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-12-19 00:23:59 -05:00
Joakim Erdfelt 6b3b59df43 Updating to version 9.2.21-SNAPSHOT 2016-12-16 16:23:06 -07:00
Joakim Erdfelt bcbcee7f23 Updating to version 9.2.20.v20161216 2016-12-16 15:47:41 -07:00
Simone Bordet 8cafca7c64 Fixes #1185 - Connection abruptly closed for HEAD requests.
Only checking if the Content-Length and the actual
content written match for responses that have a body.
2016-12-16 18:45:45 +01:00
Simone Bordet c3e608fae3 Fixes #1184 - IllegalStateException for HEAD requests responded with 404.
Now committing the default 404 response body early,
so that attempts to try to change the content length
will be ignored since the response is already committed.
2016-12-16 18:38:27 +01:00
Joakim Erdfelt c70fa88be0 Issue #1175 - Correcting test DispatchType 2016-12-14 12:16:53 -07:00
Joakim Erdfelt 58b8f56a36 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-12-14 12:15:50 -07:00