Commit Graph

2593 Commits

Author SHA1 Message Date
Jan Bartel 7375ba2cc3 Alpha impl for infinispan session manager.
Conflicts:
	tests/test-sessions/pom.xml

Conflicts:
	tests/test-sessions/pom.xml
	tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionExpiryTest.java
2015-04-02 12:20:12 +11:00
Greg Wilkins e093041040 enabled delayed dispatch by default 2015-03-26 12:42:09 +11:00
Greg Wilkins 1cb0449be3 Organised imports 2015-03-26 12:32:15 +11:00
Greg Wilkins 5d14d0ca7a removed extra HttpInput synchronization 2015-03-26 12:18:06 +11:00
Jesse McConnell da4f95f3d3 [maven-release-plugin] prepare for next development iteration 2015-03-25 09:08:27 -05:00
Jesse McConnell e92fd438fd [maven-release-plugin] prepare release jetty-9.2.11.M0 2015-03-25 09:08:21 -05:00
Greg Wilkins 1d99c0af7b Merge remote-tracking branch 'origin/jetty-9.2.x' 2015-03-25 14:00:23 +11:00
Greg Wilkins 8c652fd5bd 462546 - ShutdownMonitor should bind to jetty.host
Added STOP.HOST system property.  jetty.host is specific to a connector and a server may listen to many hosts
2015-03-25 13:58:19 +11:00
Greg Wilkins ad4854dafe Merge remote-tracking branch 'origin/jetty-9.2.x' 2015-03-19 15:13:15 +11:00
Greg Wilkins 7acbb05060 fixed test that failed on second boundary 2015-03-19 15:12:43 +11:00
Greg Wilkins c082848f93 462193 - Asynchronous HttpOutput.close()
Dispatch to handle on return from onWritePossible()
2015-03-18 10:28:14 +11:00
Simone Bordet 4f0c63734c 462162 - StackOverflowException when response commit fails.
Fixed HttpChannel to avoid to stack overflow in case of unusual
exceptions thrown while committing.
Now it directly calls the transport to try to send a 500.
2015-03-15 12:10:27 +01:00
Greg Wilkins 3f795da26c 459845 - Support upgrade from http1 to http2
Generalised Upgrade Connection Factories
2015-03-13 13:59:29 +11:00
Greg Wilkins 0dd58d2efe 459845 - Support upgrade from http1 to http2
Moved the sneaky direct upgrade to its own method and added support to detect a standard upgrade.
The standard upgrade now creates the h2c connection and decodes the settings header, but it does not yet process the
settings nor send a response to the request.
2015-03-12 16:52:17 +11:00
Greg Wilkins 5456de2160 debug improvements from nghttp2 testing 2015-03-11 14:23:39 +11:00
Greg Wilkins 0592ecf3e9 cleaned up PushBuilder API 2015-03-11 12:06:51 +11:00
Jesse McConnell e3fd0056cf [maven-release-plugin] prepare for next development iteration 2015-03-10 08:00:22 -05:00
Jesse McConnell 9d648f4000 [maven-release-plugin] prepare release jetty-9.2.10.v20150310 2015-03-10 08:00:14 -05:00
Joakim Erdfelt 130afb9535 Merge branch 'jetty-9.2.x'
Conflicts:
	jetty-client/src/main/java/org/eclipse/jetty/client/LeakTrackingConnectionPool.java
	jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientLoadTest.java
	jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientUploadDuringServerShutdown.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java
	jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/SynDataReplyDataLoadTest.java
	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/TooFastClientTest.java
2015-03-06 15:57:52 -07:00
Joakim Erdfelt dd88d393e4 456521 - ShutdownHandler should shut down more gracefully
Also-by: Johannes Brodwall <johannes@brodwall.com>
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2015-03-06 15:47:51 -07:00
Greg Wilkins 9edd7c4b30 461070 Handle setReadListener on request with no content 2015-03-07 08:44:51 +11:00
Joakim Erdfelt 74ee154bb1 Cleaning up LeakTrackingByteBufferPool / LeakDetector
+ Making use of LeakTrackingByteBufferPool more consistent
+ Using MappedByteBufferPool.Tagged where appropriate in test cases
+ Adding leak count tracking to LeakDetector
+ Adding leak count tracking to LeakTrackingByteBufferPool
+ Renaming websocket LeakTrackingBufferPool to
  LeakTrackingBufferPoolRule to reflect junit @Rule usage
