11206 Commits

Author SHA1 Message Date
Jesse McConnell
e9edf4c24b [maven-release-plugin] prepare release jetty-9.3.3.v20150825 jetty-9.3.3.v20150825 2015-08-25 14:09:54 -05:00
Jesse McConnell
7a2f4df2c9 set for release 2015-08-25 11:57:52 -05:00
Simone Bordet
6c5477de86 Fixed randonly failing test.
Sometimes the DNS was returning one IPv4 and one IPv6 address.
Replacing the IPv4 one left as the only valid address the IPv6; but
if IPv6 is not deployed on the network infrastructure, then that will
fail too, causing the test to fail.
2015-08-25 18:21:03 +02:00
Simone Bordet
ef9724f448 Improved error reporting. 2015-08-25 18:19:29 +02:00
Simone Bordet
3333d1834f Using try-with-resources to close ServerSocket. 2015-08-25 16:22:56 +02:00
Simone Bordet
c24aa25dfb 475546 - ClosedChannelException when connecting to HTTPS over HTTP proxy with CONNECT.
Not closing the connection if the request method is CONNECT.
2015-08-25 15:07:50 +02:00
Simone Bordet
a93b35d59e Improved documentation regarding the effects of ContentProvider.getLength()
on other HTTP headers such as Content-Length.
2015-08-24 19:20:49 +02:00
Simone Bordet
545fa0f72b 475605 - Add support for multi-homed destinations.
If DNS lookup returns multiple IP addresses, HttpClient tries to
connect to the first; failing that, to the second, and so on.
2015-08-24 12:31:08 +02:00
Greg Wilkins
aca2aa56ad 475483 - Starting Jetty with [exec] should use properties file.
Added --exec-properties to allow the name of the properties file to be set
and for it not to be deleted on exit.
2015-08-21 09:03:26 +10:00
Simone Bordet
bfeb7f56a6 Closing the connection also in case the parser is in CLOSED state.
When the request is fully read and the response is sent, the parser
may enter the CLOSE state if there were Connection: close headers.

It may happen that later the connection reads -1, then moves the
parser is CLOSED state, so the condition to close the connection must
include the CLOSED state.
2015-08-20 18:23:55 +02:00
Simone Bordet
fd335d6c3e Guarded against NPE. 2015-08-20 16:31:09 +02:00
Simone Bordet
9b6ba2477c Removed unnecessary field. 2015-08-20 15:15:06 +02:00
Simone Bordet
837a36e3ec 475483 - Starting Jetty with [exec] should use properties file.
Now using a properties file in case of [exec], and moved the
properties file inside the $jetty.base directory.
2015-08-20 15:04:04 +02:00
Greg Wilkins
d44ba7e24a Improved Context pluggability 2015-08-19 16:28:36 +10:00
Greg Wilkins
2cc663685a ContextHandler.ContextScopeListener
Added a listener that is called as any thread enters/exits a context/request scope. This is
both normal servlet dispatches and async callbacks.
2015-08-19 15:30:52 +10:00
Jan Bartel
4743c19a8c 474961 Close input stream for classes in AnnotationParser after scanning 2015-08-19 11:12:40 +10:00
Jan Bartel
3de7fc77c7 474558 Debug log ServletContainerInitializer @HandlesTypes contents 2015-08-19 10:25:36 +10:00
Greg Wilkins
22babda3f9 472411 PathResource.checkAliasPath() typo 2015-08-19 09:54:04 +10:00
Greg Wilkins
afda638dd9 474685 - GzipHandler configuration supports csv paths and mimetypes.
readded for backward compatibility, but with a warning it will be removed.
2015-08-19 09:39:38 +10:00
Simone Bordet
805ec9554c 475195 - SNI matching fails when keystore does not contain wild certificates.
Fixed condition in SslContextFactory.getKeyManagers() that installs
the SniX509ExtendedKeyManager.

Miscellaneous code cleanups.
2015-08-17 20:55:20 +02:00
Joakim Erdfelt
8e2b32173d Turning down logging 2015-08-14 14:48:51 -07:00
Joakim Erdfelt
6ea5b03e23 474634 - AsyncListener.onError() handling.
+ Reworking test-continuations to (hopefully) be a bit more reliable
  in its working with history assertions on slower hardware.
  Namely, the server is started, and stopped, for each testcase
  *before* the assertions of success are tested.
