Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
18,210 Commits 69 Branches 465 Tags 360 MiB
Commit Graph

18210 Commits

Author SHA1 Message Date
Simone Bordet 88408375ab Issue #3049 - Warn on common SslContextFactory problematic configurations. 
Updating SslContextFactory configuration for tests, since
the change in the default endPointIdentificationAlgorithm
makes the test failing as the certificates are not valid
for the local host, which is different depending on where
the tests are run (locally, jenkins).

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-01-31 15:31:35 +01:00
Simone Bordet ccda1ee5f6 Fixes #3311 - Ability to serve HTTP and HTTPS from the same port. 
Introduced PlainOrSslConnectionFactory, to "sniff" the first bytes
on a connection and upgrade to SSL (if the bytes are TLS bytes), or
upgrade to a specific, configured, protocol.

Added also the ability to fail the upgrade in case of a `http`
request to a `https` port and write a minimal response to the client.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-01-31 13:23:58 +01:00
Lachlan Roberts 6a98cc0bd2 Issue #3298 - bug fixes for jetty websockets 
succeed callback when you do not have a message sink

OnWebSocketFrame annotation should take an API frame not a core frame

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-01-31 22:24:09 +11:00
Lachlan Roberts bd4f9b30fc Issue #3298 - cleanup of CompletableFutures for WebSocket upgrades 
Jetty and Javax ClientUpgradeRequests no longer use the combination of
the the onOpenFuture and the futureCoreSession and instead use only
the CompletableFuture future given to the FrameHandler onOpen

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-01-31 11:13:05 +11:00
olivier lamy b43fe865bf fix merge 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-01-31 09:50:07 +10:00
olivier lamy 86d0c9a4fe Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-01-31 09:42:25 +10:00
olivier lamy 6fee10d537 use snapshot of maven-invoker-plugin because of NPE https://issues.apache.org/jira/browse/MINVOKER-247 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-01-31 09:40:08 +10:00
Joakim Erdfelt c25cbf3480 Issue #3162 - Reverting not-relevant JspConfig change. 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-01-30 12:47:25 -06:00
Joakim Erdfelt 26fa79a050 Issue #3162 - Reverting not-relevant OSGi changes 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-01-30 12:43:36 -06:00
Joakim Erdfelt 755d5728d9 Issue #3162 - Using snapshot repositories on CI (temporary) 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-01-30 12:43:21 -06:00
Simone Bordet d02762140d Fixes #3305 - Avoid additional selectNow(). 
Using system property "org.eclipse.jetty.io.forceSelectNow"
to force a selectNow() call; if absent, forcing selectNow()
only in the Windows OS.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-01-30 19:41:35 +01:00
Joakim Erdfelt c30c8d4339 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-3162_jetty_servlet_api 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	jetty-client/pom.xml
#	jetty-http/pom.xml
#	jetty-http2/http2-client/pom.xml
#	jetty-http2/http2-http-client-transport/pom.xml
#	jetty-http2/http2-server/pom.xml
#	jetty-osgi/test-jetty-osgi/pom.xml
#	jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-with-custom-class.xml
#	jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty.xml
#	jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2Conscrypt.java
#	jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithAnnotations.java
#	jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJavaxWebSocket.java
#	jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithWebSocket.java
#	jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java
#	jetty-quickstart/pom.xml
#	jetty-servlets/pom.xml
#	jetty-util/pom.xml
#	jetty-websocket/javax-websocket-client/pom.xml
#	jetty-websocket/javax-websocket-server/pom.xml
#	jetty-websocket/jetty-websocket-server/pom.xml
#	pom.xml
 2019-01-30 11:56:58 -06:00
alexey.barsov edf74a6554 Issue #3302 Supporting host:ip in X-Forwarded-For 
Signed-off-by: alexey.barsov <foster_licey_reg@mail.ru>
 2019-01-30 11:11:44 +01:00
Lachlan Roberts 684dcd1693 Merge remote-tracking branch 'eclipse/jetty-10.0.x' into jetty-10.0.x-3298-completableFutures 2019-01-30 15:00:01 +11:00
Greg Wilkins bd0a61b1d5
Merge pull request #3286 from lachlan-roberts/jetty-10.0.x-websocketmapping-refactor 
WebSocketMapping Refactor to have a mapping per filter/servlet
 2019-01-30 14:56:27 +11:00
