Commit Graph

13188 Commits

Author SHA1 Message Date
Greg Wilkins 07f547782f Cleanup metadata and HttpURI usage 2016-08-10 16:28:05 +10:00
Jan Bartel 25a9a35be0 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-08-10 12:14:47 +10:00
Jan Bartel eab4d92032 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-08-10 12:13:22 +10:00
Jan Bartel a9653e2f49 Issue #797
Use MimeTypes.class.getClassLoader to load properties.
2016-08-10 12:07:29 +10:00
Simone Bordet 2d6ec5bbf5 Merged branch 'jetty-9.4.x' into 'master'. 2016-08-09 22:51:10 +02:00
Simone Bordet c3b37cfbff Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-08-09 22:50:06 +02:00
John Gardiner Myers c1694ba9c3 Add protected HttpClientTransportOverHTTP2.getHttpClient() accessor
Signed-off-by: John Gardiner Myers <jgmyers@proofpoint.com>
2016-08-09 22:45:54 +02:00
Simone Bordet f8bc945f8d Merged branch 'jetty-9.4.x' into 'master'. 2016-08-09 16:04:07 +02:00
Simone Bordet 3c38e92898 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-08-09 16:03:26 +02:00
Simone Bordet 5073ba4787 Fixes #826 - Better default for HTTP/2's max concurrent streams.
Defaulted to 128 max concurrent streams.
2016-08-09 16:02:34 +02:00
Simone Bordet 7bb0a00ff4 Merged branch 'jetty-9.4.x' into 'master'. 2016-08-08 23:25:54 +02:00
Simone Bordet 49214a9d61 Fixed compilation issue. 2016-08-08 23:24:59 +02:00
Simone Bordet 1a88dfa8c0 Code cleanups. 2016-08-08 23:22:51 +02:00
Simone Bordet 4a9aadc99c Merged branch 'jetty-9.4.x' into 'master'. 2016-08-06 12:32:26 +02:00
Simone Bordet f695d9cf31 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-08-06 12:31:47 +02:00
Simone Bordet 45695e08aa Fixes #792 - [HTTP/2] Socket seems to be not closed completely.
Now sending the GOAWAY and then disconnecting from doStop(), ensuring
that the underlying TCP connection is closed even if the server does
not close.
2016-08-06 12:31:20 +02:00
Simone Bordet 92c7b991d8 Code cleanups. 2016-08-06 12:31:20 +02:00
Joakim Erdfelt 6d669892b7 Merge branch 'jetty-9.4.x' 2016-08-05 11:44:37 -07:00
Joakim Erdfelt 1b3b57b2d3 Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2016-08-05 11:44:17 -07:00
Joakim Erdfelt b4189a54c7 Fixes #819 - Adding output assertions logic to TestUseCases 2016-08-05 11:43:53 -07:00
Jan Bartel d9669e7282 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-08-05 18:27:39 +10:00
Jan Bartel 9984ff533b Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-08-05 18:26:39 +10:00
Jan Bartel 0ec64ee2a3 Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x 2016-08-05 18:25:13 +10:00
Jan Bartel 6f643d6982 Issue #817 2016-08-05 18:12:24 +10:00
Greg Wilkins 9b0951d5c5 increase test timeout 2016-08-05 17:04:14 +10:00
Greg Wilkins 9beef8e7a1 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-08-05 17:02:56 +10:00
Greg Wilkins 84efe1e438 increased test idletimeout 2016-08-05 14:11:30 +10:00
Jan Bartel f7d9d7ac9a Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-08-05 12:08:31 +10:00
Jan Bartel 16d44e7000 Issue #815 2016-08-05 12:00:08 +10:00
Greg Wilkins 144ac3dcea fix #809 avoid ignored NPE 2016-08-05 11:46:19 +10:00
Greg Wilkins ee3163bad8 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-08-05 11:24:24 +10:00
Jan Bartel ef52208c71 Open up webappclassloader to SessionData for de-serialization of sessions 2016-08-05 11:16:57 +10:00
Greg Wilkins 0c68ab1508 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-08-05 09:19:13 +10:00
Greg Wilkins f0bd6ceb8d Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-08-05 08:56:05 +10:00
Andriy Rosa 1d968ef53a HttpOtput: fix async write for heap ByteBuffer (#811)
* Remove unused imports

Signed-off-by: arhimondr <andriyrosa@gmail.com>

* Improve HttpOtputTest

HttpOutputTest gives false positive results for couple of tests
(testAsyncWriteBufferLargeHEAD, testAsyncWriteBufferLarge). This happens
because only the tail of the response is being checked, and that fact that
the beginning of the response in not being sent is ignored.

For regular encoding responses it is easy to check that the entire content is
received by checking it with `response.endWith(expectedContent)`. However
for chunked responses extra parsing is required to check the content in such way.
For the sake of code simplicity only start and end of the response is being checked
for the chunked encoded responses.

Signed-off-by: arhimondr <andriyrosa@gmail.com>

* Add testAsyncWriteBufferLargeDirect test to HttpOutputTest

Just to verify that everything is right when sending native buffers
asynchronously instead of heap ones.

Signed-off-by: arhimondr <andriyrosa@gmail.com>

* HttpOtput: fix async write for heap ByteBuffer

Fix bug when asynchronous writes of Heap ByteBuffer were ignored.

ByteBuffer position was moved to the end in the constructor,
then in the `process` method `if (_buffer.hasRemaining())` condition
was always evaluated to `false` and the actual write was not performed.

Add assertion in `HttpOutputTest` to verify that after the asynchronous
write position of the buffer is always at the end.

Signed-off-by: arhimondr <andriyrosa@gmail.com>
2016-08-05 08:51:10 +10:00
Jan Bartel e895508e8e Issue #746 Update osgi manifests to servlet 4.0 2016-08-04 15:03:51 +10:00
Jan Bartel 3b2291e82f Issue #746 Update osgi manifests to servlet 4.0 2016-08-04 14:41:39 +10:00
Jan Bartel 5232b933a4 Issue #746 Update osgi manifests to servlet 4.0 2016-08-04 14:20:43 +10:00
Greg Wilkins 5cb50e5f5d ignore PathResource test 2016-08-04 14:02:16 +10:00
Greg Wilkins 94eeb726b2 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-08-04 13:31:03 +10:00
Greg Wilkins 42b85308a7 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-08-04 11:03:33 +10:00
Greg Wilkins 12804a16f5 Fixed git issue references 2016-08-04 11:02:39 +10:00
Jesse McConnell 7fb303a191 Merge branch 'jetty-9.4.x' 2016-08-03 17:01:26 -05:00
Jesse McConnell 847d377d32 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-08-03 17:00:46 -05:00
Jesse McConnell 4bf885cedd Issue #56 - address users issues with ldap login 2016-08-03 16:59:17 -05:00
Jan Bartel 9c5331fe3f Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-08-03 19:28:42 +10:00
Jan Bartel 8f058d2b09 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-08-03 18:56:36 +10:00
Greg Wilkins e33b549c7f Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-08-03 18:49:48 +10:00
Jan Bartel 4b920622d5 Issue #797 2016-08-03 18:33:53 +10:00
Greg Wilkins d0101dc81a Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-08-03 18:01:42 +10:00