Commit Graph

2703 Commits

Author SHA1 Message Date
Joakim Erdfelt 09b5f680b7 464727 - Update Javadoc for Java 8 DocLint
Eliminate empty tag warnings
+ Changed <p/> to <p>
+ Changed <br/> to <br>
2015-04-15 14:38:35 -07:00
Simone Bordet 7a75faa770 Fixed default value for requestlog directory. 2015-04-15 18:06:15 +02:00
Simone Bordet f4a6b4b5eb 460671 - Rationalize property names.
Made requestlog use a similar configuration to logging and debugmod modules.
2015-04-14 22:11:59 +02:00
Simone Bordet 599ab9bb1b 460671 - Rationalize property names.
Property format is now "jetty.<module|component>.<propertyName>".

Updated all references with new properties.
2015-04-13 16:21:48 +02:00
Joakim Erdfelt dc2221a152 Build under Java 1.8
+ Enforcer setup to JDK 1.8+
+ Java7 profiles removed (for now)
+ Main compile phase source/test is 1.7
+ Test compile phase source/test is 1.8
2015-04-10 13:21:12 -07:00
Joakim Erdfelt 645ee9223c Temp revert to make CI happy (but everything else sad) 2015-04-10 06:47:28 -07:00
Joakim Erdfelt d89aa3a866 Fixing compiler source for modules that now require Java 8 2015-04-09 13:32:30 -07:00
Joakim Erdfelt 60d790cbf8 Marking java8 specifics excluded when compiling with java7 2015-04-08 15:10:53 -07:00
Greg Wilkins 0a943a928c Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2015-04-02 19:13:00 +11:00
Greg Wilkins 5ed2f84d06 430951 Support SNI with ExtendedSslContextFactory 2015-04-02 19:12:44 +11:00
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
Greg Wilkins cdd2b0a9d2 refacted SelectorManager to have a ManagedSelector 2014-12-17 16:29:24 +01:00
Joakim Erdfelt 40ae4767d1 Some extra safety checks 2014-12-16 15:52:33 -07:00
Greg Wilkins 113d1ff7bb fixed merge 2014-12-11 14:01:32 +01:00
Greg Wilkins d161bdcb36 Merge remote-tracking branch 'origin/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
2014-12-11 13:50:21 +01:00
Greg Wilkins dfe9dc3115 Further experimentation with PushBuilder 2014-12-09 12:27:39 +01:00
Greg Wilkins 06b1efc182 Added alternate push API and example 2014-12-05 17:47:25 +01:00
Jan Bartel bc22ba72dc [maven-release-plugin] prepare for next development iteration 2014-12-05 16:45:12 +01:00
Jan Bartel 1cc075cf98 [maven-release-plugin] prepare release jetty-9.2.6.v20141205 2014-12-05 16:45:01 +01:00
Simone Bordet d3763e0d1c 454157 - HttpInput.consumeAll spins if input is in async mode.
Added additional check to test whether consumeAll() could actually
consume the content, and if not, abort the channel.
2014-12-05 14:12:01 +01:00
Greg Wilkins 7b41e78f74 Improved HttpChannelOverHTTP2 recycling 2014-12-05 08:36:51 +01:00
Greg Wilkins 0f4a4cdac6 Merge remote-tracking branch 'origin/jetty-9.2.x'
Conflicts:
	jetty-io/src/main/java/org/eclipse/jetty/io/FillInterest.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
2014-12-05 08:11:54 +01:00
Greg Wilkins 07e87f0ecf 454157 abort to avoid spin in async HttpInput.consumeAll 2014-12-04 17:39:53 +01:00
Greg Wilkins 2536c1cc3f Handle HTTP2-16 black listed ciphers 2014-12-04 14:17:25 +01:00
Jesse McConnell 127b48c932 [maven-release-plugin] prepare for next development iteration 2014-12-03 09:00:57 -06:00
Jesse McConnell 028f4b9610 [maven-release-plugin] prepare release jetty-9.2.6.v20141203 2014-12-03 09:00:46 -06:00
Jesse McConnell 1263d1f3c8 [maven-release-plugin] prepare for next development iteration 2014-12-03 08:26:47 -06:00
Jesse McConnell 5c7f706496 [maven-release-plugin] prepare release jetty-9.2.6.v20141203 2014-12-03 08:26:35 -06:00
Greg Wilkins a181b09d4c 439374 Use utf-8 as default charset for html 2014-11-27 17:41:19 +11:00
Greg Wilkins 1159111c52 Merge remote-tracking branch 'origin/jetty-9.2.x'
Conflicts:
	jetty-io/src/main/java/org/eclipse/jetty/io/SelectChannelEndPoint.java
	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