Jan Bartel ce976b5aa3
Issue #3249 Update to apache jsp 9.0.14 (#3299) 
* Issue #3249 Update to apache jsp 9.0.14

Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-01-30 14:31:58 +11:00
Jan Bartel e789cd6834 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-01-30 14:26:52 +11:00
Lachlan Roberts 78dc801153 WebSocketMapping Refactor - add javadoc for WebSocketComponents 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-01-30 14:02:50 +11:00
Jan Bartel 169d93e790
Jetty 9.4.x 3284 sessions and system clock jitter (#3296) 
* Issue 3284 System clock jitter can affect session timers.

Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-01-30 14:02:35 +11:00
Lachlan Roberts deaaa0bf30 Merge remote-tracking branch 'eclipse/jetty-10.0.x' into jetty-10.0.x-websocketmapping-refactor 2019-01-30 13:49:10 +11:00
Greg Wilkins 58b73c10af
Merge pull request #3291 from eclipse/jetty-10.0.x-3290-websocket-onOpen 
Issue #3290 async websocket onOpen, onError and onClose
 2019-01-30 12:05:09 +11:00
Lachlan Roberts b4bd5980aa Issue #3298 - Refactor of upgrade request class names 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-01-30 10:00:56 +11:00
Lachlan Roberts b0aec2b26e fix bug in WebSocketMapping failing isInstance test 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-01-29 15:26:16 +11:00
Greg Wilkins f5751618bd Issue #3290 async onOpen, onClose and onError 
Fixed OSGi tests.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-01-29 13:08:35 +11:00
Lachlan Roberts 8c5d421b5b remove unnecessary imports in jetty-websocket-tests 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-01-29 12:03:53 +11:00
Greg Wilkins cf0eaecbdc Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-3290-websocket-onOpen 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-01-29 10:59:08 +11:00
Greg Wilkins 1d9e7b7613
Merge pull request #3199 from lachlan-roberts/jetty-10.0.x-3139-npe-websocket-sci 
Issue #3139 - NPE in WebSocketContainerInitializer for jetty10
 2019-01-29 10:56:59 +11:00
Greg Wilkins 3ad584eaef Issue #3290 async onOpen, onClose and onError 
Changes after review:
 + failure to send abnormal close closes connection prior to failing
   callback.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-01-29 10:45:54 +11:00
Greg Wilkins 6f7395c8f0 Issue #3290 async onOpen, onClose and onError 
Changes after review:
 + fixed import order

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-01-29 10:38:12 +11:00
Greg Wilkins 84d74ba1de Issue #3290 async onOpen, onClose and onError 
Changes after review:
 + removed Adaptor from FrameHandler, so all non test usages of
   FrameHandler now use async API.
 + Fixed sequencing of multiple async operation so callback is notified
   after completion (created more Callback.from utilities for this)
 + fixed import order

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-01-29 10:33:37 +11:00
Lachlan Roberts 402d756ea5 rename websocket-tests module to jetty-websocket-tests 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-01-29 10:29:38 +11:00
Greg Wilkins 1171d7c8d7 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-3290-websocket-onOpen 2019-01-26 18:16:30 +11:00
Greg Wilkins 8b93922d08 Issue #3290 async onOpen, onClose and onError 
Gave onOpen, onError and onClose callback signatures
Illegal to ask for demand prior to onOpen success
added tests for various onOpen scenarios

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-01-26 15:34:50 +11:00
Simone Bordet fe5b7be7f6 Fixes #3293 HttpClientTLSTest.testNoCommonTLSProtocol() fail with jdk 11.0.2. 
Updated to force TLS 1.3 vs TLS 1.2, rather TLS 1.2 vs TLS 1.1.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-01-25 17:02:00 +10:00
Lachlan Roberts aa1d6ff9cd WebSocketMapping refactor changes from review 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-01-25 17:11:27 +11:00
Lachlan Roberts a8a5e50579 Issue #3139 ContextHandler must be set on server before configureContext 
If configure context is called with a context that does not yet have
a server, we should just throw an ISE. This is better than having a
different configuration result depending on if the context has been set
been added to the handler tree or not.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-01-25 17:05:26 +11:00
Olivier Lamy 4d191d8a31
fix groupId (#3294) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-01-25 16:04:33 +10:00
olivier lamy d2e2f52030 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-01-25 15:14:43 +10:00
Olivier Lamy 6145fd7468
Issue #3166 add autobahn testsuite running via autobahn maven plugin (#3292) 
Issue #3166 Add autobahn profile to automatically run autobahn test suite in Jenkins
 2019-01-25 15:10:24 +10:00
Lachlan Roberts 0c85b3138f rename of WebSocketResources to WebSocketComponents 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-01-25 11:57:03 +11:00
Lachlan Roberts b2f2a16aed Merge branch 'jetty-10.0.x-websocketmapping-refactor' of https://github.com/lachlan-roberts/jetty.project into jetty-10.0.x-websocketmapping-refactor 2019-01-25 11:38:40 +11:00
olivier lamy 884afb5ba1 disable parse junit report when building compact3 profile 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-01-25 09:27:42 +10:00
olivier lamy 5463b64a7c do not parse junit report when building javadoc tests are reported one more time 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-01-25 08:27:00 +10:00
olivier lamy cf406b8854 do not parse junit report when building javadoc tests are reported one more time 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-01-25 07:40:42 +10:00
Joakim Erdfelt 02dd7d1887
Merge pull request #3289 from eclipse/jetty-10.0.x-websocket-artifact-ids 
Issue #3288 - Correcting Jetty WebSocket API artifactIds
 2019-01-24 10:47:12 -06:00
Simone Bordet 43c7a4c00d Fixes #3293 HttpClientTLSTest.testNoCommonTLSProtocol() fail with jdk 11.0.2. 
Updated to force TLS 1.3 vs TLS 1.2, rather TLS 1.2 vs TLS 1.1.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-01-24 14:39:38 +01:00
olivier lamy 15d998b269 fix javadoc with jdk 11.0.2 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-01-24 21:20:01 +10:00
Lachlan Roberts ececab10ca Issue #3139 - NPE in WebSocketContainerInitializer for jetty10 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-01-24 17:18:29 +11:00
olivier lamy 3ffdd9427d Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-01-24 14:41:39 +10:00
Olivier Lamy 34b2678e6d
issue #3254 add jsp test need to remove cdi-api and exclude it fron upperBound rule (#3268) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-01-24 14:34:41 +10:00