2405e5417d
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-02-05 08:24:38 +11:00
051edc94d7
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-02-05 08:21:38 +11:00
6a64031840
Fixes #3210 - Threadpool module creates unmanged threadpool.
...
The thread pool is now created as a nested object, rather than a top
level object, so that it is not started before the Server instance.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-04 19:40:29 +01:00
33f314e9f5
Issue #3162 - Use Jetty specific Servlet API jar.
...
Updated to jetty-servlet-api:4.0.1, based on javax.servlet 4.0.1.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-04 18:51:51 +01:00
72ad74866c
Issue #3162 - Reverting not-relevant OSGi changes
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-02-04 18:51:51 +01:00
e135197066
Issue #3162 - Introducing more convenience Options for PaxExam
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-02-04 18:51:51 +01:00
95bc15f521
Issue #3162 - Correcting websocket issues in OSGi
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-02-04 18:51:51 +01:00
66f8259df3
Issue #3162 - Use Jetty specific Servlet API jar.
...
Removed references to jetty-osgi-servlet-api.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-04 18:51:26 +01:00
0d89f29e1b
Issue #3162 - Use Jetty specific Servlet API jar.
...
* Updated module-info.java to reference the "jetty.servlet.api" module.
* Updated POMs to reference the o.e.j.toolchain:jetty-servlet-api artifact.
* Removed references to jetty-schemas.jar.
* Updated attribute "org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern"
to match the new Jetty Servlet API jar.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-04 18:51:26 +01:00
b9281e323d
fix merge
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-04 18:49:12 +01:00
d8d1ecf6a1
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-02-04 18:49:12 +01:00
514c6dff1e
Issue #132 - ClientConnector abstraction.
...
Reverted refactoring of newConnection() to avoid
to bind the class to a too specific abstract method.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-04 18:49:12 +01:00
51730a7ccf
Issue #132 - ClientConnector abstraction.
...
Rewrote HttpClientTransportOverUnixSockets in light of ClientConnector.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-04 18:49:12 +01:00
64a2bc346e
Issue #132 - ClientConnector abstraction.
...
Added name to default executor and scheduler after review.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-04 18:49:12 +01:00
3c9c78c835
Issue #132 - ClientConnector abstraction.
...
Introduced ClientConnector and refactored HttpClient transports,
removing duplicated code that was connect() to a remote host.
Refactored also HTTP2Client to reference ClientConnector.
Refactored tests accordingly to the changes introduced in the
implementations.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-04 18:49:12 +01:00
fda815cd56
Merge pull request #3306 from eclipse/jetty-9.4.x-3305-avoid_select_now
...
Fixes #3305 - Avoid additional selectNow().
2019-02-04 11:44:13 +01:00
bf6521da5f
Merge pull request #3312 from eclipse/jetty-9.4.x-3311-http_https_same_port
...
Fixes #3311 - Ability to serve HTTP and HTTPS from the same port.
2019-02-04 09:17:35 +01:00
bfcb890ab2
Issue #3298 - rename typo in JettyWebSocketTest name
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-02-04 15:05:15 +11:00
77b7e275cc
Issue #3298 - fix to pom file
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-02-04 14:54:27 +11:00
da490673af
Fixes #3311 - Ability to serve HTTP and HTTPS from the same port.
...
Updated implementation and tests after reviews.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-03 14:24:07 +01:00
9af4707556
Issue #3234 - AuthenticationProtocolHandler should not cache the failed results.
...
Fixed failing test.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-02 18:56:58 +01:00
25afa868da
Issue #3302 Supporting host:ip in X-Forwarded-For (fixing unit tests)
...
Signed-off-by: alexey.barsov <alexey.barsov@jetbrains.com>
2019-02-01 15:48:58 +01:00
803a45b43b
Issue #3302 Supporting host:ip in X-Forwarded-For (fixing review remarks)
...
Signed-off-by: alexey.barsov <alexey.barsov@jetbrains.com>
2019-02-01 15:38:33 +01:00
33bceb3cc8
Fixes #3234 - AuthenticationProtocolHandler should not cache the failed results.
...
Now only caching authentication results for 2xx and 3xx codes.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-01 12:21:21 +01:00
66873e8637
Code cleanups.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-01 12:20:22 +01:00
d9855fb1bc
Fixes #3311 - Ability to serve HTTP and HTTPS from the same port.
...
Do not assume that the read from the network produced more than 1 byte.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-01 09:14:32 +01:00
e939cd2188
Merge pull request #3267 from eclipse/jetty-10.0.x-132_client_connector
...
Issue #132 - ClientConnector abstraction.
2019-01-31 17:37:10 +01:00
5061a5ca30
Fixes #3311 - Ability to serve HTTP and HTTPS from the same port.
...
Fixed handling of upgradeTo() in case of null buffers.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-01-31 17:15:07 +01:00
13cee0bc4d
Issue #3049 - Warn on common SslContextFactory problematic configurations.
...
Updating SslContextFactory configuration for tests, take 2.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-01-31 16:51:20 +01:00
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
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
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
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
b43fe865bf
fix merge
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-31 09:50:07 +10:00
86d0c9a4fe
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-01-31 09:42:25 +10:00
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
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
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
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
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
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
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
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
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
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
e789cd6834
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-01-30 14:26:52 +11:00
78dc801153
WebSocketMapping Refactor - add javadoc for WebSocketComponents
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-30 14:02:50 +11:00
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
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
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
Greg Wilkins
Simone Bordet
Joakim Erdfelt
olivier lamy
Lachlan Roberts
alexey.barsov
Jan Bartel