Commit Graph

2657 Commits

Author SHA1 Message Date
Simone Bordet 6cabf8452e 468347 - Fix modules/debuglog.mod. 2015-05-26 18:22:22 +02:00
Greg Wilkins b2e8d2cd04 minor optimisations 2015-05-22 22:53:01 +10:00
Greg Wilkins 4028df12ca Merge remote-tracking branch 'origin/jetty-9.2.x'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHttpOutputInterceptor.java
2015-05-22 10:50:33 +10:00
Greg Wilkins 68412d1958 Merge remote-tracking branch 'origin/jetty-9.2.x' 2015-05-22 10:01:04 +10:00
Greg Wilkins 5bde7f34ea 467936 -w Check HttpOutput aggregateSize is < bufferSize 2015-05-22 09:56:51 +10:00
Greg Wilkins ff15aa4a5c Added optional http2 to https for ALPN ordering 2015-05-21 00:38:07 +10:00
Greg Wilkins 3f0fd550dc 467702 - SslContextFactory not backward compatible 2015-05-20 22:20:33 +10:00
Simone Bordet b844bdde0b Removed leftover configuration that was forgotten there. 2015-05-20 11:06:44 +02:00
Greg Wilkins 02a1350965 abstracted AbstractHandler setServer 2015-05-20 11:21:55 +10:00
Greg Wilkins c5e4abd792 467281 Remove Java 1.7 support from Jetty 9.3 2015-05-14 09:31:50 +10:00
Simone Bordet 61f6763a68 Removed example syntax leftovers. 2015-05-12 10:57:04 +02:00
Simone Bordet 1a2eca098a Fixed XML's <Ref> elements to use refid instead of id. 2015-05-12 08:55:17 +02:00
Jan Bartel fe0bbe8e2f Add scavenge interval property to jdbc-sessions.mod 2015-05-08 14:03:16 +10:00
Greg Wilkins f1f6c67acf fixed typo 2015-05-08 13:29:39 +10:00
Greg Wilkins 6428718962 457788 Powered By in o.e.j.util.Jetty conditional on sendServerVersion
moved conditional to HttpConfiguration
2015-05-08 09:44:19 +10:00
Jan Bartel 532b0019cc 466678 Make a .mod file for jdbc session management 2015-05-07 17:10:31 +10:00
Greg Wilkins 5d041ad54f 466645 Allow XmlConfiguration Properties to use Elements or Attributes 2015-05-07 16:24:11 +10:00
Jan Bartel e2c7499bae 466628 Improve IllegalStateException on ServletInputStream.setReadListener() 2015-05-07 14:24:08 +10:00
Greg Wilkins 13c7fc3c38 move keystore to test config 2015-05-07 10:35:11 +10:00
Joakim Erdfelt 8ae1de727f 466648 - jetty-ssl download of keystore should be from tags, not master
+ Using new ${jetty.tag.version} from start.jar to use
  an appropriate tag/branch/master for the download of
  the keystore
2015-05-06 16:27:25 -07:00
Greg Wilkins dd7313ca82 replaced keystore 2015-05-07 08:44:56 +10:00
Greg Wilkins ad16f0c334 fixed test integration to use example-keystore 2015-05-01 19:32:16 +10:00
Greg Wilkins 29393ace68 moved keystore to example-keystore 2015-05-01 18:23:17 +10:00
Greg Wilkins 2271464406 430951 Support SNI with ExtendedSslContextFactory
Made modules do automatic selection of Extended SSL Context if running java 8
2015-05-01 15:50:06 +10:00
Joakim Erdfelt 0443ef7b93 Fixing bad javadoc 2015-04-30 11:02:37 -07:00
Simone Bordet c04896c9cb 465857 - Support HTTP/2 clear-text server-side upgrade.
Added earlier check about the connection being upgraded to avoid
doing more work in the now obsolete connection.
2015-04-30 09:33:24 +02:00
Greg Wilkins fb958833de 464419 Removed xinetd support 2015-04-30 16:44:23 +10:00
Greg Wilkins 8b39e7ffb8 464629 JDK8 Socket customization
Added the SocketCustomizationListener class which may be added as a bean to either a Connector or a ConnectionFactory
so that customizations may be made per connector by connection type or even per connection factory.

SSL is unwrapped.
2015-04-30 11:46:10 +10:00
Greg Wilkins d5e868b645 less verbose unit tests 2015-04-30 10:58:01 +10:00
Jan Bartel e30c05cc2b Merge remote-tracking branch 'origin/jetty-9.2.x'
Conflicts:
	tests/test-integration/src/test/java/org/eclipse/jetty/test/support/TestableJettyServer.java
	tests/test-integration/src/test/resources/BIOHttp.xml
	tests/test-integration/src/test/resources/BIOHttps.xml
	tests/test-integration/src/test/resources/NIOHttp.xml
	tests/test-integration/src/test/resources/NIOHttps.xml
