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
Greg Wilkins
580c87bcc6
Enhanced PushCacheFilter
...
Can learn associations from if-modified-since requests
has __renewPushCache__ special URI to renew associations HACK!
2014-09-21 15:03:54 +10:00
Simone Bordet
51631c2a46
Made the test more robust, avoiding WritePendingExceptions.
2014-09-19 10:33:09 +02:00
Greg Wilkins
bfe83c765e
444485 - Client resets stream, pending server data is failed, write hangs.
...
renamed terminate to abort
2014-09-19 13:03:41 +10:00
Jan Bartel
059f5e2396
444547 Format exception in ResourceCache.Content.toString()
2014-09-19 10:28:33 +10:00
Greg Wilkins
c7c9d49a51
Merge branch 'jetty-9.2.x' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9.2.x
2014-09-19 09:49:24 +10:00
Greg Wilkins
28cc68b210
444222 replace CRLF in header values with whitespace rather than ?
2014-09-19 09:49:09 +10:00
Joakim Erdfelt
efad046148
Restoring ErrorHandler / ErrorPageErrorHandler logic
2014-09-18 15:10:59 -07:00
Joakim Erdfelt
9b7b54ea0b
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-18 11:11:31 -07:00
Simone Bordet
bfda3620f3
444485 - Client resets stream, pending server data is failed, write hangs.
...
Fixed by ensuring that when a failure happens, either by catching an
exception or by failing a callback, we always call completed() and
abort the channel (via new method terminate()).
2014-09-18 16:31:16 +02:00
Simone Bordet
b74c6d1b8d
Using method superWrite() instead of super.write().
2014-09-18 15:13:50 +02:00
Simone Bordet
418a493337
More simplifications for the send() implementation.
2014-09-18 11:50:18 +02:00
Greg Wilkins
0acee9851f
minor cleanups of exceptions
2014-09-18 18:23:48 +10:00
Jan Bartel
2a25402de0
444124 JSP include with <servlet><jsp-file> can cause infinite recursion
2014-09-18 18:02:18 +10:00
Greg Wilkins
2018098225
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java
2014-09-18 16:36:51 +10:00
Greg Wilkins
ca07a9947e
444416 Interative Callback pattern in AsyncProxyServlet
2014-09-18 16:20:08 +10:00
Greg Wilkins
3b066ca2ae
444415 iterative WriteFlusher
2014-09-18 15:31:59 +10:00
Greg Wilkins
88f4e5ab86
444222 added explicit folded header test
2014-09-18 14:36:24 +10:00
Greg Wilkins
c8198d0531
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2014-09-18 07:03:40 +10:00
Simone Bordet
ef4e0a9e7c
Made the test more reliable.
2014-09-17 20:56:05 +02:00
Simone Bordet
3e602117b4
Improved send() implementation to be more clear, and covered also a
...
missing case where the callback may have not been notified.
2014-09-17 18:07:22 +02:00
Simone Bordet
193eaaf1c3
SelectChannelEndPoint should set the interestOps as requested.
...
Previously, SCEP was skipping the update of the interestOps in case it
was either input or output shutdown.
Now it always set the interestOps as requested and leaves to the
connection decide what interestOps needs to be set.
2014-09-17 17:44:49 +02:00
Greg Wilkins
89d8ffa940
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
aggregates/jetty-all/pom.xml
apache-jsp/pom.xml
apache-jstl/pom.xml
examples/async-rest/async-rest-jar/pom.xml
examples/async-rest/async-rest-webapp/pom.xml
examples/async-rest/pom.xml
examples/embedded/pom.xml
examples/pom.xml
jetty-alpn/jetty-alpn-client/pom.xml
jetty-alpn/jetty-alpn-server/pom.xml
jetty-alpn/pom.xml
jetty-annotations/pom.xml
jetty-ant/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-fcgi/fcgi-client/pom.xml
jetty-fcgi/fcgi-server/pom.xml
jetty-fcgi/pom.xml
jetty-http-spi/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaas/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/pom.xml
jetty-jspc-maven-plugin/pom.xml
jetty-maven-plugin/pom.xml
jetty-monitor/pom.xml
jetty-nosql/pom.xml
jetty-osgi/jetty-osgi-alpn/pom.xml
jetty-osgi/jetty-osgi-boot-jsp/pom.xml
jetty-osgi/jetty-osgi-boot-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-httpservice/pom.xml
jetty-osgi/jetty-osgi-npn/pom.xml
jetty-osgi/pom.xml
jetty-osgi/test-jetty-osgi-context/pom.xml
jetty-osgi/test-jetty-osgi-webapp/pom.xml
jetty-osgi/test-jetty-osgi/pom.xml
jetty-plus/pom.xml
jetty-proxy/pom.xml
jetty-quickstart/pom.xml
jetty-rewrite/pom.xml
jetty-runner/pom.xml
jetty-security/pom.xml
jetty-server/pom.xml
jetty-servlet/pom.xml
jetty-servlets/pom.xml
jetty-spdy/pom.xml
jetty-spdy/spdy-alpn-tests/pom.xml
jetty-spdy/spdy-client/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-spdy/spdy-example-webapp/pom.xml
jetty-spdy/spdy-http-client-transport/pom.xml
jetty-spdy/spdy-http-common/pom.xml
jetty-spdy/spdy-http-server/pom.xml
jetty-spdy/spdy-npn-tests/pom.xml
jetty-spdy/spdy-server/pom.xml
jetty-spring/pom.xml
jetty-start/pom.xml
jetty-util-ajax/pom.xml
jetty-util/pom.xml
jetty-webapp/pom.xml
jetty-websocket/javax-websocket-client-impl/pom.xml
jetty-websocket/javax-websocket-server-impl/pom.xml
jetty-websocket/pom.xml
jetty-websocket/websocket-api/pom.xml
jetty-websocket/websocket-client/pom.xml
jetty-websocket/websocket-common/pom.xml
jetty-websocket/websocket-server/pom.xml
jetty-websocket/websocket-servlet/pom.xml
jetty-xml/pom.xml
pom.xml
tests/pom.xml
tests/test-continuation/pom.xml
tests/test-integration/pom.xml
tests/test-loginservice/pom.xml
tests/test-quickstart/pom.xml
tests/test-sessions/pom.xml
tests/test-sessions/test-hash-sessions/pom.xml
tests/test-sessions/test-jdbc-sessions/pom.xml
tests/test-sessions/test-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-jaas-webapp/pom.xml
tests/test-webapps/test-jetty-webapp/pom.xml
tests/test-webapps/test-jndi-webapp/pom.xml
tests/test-webapps/test-mock-resources/pom.xml
tests/test-webapps/test-proxy-webapp/pom.xml
tests/test-webapps/test-servlet-spec/pom.xml
tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2014-09-17 21:15:17 +10:00
Greg Wilkins
1e3e3d9de0
do not throw when callback passed
2014-09-17 21:06:12 +10:00
Simone Bordet
48510bc71a
444214 - Socks4Proxy fails when reading less than 8 bytes.
2014-09-16 21:37:51 +02:00
Simone Bordet
f93c1cf593
444214 - Socks4Proxy fails when reading less than 8 bytes.
2014-09-16 21:20:45 +02:00
Simone Bordet
1878b344c7
Added SOCKS 4 tests.
2014-09-16 14:24:45 +02:00
Simone Bordet
f02194d405
Made methods return boolean to indicate whether the update was
...
successful or not.
2014-09-12 12:58:35 +02:00
Jan Bartel
b0a3d0a159
443893 Make a module for weld
2014-09-12 15:10:31 +10:00
Joakim Erdfelt
2481be42fe
Adding timeouts for problematic test case
2014-09-11 10:47:43 -07:00
Joakim Erdfelt
9249ebb6ef
Using 9.2.4-SNAPSHOT for branch
2014-09-11 06:10:44 -07:00
Joakim Erdfelt
1781add471
Minor edit to test new release branch
2014-09-11 06:01:09 -07:00
Joakim Erdfelt
2755746def
Merge branch 'jetty-http2'
2014-09-11 05:56:55 -07:00
Simone Bordet
15781da755
Fixed spinning loop that called onFillable() in case of closed
...
connection.
2014-09-11 00:33:47 +02:00
Simone Bordet
fd1c9dd8d2
443713 - Reduce number of SelectionKey.setInterestOps() calls.
...
Introduced a state machine to handle the various scenarios (ST = selector thread, Tx = pooled thread):
ST: call to SCEP.onSelected() moves from SELECTING -> PENDING.
ST: call to SCEP.updateKey() moves from PENDING -> UPDATING -> SELECTING
T1: call to SCEP.changeInterests() moves (SELECTING | PENDING) -> CHANGING -> SELECTING
The race between ST and T1 to move from PENDING to either UPDATING or CHANGING will be won
by one thread only, which will then perform the call to SelectionKey.setInterestOps().
Preferably, this will be done by ST during an updateKey() call. If updateKey() has already
been invoked, then changeInterests() will perform the call to SelectionKey.setInterestOps().
However, if T1 loses, it still has to perform the key update, so it will spin until ST
moves back to SELECTING.
2014-09-10 21:45:27 +02:00
Joakim Erdfelt
3e4c9909e0
443652 - Remove dependency on java.lang.management classes
...
* Created safer Uptime singleton for use
* Removed direct references to java.lang.management from
- Server.java
- Log.java
- AbstractLifeCycle.java
2014-09-10 10:30:26 -07:00
Simone Bordet
1ee11138a7
Introduced field "submitKeyUpdates" instead of relying on a system
...
property.
Modified method updateKey() to return a boolean to signal whether the
selector was woken up.
2014-09-10 11:11:12 +02:00
Simone Bordet
d45a5c861c
Introduced factory method to create the SelectorManager instance.
2014-09-10 11:11:12 +02:00
Simone Bordet
87cac64dff
Fixed typo, improved logging, removed unused type parameter.
2014-09-10 11:11:12 +02:00
Greg Wilkins
40d84ff1e3
443662 Consume buffer in write(ByteBuffer)
2014-09-10 17:41:14 +10:00
Jan Bartel
09e22c042c
443661 Rename manifest and service constants for jetty osgi resource fragment code
2014-09-10 16:28:29 +10:00
Greg Wilkins
5011993ddf
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
VERSION.txt
aggregates/jetty-all/pom.xml
apache-jsp/pom.xml
apache-jstl/pom.xml
examples/async-rest/async-rest-jar/pom.xml
examples/async-rest/async-rest-webapp/pom.xml
examples/async-rest/pom.xml
examples/embedded/pom.xml
examples/pom.xml
jetty-alpn/jetty-alpn-client/pom.xml
jetty-alpn/jetty-alpn-server/pom.xml
jetty-alpn/pom.xml
jetty-annotations/pom.xml
jetty-ant/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-fcgi/fcgi-client/pom.xml
jetty-fcgi/fcgi-server/pom.xml
jetty-fcgi/pom.xml
jetty-http-spi/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaas/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/pom.xml
jetty-jspc-maven-plugin/pom.xml
jetty-maven-plugin/pom.xml
jetty-monitor/pom.xml
jetty-nosql/pom.xml
jetty-osgi/jetty-osgi-alpn/pom.xml
jetty-osgi/jetty-osgi-boot-jsp/pom.xml
jetty-osgi/jetty-osgi-boot-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-httpservice/pom.xml
jetty-osgi/jetty-osgi-npn/pom.xml
jetty-osgi/pom.xml
jetty-osgi/test-jetty-osgi-context/pom.xml
jetty-osgi/test-jetty-osgi-webapp/pom.xml
jetty-osgi/test-jetty-osgi/pom.xml
jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJsp.java
jetty-plus/pom.xml
jetty-proxy/pom.xml
jetty-quickstart/pom.xml
jetty-rewrite/pom.xml
jetty-runner/pom.xml
jetty-security/pom.xml
jetty-server/pom.xml
jetty-servlet/pom.xml
jetty-servlets/pom.xml
jetty-spdy/pom.xml
jetty-spdy/spdy-alpn-tests/pom.xml
jetty-spdy/spdy-client/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-spdy/spdy-example-webapp/pom.xml
jetty-spdy/spdy-http-client-transport/pom.xml
jetty-spdy/spdy-http-common/pom.xml
jetty-spdy/spdy-http-server/pom.xml
jetty-spdy/spdy-npn-tests/pom.xml
jetty-spdy/spdy-server/pom.xml
jetty-spring/pom.xml
jetty-start/pom.xml
jetty-util-ajax/pom.xml
jetty-util/pom.xml
jetty-webapp/pom.xml
jetty-websocket/javax-websocket-client-impl/pom.xml
jetty-websocket/javax-websocket-server-impl/pom.xml
jetty-websocket/pom.xml
jetty-websocket/websocket-api/pom.xml
jetty-websocket/websocket-client/pom.xml
jetty-websocket/websocket-common/pom.xml
jetty-websocket/websocket-server/pom.xml
jetty-websocket/websocket-servlet/pom.xml
jetty-xml/pom.xml
pom.xml
tests/pom.xml
tests/test-continuation/pom.xml
tests/test-integration/pom.xml
tests/test-loginservice/pom.xml
tests/test-quickstart/pom.xml
tests/test-sessions/pom.xml
tests/test-sessions/test-hash-sessions/pom.xml
tests/test-sessions/test-jdbc-sessions/pom.xml
tests/test-sessions/test-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-jaas-webapp/pom.xml
tests/test-webapps/test-jetty-webapp/pom.xml
tests/test-webapps/test-jndi-webapp/pom.xml
tests/test-webapps/test-mock-resources/pom.xml
tests/test-webapps/test-proxy-webapp/pom.xml
tests/test-webapps/test-servlet-spec/pom.xml
tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2014-09-10 14:38:18 +10:00
Greg Wilkins
c80f556139
Update Password.java
...
Fixed typo.
Trivial fix from github/pull/21
2014-09-10 10:06:00 +10:00
Jesse McConnell
7dfd9115a4
Merge branch 'release-9'
2014-09-09 10:27:21 -05:00