2014-11-27 13:34:45 +11:00
Greg Wilkins bd0cd80b58 Merge branch 'jetty-9.2.x' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9.2.x 2014-11-26 15:35:55 +11:00
Greg Wilkins 44ab3ba134 better debug 2014-11-26 15:35:42 +11:00
Joakim Erdfelt ed594425d3 Merge branch 'jetty-9.2.x'
Conflicts:
	jetty-server/src/main/config/etc/jetty.xml
	jetty-server/src/main/config/modules/server.mod
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpConfiguration.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2014-11-25 12:09:21 -07:00
Joakim Erdfelt 07647e8a5f 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-11-25 08:25:35 -07:00
Greg Wilkins 8e9e29f887 452188 Delay dispatch until content optimisation
Make delay the default
2014-11-21 10:02:24 +11:00
Greg Wilkins 121a8b6ee8 improved debugging 2014-11-21 10:00:18 +11:00
Simone Bordet f7df8f9244 452516 - Make HttpOutput aggregation size configurable.
Introduced new property "outputAggregationSize" in HttpConfiguration,
and correspondent property in XML file.
2014-11-20 17:06:10 +01:00
Simone Bordet 8330fa73e0 452188 Delay dispatch until content optimisation.
Renamed property "delayDispatchUntilContent".
2014-11-20 17:06:10 +01:00
Simone Bordet 57f90ae7d1 452465 - 100% CPU spin on page reload.
Fixed by adding a MetaData.recycle() method that properly recycles
the MetaData.Request object so that HttpChannelOverHttp.earlyEOF()
properly closes the connection when it's idle.
2014-11-20 13:00:02 +01:00
Greg Wilkins ab2e9c357f Merge remote-tracking branch 'origin/jetty-9.2.x'
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java
2014-11-20 16:34:30 +11:00
Greg Wilkins 1915e592b5 452424 Do not add Date header if already set 2014-11-20 15:33:22 +11:00
Greg Wilkins 46a5ef861d 447472 Clear async context timeout on async static content 2014-11-20 11:41:11 +11:00
Greg Wilkins aeccef2154 Merge remote-tracking branch 'origin/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-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
	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
2014-11-19 13:37:48 +11:00
Greg Wilkins c334e81416 452188 Delay dispatch until content optimisation
Added module and xml support
2014-11-19 11:26:07 +11:00
Greg Wilkins 04f74f73a5 452188 Delay dispatch until content optimisation 2014-11-19 11:11:48 +11:00
Greg Wilkins ce4af5a8b9 Implemented the PROXY protocol
Added XML templates
2014-11-14 12:04:57 +11:00
Greg Wilkins 5b60e0c98d support h2-15 and h2-14 2014-11-14 10:53:37 +11:00
Greg Wilkins a308c087ed Implemented the PROXY protocol
Moved the PROXY protocol support from HttpParser to a ConnectionFactory.
See http://www.haproxy.org/download/1.5/doc/proxy-protocol.txt
2014-11-13 19:55:01 +11:00
Jesse McConnell 09846e324d [maven-release-plugin] prepare for next development iteration 2014-11-12 17:13:19 -06:00
Jesse McConnell 97d2bd95a6 [maven-release-plugin] prepare release jetty-9.2.5.v20141112 2014-11-12 17:13:14 -06:00
Greg Wilkins dfe799d04c Merge remote-tracking branch 'origin/jetty-9.2.x'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHttpOutputInterceptor.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/AsyncGzipFilter.java
	jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipContentLengthTest.java