+ Making websocket LeakTrackingBufferPoolRule always use
  MappedByteBufferPool.Tagged
+ Fixed various grammar concerns
2015-03-06 14:27:58 -07:00
Greg Wilkins 9b5205ba40 Merge remote-tracking branch 'origin/jetty-9.2.x'
Conflicts:
	jetty-util/src/main/java/org/eclipse/jetty/util/BufferUtil.java
2015-03-06 12:45:55 +11:00
Greg Wilkins 44bb8cefa5 461133 - allow stop port to reuse address 2015-03-06 12:23:58 +11:00
Greg Wilkins 48b6bec64c Merge remote-tracking branch 'origin/jetty-9.2.x'
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
2015-03-05 20:17:20 +11:00
Greg Wilkins f4ad0dce98 461350 Update HttpParser IllegalCharacter handling to RFC7230 2015-03-05 19:54:25 +11:00
Greg Wilkins 9b307bc0ed added leak detecting bufferpool to ssl tests 2015-03-05 16:55:10 +11:00
Greg Wilkins 165ae8f238 Improved LocalConnector 2015-02-26 20:13:45 +11:00
Greg Wilkins af70c4bd48 protect event schedule race 2015-02-26 15:37:51 +11:00
Greg Wilkins 752973931e Improved request buffer recycling
Added a reference count that is incremented for each content reference passed and decremented as each content is consumed.
The request buffer is only filled or recycled if the reference count is 0
2015-02-26 13:04:50 +11:00
Greg Wilkins a24f702537 Avoid dispatch in HttpOutput 2015-02-25 19:33:43 +11:00
Greg Wilkins f44bf8e368 460210 - ExecutionStragegy producer for SelectManager calls onOpen from produce method
Further refactoring.   Handle the initial onDataAvailable and final onAllDataRead calls
specially, as they may need to be called without scheduling read interest.
2015-02-25 10:47:09 +11:00
Jesse McConnell 1659d83978 [maven-release-plugin] prepare for next development iteration 2015-02-24 10:38:33 -06:00
Jesse McConnell dc0c3f4c52 [maven-release-plugin] prepare release jetty-9.2.9.v20150224 2015-02-24 10:38:28 -06:00
Greg Wilkins 5d6bb9f5d0 460210 - ExecutionStragegy producer for SelectManager calls onOpen from produce method
Additional refactoring to better handle HttpInput state.   Moved the unready and read possible states into the HttpChannelState
2015-02-23 23:06:23 +11:00
Simone Bordet f61cfb7016 Fixed construction of MetaData.Request and handling of HttpFields by MetaData. 2015-02-20 16:36:11 +01:00
Greg Wilkins b60ea47ef4 Revert "Revert "Fixed AsyncIO double dispatch""
This reverts commit 8bd94ec6be.
This is a revert of the revert to add back in the useful debug, plus some TODO comments describing the problems
2015-02-20 00:18:29 +11:00
Greg Wilkins 8bd94ec6be Revert "Fixed AsyncIO double dispatch"
This reverts commit 968063c1ab.
2015-02-20 00:03:40 +11:00
Greg Wilkins 968063c1ab Fixed AsyncIO double dispatch 2015-02-19 18:13:31 +11:00
Greg Wilkins e18573f4a3 460211 Fixed Idle race in ExecuteProduceRun
Reimplemented ExecuteProduceRun with a spin lock
2015-02-18 21:47:22 +11:00
Jesse McConnell ce5db2ca55 [maven-release-plugin] prepare for next development iteration 2015-02-17 16:02:22 -06:00
Jesse McConnell 26b7597928 [maven-release-plugin] prepare release jetty-9.2.8.v20150217 2015-02-17 16:02:16 -06:00
Greg Wilkins c090f179a7 459845 - Support upgrade from http1 to http2/websocket
Added jetty-http2c.xml and http2c.mod
2015-02-13 15:06:24 +11:00
Greg Wilkins c3332e7d2e 459845 - Support upgrade from http1 to http2/websocket
Added support for unofficial "upgrade" from http/1 to h2c
2015-02-13 12:16:03 +11:00
Greg Wilkins 0f7ee8d607 Merge remote-tracking branch 'origin/jetty-9.2.x'
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpVersion.java
	jetty-io/src/main/java/org/eclipse/jetty/io/EndPoint.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
