Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-23 16:05:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,154 Commits 55 Branches 466 Tags
Commit Graph

18154 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jan Bartel
adc2d43536
Issue #3329 Hazelcast remove session fails (#3330) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-02-06 17:18:40 +11:00
Greg Wilkins
5d9c55be8f Issue #3225 sendError does not set reason. 
The message string passed to sendError should only be used for the
error page content and not for the reason string.

Setting the reason in a response via setStatus(int,String) is deprecated

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-02-06 17:12:02 +11:00
Simone Bordet
8964608bfc Fixes #3154 - Add support for javax.net.ssl.HostnameVerifier to HttpClient. 
Added a SslHandshakeListener to SslConnection that performs
the host name verification (only on the client) if the
HostnameVerifier has been configured in SslContextFactory.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-02-05 15:48:17 +01:00
Jan Bartel
ebef147d93 Issue #3278 Empty ResourceCollection throws NPE 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-02-05 16:14:18 +11:00
Joakim Erdfelt
0817928ea6 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-3162_jetty_servlet_api 2019-02-04 19:49:34 -06:00
Joakim Erdfelt
e4df1fe8af Issue #3162 - Correcting javadoc 2019-02-04 19:34:20 -06:00
Joakim Erdfelt
b09f1de035 Issue #3162 - Fixing compilation issues 2019-02-04 19:32:00 -06:00
Greg Wilkins
7fca634292 fixed bad merge 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-02-05 10:48:07 +11:00
Jan Bartel
aeba829b33
Issue #3308 Remove deprecated session methods (#3309) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-02-05 10:08:49 +11:00
Simone Bordet
cd488c2d7d Merged branch 'jetty-10.0.x' into 'jetty-10.0.x-3162_jetty_servlet_api'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-02-04 23:11:32 +01:00
Simone Bordet
d22ec03acc
Merge pull request #3287 from eclipse/jetty-9.4.x-3049-sslcontextfactory_warnings 
Issue #3049 - Warn on common SslContextFactory problematic configurations
 2019-02-04 22:56:32 +01:00
Simone Bordet
107170adf8 Issue #3162 - Use Jetty specific Servlet API jar. 
Updated to jetty-servlet-api:4.0.2, based on jakarta.servlet 4.0.2.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-02-04 22:55:21 +01:00
Simone Bordet
6c0eee7012
Merge pull request #3322 from eclipse/jetty-9.4.x-3210-unmanaged_threadpool 
Fixes #3210 - Threadpool module creates unmanged threadpool.
 2019-02-04 22:52:30 +01:00
Greg Wilkins
a41f270e47
Merge pull request #3310 from lachlan-roberts/jetty-10.0.x-3298-completableFutures 
Issue #3298 - WebSocket UpgradeRequests and CompletableFutures
 2019-02-05 08:40:18 +11:00
Greg Wilkins
0809228549 Issue #3317 avoid double log of exception 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-02-05 08:28:37 +11:00
Greg Wilkins
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
Greg Wilkins
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
Simone Bordet
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
Simone Bordet
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
Joakim Erdfelt
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
Joakim Erdfelt
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
Joakim Erdfelt
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
Simone Bordet
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
Simone Bordet
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
olivier lamy
b9281e323d fix merge 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-02-04 18:49:12 +01:00
olivier lamy
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
Simone Bordet
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
Simone Bordet
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
Simone Bordet
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
Simone Bordet
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
Simone Bordet
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
Simone Bordet
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
Lachlan Roberts
bfcb890ab2 Issue #3298 - rename typo in JettyWebSocketTest name 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-02-04 15:05:15 +11:00
Lachlan Roberts
77b7e275cc Issue #3298 - fix to pom file 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-02-04 14:54:27 +11:00
Simone Bordet
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
Simone Bordet
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
alexey.barsov
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
alexey.barsov
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
Simone Bordet
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
Simone Bordet
66873e8637 Code cleanups. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-02-01 12:20:22 +01:00
Simone Bordet
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
Simone Bordet
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
Simone Bordet
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
Simone Bordet
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
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