Added Interceptor chain so that double gzip interception can be prevented.
2014-11-12 12:36:56 +11:00
Simone Bordet 8c65df4ee6 Merged branch 'jetty-9.2.x' into 'master'. 2014-11-07 12:01:04 +01:00
Simone Bordet 9320e9e24a 450484 - Missing parameterization of etc/jetty-http[s].xml. 2014-11-07 11:56:58 +01:00
Greg Wilkins 47a92e9608 minor cleanups of HttpContent 2014-11-06 16:46:47 +11:00
Joakim Erdfelt f2cbde13e2 Attempting to understand windows timeout hang 2014-11-05 14:39:12 -07:00
Joakim Erdfelt 67de171871 Adding test tracking to figure out where the test hang is coming from 2014-11-05 12:01:19 -07:00
Joakim Erdfelt f645b4a399 Merge branch 'jetty-9.2.x' 2014-11-05 11:12:05 -07:00
Joakim Erdfelt 04e7be7383 Adding overall test timeout 2014-11-05 11:11:57 -07:00
Greg Wilkins 4cb8e7f644 449811 handle unquoted etags when gzipping 2014-11-05 11:12:17 +11:00
Jesse McConnell 5d0595cabd [maven-release-plugin] prepare for next development iteration 2014-11-03 13:46:58 -06:00
Jesse McConnell 772ff0bfd4 [maven-release-plugin] prepare release jetty-9.2.4.v20141103 2014-11-03 13:46:52 -06:00
Jesse McConnell 1c4a08b35b [maven-release-plugin] prepare for next development iteration 2014-10-31 09:58:16 -05:00
Jesse McConnell a4ff7bf841 [maven-release-plugin] prepare release jetty-9.2.4.v20141031 2014-10-31 09:58:10 -05:00
Greg Wilkins e3bda4efbe 446564 Refactored RequestLog Mechanism
RequestLog can now be set on the HttpChannel and is called during the onCommitted callback.
The RequestLog may be set either on the server or via an updated RequestLogHandler that can
be applied to a specific context.
2014-10-31 13:31:29 +11:00
Jesse McConnell e1b73a64eb [maven-release-plugin] prepare for next development iteration 2014-10-30 11:28:41 -05:00
Jesse McConnell 5770cc1179 [maven-release-plugin] prepare release jetty-9.2.4.v20141030 2014-10-30 11:28:35 -05:00
Greg Wilkins 171f7b5352 improved protocol info log 2014-10-30 17:48:24 +11:00
Greg Wilkins 71d1c434e4 Merge remote-tracking branch 'origin/jetty-9.2.x' 2014-10-30 16:58:55 +11:00
Greg Wilkins 2332b4f734 449175 Removed extra space in NCSA log 2014-10-30 16:42:31 +11:00
Greg Wilkins 4b0193247b 448841 Clarified selectors==0 javadoc
448840 Clarified ServerConnector javadoc
448839 Fixed javadoc typo in ServerConnector
2014-10-30 15:50:54 +11:00
Greg Wilkins a6e00bc642 Merge remote-tracking branch 'origin/jetty-9.2.x'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java
	jetty-util/src/test/java/org/eclipse/jetty/util/resource/AbstractFSResourceTest.java
2014-10-30 14:36:50 +11:00
Greg Wilkins 414479795e 443550 improved FileResource encoded alias checking
removed extra debug
2014-10-30 14:29:00 +11:00
Greg Wilkins 8eab088a35 443550 improved FileResource encoded alias checking 2014-10-30 14:12:43 +11:00
Greg Wilkins 9189c934d9 444722 Fixed order of setReuseAddress call 2014-10-30 11:28:45 +11:00
Joakim Erdfelt 8899f6d360 Merge branch 'jetty-9.2.x'
Conflicts:
	VERSION.txt