2015-02-13 11:45:56 +11:00
Greg Wilkins 2b2a70a93a 459845 Support upgrade
Added the concept of UpgradeFrom and UpgradeTo connections that support
transferring a buffer with content before opening new connection.
Aded EndPoint.update method as utility
2015-02-13 11:41:18 +11:00
Simone Bordet 8ca0a86352 459655 - Remove SPDY and NPN.
Cleanup of javadocs, comments, XML and other text files.
2015-02-11 16:21:53 +01:00
Simone Bordet be860741d5 459655 - Remove SPDY and NPN.
Cleanup of javadocs, comments, XML and other text files.
2015-02-11 16:18:07 +01:00
Simone Bordet 99da9ce98e Merged branch 'jetty-9.2.x' into 'master'. 2015-02-06 21:45:22 +01:00
Greg Wilkins b1953a6859 added private key for debugging 2015-02-06 15:51:01 +11:00
Greg Wilkins 14cd10b676 experimenting with push API 2015-02-06 13:48:34 +11:00
Greg Wilkins ab8b7f8c8d PushBuilder uses full URI 2015-02-06 10:44:19 +11:00
Greg Wilkins 504ff73d03 default to delayed dispatch 2015-02-05 14:39:49 +11:00
Greg Wilkins d08fced010 handle slow arriving input 2015-02-05 14:27:05 +11:00
Greg Wilkins 7db7ef3020 Added test cases and improved isReady and isFinished handling 2015-02-05 14:26:34 +11:00
Greg Wilkins f6cfe07a69 added direct buffer configuration 2015-02-05 10:02:01 +11:00
Greg Wilkins 47055dd2c8 added test for async IO isNotReadyAtEOF 2015-02-04 12:40:36 +11:00
Joakim Erdfelt 03121edc92 Merge branch 'jetty-9.2.x' 2015-01-22 11:51:36 -07:00
Greg Wilkins 94f0f29540 458101 added test for maxFormContentSize 2015-01-22 12:41:13 +01:00
Joakim Erdfelt 48e5157731 Merge branch 'jetty-9.2.x'
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-cdi/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-mongodb-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
2015-01-21 11:00:54 -07:00
Jesse McConnell aa22842c20 [maven-release-plugin] prepare for next development iteration 2015-01-16 17:48:29 -06:00
Jesse McConnell 8c58a9abc4 [maven-release-plugin] prepare release jetty-9.2.7.v20150116 2015-01-16 17:48:23 -06:00
Joakim Erdfelt 3f08e54a23 457696 - JMX implementation should not be overridden by WebApp classes
+ Marking org.eclipse.jetty.util.annotation. for hole punching
+ Making ContextHandler parsing of "org.eclipse.jetty.server.context.ManagedAttributes"
  more lenient to whitespace around delimitors
+ Making ObjectMBean take in account the .jmx.{name}MBean for
  annotation influences too.
2015-01-16 15:18:01 -07:00
Jesse McConnell 81bb8411d1 [maven-release-plugin] prepare for next development iteration 2015-01-16 12:06:36 -06:00
Jesse McConnell 7865f88b81 [maven-release-plugin] prepare release jetty-9.2.7.v20150116 2015-01-16 12:06:30 -06:00
Jesse McConnell db991355a2 [maven-release-plugin] prepare for next development iteration 2015-01-16 10:41:45 -06:00
Jesse McConnell 6930abb8d3 [maven-release-plugin] prepare release jetty-9.2.7.v20140116 2015-01-16 10:41:39 -06:00
Jesse McConnell 9225b124a4 [maven-release-plugin] prepare for next development iteration 2015-01-16 08:21:35 -06:00
Jesse McConnell ebd563e64d [maven-release-plugin] prepare release 9.2.7.v20140116 2015-01-16 08:21:29 -06:00
Greg Wilkins 55bcd32448 fixed merge 2015-01-08 17:43:55 +01:00
Greg Wilkins e1cc5fb487 Merge remote-tracking branch 'origin/master' into jetty-9.3-ewyk
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
	jetty-server/src/main/java/org/eclipse/jetty/server/QueuedHttpInput.java
	jetty-util/src/main/java/org/eclipse/jetty/util/thread/NonBlockingThread.java
