9945 Commits

Author SHA1 Message Date
Joakim Erdfelt
1e7cca37e5 Reworking CDI tests to be formal integration tests 2014-09-26 16:40:12 -07:00
Joakim Erdfelt
d42d8f10c2 Expose Decorator in default serverClasses list 2014-09-26 10:42:21 -07:00
Joakim Erdfelt
5cdbca9a0f Merge branch 'jetty-9.2.x' into cdi-testing 2014-09-26 10:15:42 -07:00
Simone Bordet
6ed0170913 Removed call to Thread.dumpStack(). 2014-09-26 11:34:26 +02:00
Simone Bordet
bcbefd3942 Fixed race where the key interests were set before updating the
state, causing onSelected() to be called with the wrong state and
failing an assertion.
2014-09-26 10:13:16 +02:00
Simone Bordet
8d2efaf7eb 445167 - Allow configuration of dispatch after select.
Introduced parameter "dispatchIO" in the relevant factories so that
they can be configured by users and connections will be created
taking into account this parameter.

For less configurable connection factories, this parameter is
currently hardcoded to either true or false depending on the case.
For example, ALPN and NPN connections have it to false, since they
don't do any blocking operation in onFillable().
2014-09-26 10:13:16 +02:00
Simone Bordet
a8b461fe91 Cosmetics: removed unused imports, cleaned up source code, improved javadocs. 2014-09-26 10:13:16 +02:00
Simone Bordet
8af9ea4030 Calling notIdle() to avoid the idle timeout triggers when sending frames. 2014-09-26 10:13:16 +02:00
Simone Bordet
9a1acd59fc Made test more robust. 2014-09-26 10:13:15 +02:00
Simone Bordet
a9dcfd5c5a Removed rotten comment and cleaned up javadocs. 2014-09-26 10:13:15 +02:00
Simone Bordet
54cd00aec3 Javadocs cleanup. 2014-09-26 10:13:15 +02:00
Jesse McConnell
91f44dd6c6 Merge branch 'release-9' 2014-09-25 07:57:12 -05:00
Joakim Erdfelt
90af0a4e5f 437303 - Serving of static filenames with "unwise" characters causes 404
error 

+ Adding testcases for the rest of the unwise characters to show how
PathResource works vs the venerable FileResource
2014-09-24 15:46:08 -07:00
Joakim Erdfelt
ab58438600 396569 - 'bin/jetty.sh stop' reports 'OK' even when jetty was not
running 

+ Validating PID file and contents a bit more
2014-09-24 12:54:38 -07:00
Joakim Erdfelt
45bcb6df3a 396572 - Starting jetty from cygwin is not working properly
+ Fixing #!/usr/bin/env bash 
  (it had extra spaces at end which breaks env lookup on cygwin)
+ Using cygpath -w liberally to allow java started from cygwin
  to find resources using windows specific path names.
2014-09-24 10:47:26 -07:00
Joakim Erdfelt
840316797d 376365 - "jetty.sh start" returns 0 on failure
+ simple hack to produce error 1 on xml validation issue
2014-09-24 10:47:26 -07:00
Jesse McConnell
3095a179f9 [maven-release-plugin] prepare for next development iteration 2014-09-24 12:24:31 -05:00
Jesse McConnell
390f3200cc [maven-release-plugin] prepare release jetty-9.3.0.M0 jetty-9.3.0.M0 2014-09-24 12:24:23 -05:00
Jesse McConnell
6f7581084c set for release 2014-09-24 09:53:10 -05:00
Jesse McConnell
3f97f3ed2c Merge branch 'master' into release-9 2014-09-24 09:52:17 -05:00
Jan Bartel
851e154be3 444896 Overriding of web-default servlet mapping in web.xml not working with quickstart 2014-09-24 16:03:08 +10:00
Jan Bartel
607797b005 444676 Goal jetty:deploy-war produces errors with version 9.2.3 2014-09-24 14:33:32 +10:00
Simone Bordet
1e33c32513 Merged branch 'jetty-9.2.x' into 'master'. 2014-09-23 18:48:16 +02:00
Simone Bordet
dd8be028bb 444863 - ProxyServlet does not filter headers listed by the Connection header. 2014-09-23 18:47:27 +02:00
Joakim Erdfelt
d4d62c5690 438387 - NullPointerException after ServletUpgradeResponse.sendForbidden
is called during WebSocketCreator.createWebSocket 

+ Adding NPE guard for error/forbidden/complete flows
2014-09-23 09:46:06 -07:00
Simone Bordet
2bdc402609 Merged branch 'jetty-9.2.x' into 'master'. 2014-09-23 11:38:03 +02:00
Joakim Erdfelt
0bf68a07ae 442495 - Bad Context ClassLoader in JSR356 WebSocket onOpen
+ Fixing onOpen context classloader to be that of the context
  that started the WebSocketUpgradeFilter (which will be the
  same as the WebAppContext in most cases)
