Commit Graph

13272 Commits

Author SHA1 Message Date
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
WalkerWatch c8036e540f Updates for Jetty Handlers.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-08-05 14:04:11 -04:00
WalkerWatch 11131acae9 Issue #788 - Adds warning for previously enabled modules.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-08-05 12:28:13 -04: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
Greg Wilkins d57a11668d Issue #798 Sporadic async IO failure 2016-08-03 17:22:31 +10:00
Greg Wilkins a1885afff8 fix #804 by removing old javadoc reference to org.eclipse.jetty.util.URI.charset 2016-08-03 09:17:15 +10:00
Jesse McConnell a5a5098d90 Merge branch 'jetty-9.4.x' 2016-08-02 14:48:37 -05:00
Jesse McConnell 6108b9a234 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-08-02 14:48:14 -05:00
Jesse McConnell cdb00e81cb Merge pull request #803 from WalkerWatch/issues/802
Resolves #802
2016-08-02 14:47:52 -05:00
Jesse McConnell 131be3894b Merge pull request #800 from WalkerWatch/docupdate/JettyandMaven
Jetty and Maven updates.
2016-08-02 14:47:33 -05:00
WalkerWatch be54198b72 Resolves #802
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-08-02 12:48:50 -04:00
Greg Wilkins c07d383e5f Fixed comment in issue #782 2016-08-02 16:16:41 +10:00
Greg Wilkins 764307b9a7 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-08-02 13:59:01 +10:00
Greg Wilkins a7a52e04c9 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-08-02 13:58:15 +10:00
Greg Wilkins 83483e1f69 Response.reset does not clear session cookie #789
Added unit test
2016-08-02 13:49:05 +10:00
Greg Wilkins 53a1b8f995 OSGI MimeTypes resource #797
Pass MimeTypes.class as the classloader source.  
No unit test to confirm the fix.
2016-08-02 12:48:50 +10:00
WalkerWatch 271728ef7d Jetty and Maven updates.
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2016-08-01 17:55:54 -04:00
Joakim Erdfelt 3ea5c29ea6 Fixes #749 - Invalid WebSocket Upgrade should result in error 400, not 405 2016-08-01 10:06:22 -07:00
Joakim Erdfelt d6dd5046ce work around jetty-distribution incremental build issue 2016-07-29 16:09:03 -07:00
Jesse McConnell c16ff0f49f Merge branch 'jetty-9.4.x' 2016-07-29 16:13:56 -05:00