2015-08-14 14:48:51 -07:00
Joakim Erdfelt
d1fa4583b3 Adding some output to testcase to help track down behavior seen on ci 2015-08-14 14:48:51 -07:00
Simone Bordet
b96f2f5b24 474634 - AsyncListener.onError() handling.
Simplified exception handling, making sure that we terminate the
handling even in case the state was COMPLETING but the container
could not write the response.
2015-08-14 14:48:51 -07:00
Simone Bordet
94df04e57b Fixed unnecessary double dispatch. 2015-08-14 14:48:51 -07:00
Simone Bordet
b819273c7b 474634 - AsyncListener.onError() handling.
Refactored continuation tests.
2015-08-14 14:48:51 -07:00
Joakim Erdfelt
2f4f4a2247 Minor improvements in WebSocketConnection.toString() 2015-08-14 14:48:51 -07:00
Greg Wilkins
087b4c94d7 474358 - DefaultServlet bad Content-Type on compressed content 2015-08-14 16:03:08 +10:00
Greg Wilkins
6274522787 Merge branch 'master' into async_onError 2015-08-14 12:27:19 +10:00
Greg Wilkins
946b1476f8 474634 - AsyncListener.onError() handling.
reverted onComplete behaviour
2015-08-14 12:24:06 +10:00
Greg Wilkins
d780839bec 474634 - AsyncListener.onError() handling.
Added HttpConfiguration.maxErrorDispatches to detect error loops
Fixed ManyWays... unit test to handle error dispatch.
2015-08-14 10:06:57 +10:00
Joakim Erdfelt
173f6d8b3b Tweaking test-continuation testing to be more clear on the failure 2015-08-13 16:40:00 -07:00
Simone Bordet
69b90ef59b 474888 - HttpClient JMX support. 2015-08-13 15:16:14 +02:00
Greg Wilkins
9b9b9524dc 474634 - AsyncListener.onError() handling.
Allow IOException from complete flush to goto an onError call.
2015-08-13 19:09:57 +10:00
Greg Wilkins
108821aacb 474634 - AsyncListener.onError() handling.
Fixed more tests in jetty-servlets
2015-08-13 18:44:25 +10:00
Greg Wilkins
8c0e4f53d3 474634 - AsyncListener.onError() handling.
Fixed AsyncContextTests
2015-08-13 18:12:38 +10:00
Greg Wilkins
f21ea15725 474634 - AsyncListener.onError() handling.
Handle errors thrown from dispatch when async is started with onError
2015-08-13 18:06:14 +10:00
Greg Wilkins
0f6a83f710 474634 - AsyncListener.onError() handling.
Fixed async blocking read test
2015-08-13 16:55:45 +10:00
Greg Wilkins
d1aa9ce993 474634 - AsyncListener.onError() handling.
Removed special termination case handling. Unhandle can be avoided with a break loop.
Replaced actions COMPLETING and COMPLETED with COMPLETE (which is an action)

Refactored test harness to use a static history array rather than headers
2015-08-13 16:22:02 +10:00
Simone Bordet
79086f3fe3 474634 - AsyncListener.onError() handling.
Interim work on getting the right behavior for onError().
2015-08-13 01:33:28 +02:00
Simone Bordet
4c7d5f661e Fixed import error. 2015-08-11 12:32:27 +02:00
Simone Bordet
aa684a5dcc 470311 - Introduce a proxy-protocol module.
Support for the PROXY protocol is now enabled via 2 new modules:
proxy-protocol and proxy-protocol-ssl, respectively for the HTTP
connector and the SSL connector.
2015-08-11 12:17:24 +02:00
Joakim Erdfelt
8837291393 474634 - Exception handling from AsyncContext handling inconsistent
+ Adding AsyncListenerTest examples of Exceptions during AsyncContext
  scoped servlet requests.
2015-08-10 10:55:44 -07:00
Joakim Erdfelt
9ca235beca Revert "474618 - AsyncListener.onComplete not called when error occurs"
This reverts commit 60f409e4fff79df88f331d3fa0e16438636ede72.
2015-08-10 09:38:40 -07:00
Joakim Erdfelt
60f409e4ff 474618 - AsyncListener.onComplete not called when error occurs 2015-08-10 07:56:14 -07:00
Joakim Erdfelt
b522dd7fe2 474617 - AsyncListener.onError not called for errors
+ Making onError call correctly
2015-08-10 07:53:56 -07:00
Joakim Erdfelt
25b692046f Merge branch 'jetty-9.2.x' 2015-08-07 09:40:11 -07:00
Joakim Erdfelt
55862e229e 471055 - Restore legacy/experimental WebSocket extensions (deflate-frame) 2015-08-07 09:39:12 -07:00
Joakim Erdfelt
a71c543a7e Revert "Removing old websocket extensions x-webkit-deflate-frame and deflate-frame"
This reverts commit ec9504aab86ee170df8af148ed504fadd6e03534.
2015-08-07 07:37:06 -07:00
Joakim Erdfelt
1b33ded784 Merge branch 'jetty-9.2.x'
Conflicts:
	jetty-cdi/cdi-servlet/src/test/java/org/eclipse/jetty/cdi/servlet/LocaleTimeFormatter.java
2015-08-06 15:56:53 -07:00