2014-10-29 15:52:05 -07:00
Joakim Erdfelt b132b90b03 Simplifying warning message 2014-10-29 15:49:23 -07:00
Joakim Erdfelt 733cc71791 Reworking jetty.home warning to be a module instead.
+ This will cause it to be logged using the configured logger as well.
2014-10-29 15:31:14 -07:00
Joakim Erdfelt 8a72a153a1 Merge branch 'jetty-9.2.x' 2014-10-28 12:32:55 -07:00
Jesse McConnell 58eb6740ec [maven-release-plugin] prepare for next development iteration 2014-10-28 14:20:30 -05:00
Jesse McConnell 19a44846cf [maven-release-plugin] prepare release jetty-9.2.4.v20141028 2014-10-28 14:20:24 -05:00
Joakim Erdfelt 607a560ebd Merge branch 'jetty-9.2.x' into cdi-testing 2014-10-28 09:36:34 -07:00
Simone Bordet 8d2acb6817 Merged branch 'jetty-9.2.x' into 'master'. 2014-10-28 11:55:44 +01:00
Simone Bordet 7cdcd69f44 Reverted version to 9.2.4-SNAPSHOT. 2014-10-28 11:52:00 +01:00
Jesse McConnell 3b745f06df [maven-release-plugin] prepare for next development iteration 2014-10-27 16:16:24 -05:00
Jesse McConnell 4f0d78c91b [maven-release-plugin] prepare release jetty-9.2.4.v20141027 2014-10-27 16:16:18 -05:00
Jesse McConnell d17613982b [448761] ContextHandler returns incorrect servlet minor version 2014-10-27 15:43:30 -05:00
Joakim Erdfelt 6ff43a0af1 Merge branch 'jetty-9.2.x' into cdi-testing 2014-10-27 13:42:30 -07:00
Greg Wilkins e19178fd82 fixed bad merge 2014-10-26 20:34:19 +11:00
Greg Wilkins fbc131b46e Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
2014-10-26 17:40:16 +11:00
Greg Wilkins 34a8da2ba2 445823 Moved RequestLog calling to HttpChannel
Simplified the RequestLogHandler.  It no longer set's async listeners or tries to catch exeptions etc.
Instead it simply sets the RequestLog instance on the HttpChannel.   The HttpChannel#onCompleted method
then uses the log (if set) as the last thing before recycling the connection.  It uses the actual
bytes written (eg after compression) and the actual status sent (eg if sent from a bad message).
2014-10-26 17:30:50 +11:00
Simone Bordet d13cdf2592 Merged branch 'jetty-9.2.x' into 'master'. 2014-10-24 14:06:54 +02:00
Simone Bordet c66963126f 446563 - Null HttpChannel.getCurrentHttpChannel() in ServletHandler.doFilter().
Moved the finally block that resets the current HttpChannel and the
thread name after the handling of the COMPLETE action.
This is necessary because AsyncListener.onComplete() (triggered by
the handling of the COMPLETE action) may perform a
RequestDispatcher.forward() that requires the current HttpChannel
thread local to be set.
2014-10-24 14:03:06 +02:00
Greg Wilkins 4323e450c5 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2014-10-24 15:52:28 +11:00
Greg Wilkins 31e448ffd6 Removed duplication of HttpGenerator$Info vs http.MetaData
Use MetaData throughout code base
2014-10-24 15:51:20 +11:00
Jesse McConnell 2da2897c37 add logs/ directory as require directory for base 2014-10-23 20:20:42 -05:00
Greg Wilkins 98a07789ce 447515 Remove GzipFilter
Improved javadoc and comments
2014-10-24 11:05:19 +11:00
Greg Wilkins 67e686c108 447515 Remove GzipFilter
Added a module to apply GzipHandler to the entire server
2014-10-24 10:48:33 +11:00
Greg Wilkins ac1b111d57 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2014-10-24 08:46:12 +11:00
Greg Wilkins 738c47bc55 447515 Remove GzipFilter
Moved all usages of GzipFilter to GzipHandler
added support to ServerContextHandler to create a GzipHandler
2014-10-24 08:17:05 +11:00
Jan Bartel 01a1fc166e Merge remote-tracking branch 'origin/jetty-9.2.x' 2014-10-23 11:20:44 +11:00
Greg Wilkins 627ba945f1 Added AsyncDelayHandler example 2014-10-23 09:11:27 +11:00