2015-01-08 15:21:01 +01:00
Greg Wilkins c23f21c761 456956 Reduce ThreadLocal.remove() weak reference garbage
removed getCurrentChannel thread local
2015-01-08 15:03:05 +01:00
Joakim Erdfelt a3201a3c81 Happy New Year 2015 2015-01-07 17:06:59 -07:00
Joakim Erdfelt 6a0668b7a1 Happy New Year 2015 2015-01-07 17:03:30 -07:00
Greg Wilkins 629035ba7a Merge remote-tracking branch 'origin/jetty-9.2.x'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
2015-01-07 23:42:10 +01:00
Greg Wilkins 2b530939a7 456956 Reduce ThreadLocal.remove() weak reference garbage
reduced calls to getCurrentConnection
2015-01-07 20:56:06 +01:00
Greg Wilkins 3270af81e8 456956 Reduce ThreadLocal.remove() weak reference garbage 2015-01-07 19:53:30 +01:00
Greg Wilkins 3d66b1d207 ensure onAllDataRead always called 2015-01-02 19:17:26 +01:00
Simone Bordet caa579ab4b Fixed buffer leaking in case the buffer is empty due to having read
zero from the network.
2015-01-02 18:19:04 +01:00
Greg Wilkins 3af9b145a3 Deprecated the AbstractConnection dispatchIO mechanism 2015-01-01 16:18:13 +01:00
Greg Wilkins 20fc880c3e Merge branch 'master' into jetty-9.3-ewyk 2014-12-31 16:29:40 +01:00
Greg Wilkins 200b3a3e64 fixed merge 2014-12-31 16:28:35 +01:00
Greg Wilkins 2e3c223917 Merge remote-tracking branch 'origin/jetty-9.2.x' 2014-12-31 16:16:57 +01:00
Greg Wilkins a89a6927e8 yet another refactor of HttpInput.... must read -1 before isFinished is true 2014-12-24 19:34:06 +01:00
Jan Bartel fc2b6f0f74 455655 ensure multipart form-data parsing exception thrown to servlet 2014-12-24 18:25:27 +01:00
Greg Wilkins 26de8931a3 less verbose errors 2014-12-24 12:42:07 +01:00
Greg Wilkins 3e8969be6f different callbacks for HTTP blocking and async reads 2014-12-24 10:31:33 +01:00
Greg Wilkins fecc03a2f5 fixed some more tests after EWYK refactor 2014-12-23 22:20:49 +01:00
Greg Wilkins 3f59bc4c14 refactored HttpConnector for EWYK - work in progress 2014-12-23 17:15:27 +01:00
Simone Bordet 9cff4a57e7 Merged branch 'master' into 'jetty-9.3-ewyk'. 2014-12-22 21:34:10 +01:00
Simone Bordet e8c88cfd9c Merged branch 'jetty-9.2.x' into 'master'. 2014-12-22 21:32:09 +01:00
Simone Bordet fc42d5d4aa Configuring output aggregation size when configuring output buffer size. 2014-12-22 21:29:02 +01:00
Greg Wilkins 2a584613ee work in progress on EWYK HTTP 2014-12-21 20:56:36 +01:00
Greg Wilkins e363dd41c2 HttpConnection refactoring work in progress 2014-12-21 15:23:36 +01:00
Greg Wilkins 24ffe377ce improved HttpInputTest 2014-12-21 12:42:27 +01:00
Greg Wilkins ebaf84b97e Refactored HttpInput to use poison pills 2014-12-21 10:43:37 +01:00
Greg Wilkins b0b038f5b0 fillInterest never recurses 2014-12-19 23:03:01 +01:00
Simone Bordet 3d5c785dd3 Temporarily commented out non-compiling code. 2014-12-18 17:14:34 +01:00
Greg Wilkins 3b34423b17 EWYK SelectorManager 2014-12-18 17:06:32 +01:00
Greg Wilkins 97af3632a1 SelectManager executes endpoint tasks 2014-12-17 17:03:15 +01:00