2014-09-23 11:33:44 +02:00
Joakim Erdfelt
901707b894 444617 - Expose local and remote socket address to applications
+ Exposing 2 new automatically added userProperties
  * "javax.websocket.endpoint.localAddress" 
  * "javax.websocket.endpoint.remoteAddress"
  these are both java.net.InetSocketAddress objects
2014-09-23 11:33:44 +02:00
Joakim Erdfelt
e93247de42 444771 - JSR356 / EndPointConfig.userProperties are not unique per
endpoint upgrade 

+ Adding testcase & implementation which honors the
ServerEndpointConfig.userProperties copy at an earlier point.
2014-09-23 11:33:44 +02:00
Joakim Erdfelt
65cae13b1e 444748 - WebSocketClient.stop() does not unregister from ShutdownThread
+ Making (de)register smart about if wsclient is registered or not
2014-09-23 11:33:44 +02:00
Simone Bordet
ee0f90b6b9 444416 - AsyncProxyServlet recursion.
Implemented reading of content using IteratingCallback to avoid
recursion.
2014-09-23 11:33:44 +02:00
Simone Bordet
f1678124dc 444764 - HttpClient notifies callbacks for last chunk of content twice.
Fixed by filtering out notification of the callbacks in case the
HttpContent is already consumed.
2014-09-23 11:33:44 +02:00
Greg Wilkins
41e95bfa5a added TLD to quickstart example 2014-09-23 11:33:44 +02:00
Jan Bartel
cc43b9c2c6 444547 Format exception in ResourceCache.Content.toString() 2014-09-23 11:33:44 +02:00
Greg Wilkins
40a7d5984e 444222 replace CRLF in header values with whitespace rather than ? 2014-09-23 11:33:44 +02:00
Joakim Erdfelt
d60a61288a Restoring ErrorHandler / ErrorPageErrorHandler logic 2014-09-23 11:33:43 +02:00
Joakim Erdfelt
f3693219f8 444517 - Ensure WebSocketUpgradeFilter is always first in filter chain
* Using Servlet 3.1's ServletContext.addFilter() mechanisms with its
    FilterRegistration to encourage the WebSocketUpgradeFilter to be
    first in the filter chain.
    Note: this is possible, but can be overridden by another call
    to the same ServletContext.addFilter() using the same techniques
    to put something in front of the WebSocketUpgradeFilter.
2014-09-23 11:33:43 +02:00
Jan Bartel
49a32eb1b0 444124 JSP include with <servlet><jsp-file> can cause infinite recursion 2014-09-23 11:33:43 +02:00
Greg Wilkins
08e1f39bf9 444416 Interative Callback pattern in AsyncProxyServlet 2014-09-23 11:33:43 +02:00
Simone Bordet
ffa0fc73a9 Made methods return boolean to indicate whether the update was
successful or not.
2014-09-23 11:33:16 +02:00
Joakim Erdfelt
0dca1b0794 442495 - Bad Context ClassLoader in JSR356 WebSocket onOpen
+ Fixing onOpen context classloader to be that of the context
  that started the WebSocketUpgradeFilter (which will be the
  same as the WebAppContext in most cases)
2014-09-22 14:37:00 -07:00
Joakim Erdfelt
d6082b2d65 444617 - Expose local and remote socket address to applications
+ Exposing 2 new automatically added userProperties
  * "javax.websocket.endpoint.localAddress" 
  * "javax.websocket.endpoint.remoteAddress"
  these are both java.net.InetSocketAddress objects
2014-09-22 12:43:37 -07:00
Joakim Erdfelt
1ce66f38a0 444771 - JSR356 / EndPointConfig.userProperties are not unique per
endpoint upgrade 

+ Adding testcase & implementation which honors the
ServerEndpointConfig.userProperties copy at an earlier point.
2014-09-22 11:59:43 -07:00
Joakim Erdfelt
b633778b33 444748 - WebSocketClient.stop() does not unregister from ShutdownThread
+ Making (de)register smart about if wsclient is registered or not
2014-09-22 11:18:30 -07:00
Joakim Erdfelt
2d6d5455ae Basic CDI intro 2014-09-22 09:26:33 -07:00
Simone Bordet
ddcf878c32 444416 - AsyncProxyServlet recursion.
Implemented reading of content using IteratingCallback to avoid
recursion.
2014-09-22 18:21:35 +02:00
Simone Bordet
1cd367ae7c 444764 - HttpClient notifies callbacks for last chunk of content twice.
Fixed by filtering out notification of the callbacks in case the
HttpContent is already consumed.
2014-09-22 18:16:49 +02:00
Greg Wilkins
709ac00f8b added TLD to quickstart example 2014-09-22 15:52:40 +10:00
Greg Wilkins
a573430840 PushCacheFilter handles multiple hosts and ports 2014-09-22 11:10:13 +10:00
Greg Wilkins
fc4bfc8a66 improved debug logging 2014-09-21 15:03:54 +10:00