2015-04-30 10:44:44 +10:00
Jan Bartel 25474ff7ab 465700 NullPointerException in ResourceHandler with welcome files 2015-04-30 09:06:01 +10:00
Simone Bordet a6cc4ff2f5 465857 - Support HTTP/2 clear-text server-side upgrade.
Fixed and test both types of upgrade, from HTTP/1.1 via its
upgrade mechanism, and direct HTTP/2.
2015-04-29 22:27:50 +02:00
Simone Bordet aaaf65bf3c Code and Javadoc cleanups. 2015-04-29 22:27:50 +02:00
Simone Bordet 8bfb50176b Fixed XML syntax to create SecureRequestCustomizer. 2015-04-29 09:23:09 +02:00
Simone Bordet 49168077ce Restored default ports for http and tls to 8080 and 8443 respectively. 2015-04-29 09:16:43 +02:00
Greg Wilkins 0dc394869b 465754 Unchecked PrintWriter errors
Removed the old unused UncheckedPrintWriter
Added similar bahaviour to the ResponseWriter class
2015-04-29 14:34:24 +10:00
Greg Wilkins d5c95a1302 465747 - Jetty is failing to process all HTTP OPTIONS requests.
The Server handleOptions method was handling all OPTIONS * requests with a blank 200 response.
This has been fixed so that this method only checks that * URI is only applied to OPTIONS method.
2015-04-29 14:01:20 +10:00
Joakim Erdfelt 084a307ea1 socket.reuse-address on windows doesn't work from ServerConnector 2015-04-28 08:32:20 -07:00
Simone Bordet aa8ea82b28 Cleanup. 2015-04-27 17:21:57 +02:00
Jan Bartel 184c4d4af8 464564 NoSql sessions created inside a forward not persisted correctly 2015-04-23 14:27:11 +10:00
Greg Wilkins d434f419d2 457788 Powered By in o.e.j.util.Jetty conditional on sendServerVersion 2015-04-23 11:26:23 +10:00
Greg Wilkins e633189b48 457788 Powered By in o.e.j.util.Jetty 2015-04-23 11:07:30 +10:00
Greg Wilkins deec5291f0 460746 HttpConfiguration#setPersistentConnectionsEnabled(boolean) 2015-04-23 10:57:51 +10:00
Joakim Erdfelt f126d02944 464727 - Update Javadoc for Java 8 DocLint
+ Fixing now bad javadoc on RequestLog class
2015-04-22 08:45:57 -07:00
Greg Wilkins baede130c0 430951 Support SNI with ExtendedSslContextFactory
exclude certificates with usages
2015-04-22 17:16:41 +10:00
Greg Wilkins eee2a53197 Merge remote-tracking branch 'origin/jetty-9.2.x' 2015-04-22 16:12:10 +10:00
Jan Bartel a7bd9d1dd9 464989 AbstractSessionManager.removeEventListener() should remove HttpSessionIdListener 2015-04-22 15:39:35 +10:00
Greg Wilkins c3577bbbb0 430951 Support SNI with ExtendedSslContextFactory
refactored common code in SniX509ExtendedKeyManager
added sniHostCheck code to ensure request host is the same as SNI host
2015-04-22 15:05:56 +10:00
Greg Wilkins 9eb2cb4c0f 446564 Refactored RequestLog Mechanism
reverted API
2015-04-22 10:37:39 +10:00
Joakim Erdfelt 5bdfd53e9c 464727 - Update Javadoc for Java 8 DocLint
+ Fixing javadoc in jetty-server
2015-04-21 13:58:42 -07:00
Greg Wilkins 2d283edf26 430951 Support SNI with ExtendedSslContextFactory
map lookup of wildcards
use LdapName to parse DN
2015-04-21 18:04:29 +10:00
Greg Wilkins 53fdbd2ec0 430951 Support SNI with ExtendedSslContextFactory
Added support for SAN names
optimised lookup
2015-04-21 14:14:45 +10:00
Greg Wilkins 12a9c0578e 430951 Support SNI with ExtendedSslContextFactory
case insensitive CN
2015-04-20 10:14:40 +10:00
Greg Wilkins ae31162669 430951 Support SNI with ExtendedSslContextFactory
Improved debugging
Regex selection of cn
2015-04-20 10:02:37 +10:00
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