Greg Wilkins
a855744aeb
release buffer in client as well
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-02-20 10:25:57 +01:00
Lachlan Roberts
55748f12c2
Issue #4581 - remove unnecessary javadoc on Override methods
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-18 11:33:56 +11:00
Greg Wilkins
f50c2654b9
Fixes #4541 Large Headers
...
Added a HEADER_OVERFLOW result as per review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-02-06 21:17:58 +01:00
Simone Bordet
4fbbaf8b8e
Fixes #3953 - Client configuration for direct/heap ByteBuffers.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-02-05 09:49:44 +01:00
Joakim Erdfelt
56fc476d55
Updating to version 9.4.27-SNAPSHOT
2020-01-17 07:00:10 -06:00
Joakim Erdfelt
7b38981d25
Updating to version 9.4.26.v20200117
2020-01-17 06:21:47 -06:00
Simone Bordet
65d50258b7
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2020-01-17 09:02:14 +01:00
Simone Bordet
6d65799bad
Fixes #4481 - Fix NeedWantClientAuthTest for OpenJDK 13.0.2/11.0.6.
...
Updated the keystores to PKCS12 and added the Basic Constraint CA:true
to the server certificate.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-01-16 15:20:34 +01:00
Joakim Erdfelt
01a5974f4b
Merge branch `jetty-9.4.x` into `jetty-10.0.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# Jenkinsfile
# examples/async-rest/async-rest-webapp/src/test/java/org/eclipse/jetty/example/asyncrest/DemoServer.java
# jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTest.java
# jetty-http/src/test/java/org/eclipse/jetty/http/HttpParserTest.java
# jetty-http/src/test/java/org/eclipse/jetty/http/HttpTester.java
# jetty-http/src/test/java/org/eclipse/jetty/http/MultiPartParserTest.java
# jetty-http/src/test/java/org/eclipse/jetty/http/PathMapTest.java
# jetty-http/src/test/java/org/eclipse/jetty/http/matchers/HttpFieldsMatchersTest.java
# jetty-maven-plugin/src/test/java/org/eclipse/jetty/maven/plugin/it/TestGetContent.java
# jetty-server/src/test/java/org/eclipse/jetty/server/CookieCutterLenientTest.java
# jetty-server/src/test/java/org/eclipse/jetty/server/CookieCutterTest.java
# jetty-server/src/test/java/org/eclipse/jetty/server/PartialRFC2616Test.java
# jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ServletLifeCycleTest.java
# jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipContentLengthTest.java
# jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipDefaultNoRecompressTest.java
# jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
# jetty-unixsocket/src/test/java/org/eclipse/jetty/unixsocket/UnixSocketClient.java
# jetty-util/src/test/java/org/eclipse/jetty/util/B64CodeTest.java
# jetty-util/src/test/java/org/eclipse/jetty/util/resource/FileSystemResourceTest.java
# jetty-util/src/test/java/org/eclipse/jetty/util/ssl/X509Test.java
# jetty-webapp/src/test/java/org/eclipse/jetty/webapp/ClasspathPatternTest.java
# jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/LargeMessageTest.java
# jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/endpoints/ClientAnnotatedEndpointScannerGoodSignaturesTest.java
# jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/endpoints/ClientAnnotatedEndpointScannerInvalidSignaturesTest.java
# jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/metadata/EncoderMetadataSetTest.java
# jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/utils/ReflectUtilsTest.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/ConfiguratorTest.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/DelayedStartClientOnServerTest.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/RestartContextTest.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/ServerAnnotatedEndpointScannerGoodSignaturesTest.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/ServerAnnotatedEndpointScannerInvalidSignaturesTest.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/SessionTest.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/ErrorCloseTest.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientConnectTest.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientSessionsTest.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/WebSocketClientTest.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/PartialListenerTest.java
# jetty-websocket/websocket-api/src/test/java/org/eclipse/jetty/websocket/api/extensions/ExtensionConfigTest.java
# jetty-websocket/websocket-api/src/test/java/org/eclipse/jetty/websocket/api/util/QuoteUtilQuoteTest.java
# jetty-websocket/websocket-api/src/test/java/org/eclipse/jetty/websocket/api/util/QuoteUtilTest.java
# jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ConnectionManagerTest.java
# jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/TomcatServerQuirksTest.java
# jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/WebSocketClientInitTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/GeneratorTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ParserTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/TextPayloadParserTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase11.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase12.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase2.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase4.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase73.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/events/EventDriverTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/events/JettyAnnotatedScannerTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/ByteAccumulatorTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/DeflateFrameExtensionTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/PerMessageDeflateExtensionTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/io/ConnectionStateTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/io/http/HttpResponseHeaderParserTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/message/MessageDebug.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/message/Utf8CharBufferTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/test/UnitGenerator.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/util/Utf8PartialBuilderTest.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/RedirectWebSocketClientTest.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/SimpleServletServer.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase1.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase2.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase3.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase4.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase5.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase6.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase6BadUTF.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase6GoodUTF.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase7.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase7BadStatusCodes.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase7GoodStatusCodes.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase9.java
# pom.xml
# tests/test-continuation/src/test/java/org/eclipse/jetty/continuation/ContinuationsTest.java
# tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/JdbcTestHelper.java
# tests/test-webapps/test-jetty-webapp/src/test/java/org/eclipse/jetty/TestServer.java
# tests/test-webapps/test-proxy-webapp/src/test/java/org/eclipse/jetty/TestTransparentProxyServer.java
2020-01-15 12:20:20 -06:00
Joakim Erdfelt
8c65309963
Addressing Checkstyle violations in src/test/java
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-01-14 12:33:34 -06:00
Simone Bordet
51b97d5170
Issue #4459 - Move multipart classes to jetty-server.
...
Removed Surefire Plugin configuration no longer needed.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-01-14 12:23:26 +01:00
Joakim Erdfelt
1f8ad08281
Fixing Checkstyle violations
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-01-09 15:56:06 -06:00
Simone Bordet
5f82e17d2f
Issue #3578 - Adopt EPL-2.0 for Jetty-10.
...
WIP: updated copyright headers for Java files.
TODO: doc files and META-INF files inside jars.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-01-09 20:10:19 +01:00
Simone Bordet
a5c99207fc
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2020-01-07 17:02:40 +01:00
Simone Bordet
923ec38adf
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2020-01-07 16:51:25 +01:00
Simone Bordet
e3c8546667
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2020-01-07 16:35:05 +01:00
Simone Bordet
de890bb1b7
Happy New Year 2020.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-01-07 16:25:32 +01:00
Joakim Erdfelt
f4e7e4c3db
Merge branch 'release-9.4.25' into jetty-9.4.x
2020-01-03 12:49:27 -06:00
olivier lamy
ff48fba585
happy new year
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-01-02 21:59:21 +01:00
olivier lamy
e1371a1c13
happy new year
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-01-02 21:54:05 +01:00
Lachlan Roberts
c98897315c
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-4225-jpms_transitivity
2019-12-27 19:27:59 +11:00
Joakim Erdfelt
8974176c4b
Updating to version 9.4.26-SNAPSHOT
2019-12-20 11:30:41 -06:00
Joakim Erdfelt
a9729c7e7f
Updating to version 9.4.25.v20191220
2019-12-20 10:46:56 -06:00
Simone Bordet
a41b877876
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-12-19 22:13:22 +01:00
Simone Bordet
af7cb94528
Merge pull request #4428 from eclipse/jetty-9.4.x-4427-httpclient_retried_request_duplicates_cookies
...
Fixes #4427 - Retried request duplicates cookies.
2019-12-19 22:00:15 +01:00
Simone Bordet
e3bb5a7515
Issue #4225 - Fix JPMS transitivity.
...
Reworked all module-info.java files to take into
account JPMS transitivity.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-12-19 18:17:35 +01:00
Simone Bordet
133dbdf7fe
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-12-19 12:02:24 +01:00
Simone Bordet
e4f1106f09
Fixes #4421 - HttpClient support for PROXY protocol.
...
Fixed visibility of ProxyProtocolConnection.
Must be protected because it's the return type
of protected methods.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-12-19 10:11:54 +01:00
Simone Bordet
fdc131db89
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-12-18 00:51:32 +01:00
Simone Bordet
bea7f1a5cf
Fixes #4421 - HttpClient support for PROXY protocol.
...
Improved support for Type-Length-Value (TLV) objects.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-12-17 23:26:28 +01:00
Simone Bordet
91239b01e3
Fixes #4427 - Retried request duplicates cookies.
...
Introduced HttpRequest.normalized() to test and set whether
the request has already been normalized.
Added test case and few cleanups.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-12-17 20:16:46 +01:00
Simone Bordet
b1e2f80017
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-12-17 13:41:15 +01:00
Simone Bordet
129a51c7a2
Fixes #4421 - HttpClient support for PROXY protocol. ( #4424 )
...
* Fixes #4421 - HttpClient support for PROXY protocol.
Implemented support for the PROXY protocol in HttpClient.
Introduced Request.tag(Object) to tag requests that belong
to the same group (e.g. a client address) so that they can
generate a different destination.
The tag object may implement ClientConnectionFactory.Decorator
so that it can decorate the HttpDestination ClientConnectionFactory
and therefore work both with and without forward proxy configuration.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-12-17 10:36:16 +01:00
Simone Bordet
6f2ac512dc
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-12-16 18:04:11 +01:00
Simone Bordet
fa973a2df8
Merge pull request #4380 from eclipse/jetty-9.4.x-4374-httpclient_content_listener
...
Fixes #4374 - Jetty client: Response.AsyncContentListener.onContent i…
2019-12-16 18:01:27 +01:00
Simone Bordet
2364b075d7
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-12-07 12:42:00 +01:00
Simone Bordet
364ded9f73
Merge pull request #4391 from eclipse/jetty-9.4.x-3512-httpclient_multipart_close
...
Fixes #3512 - File descriptor is not released after zip file uploaded…
2019-12-07 12:38:40 +01:00
Simone Bordet
433928a016
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-12-04 15:16:38 +01:00
Simone Bordet
2ef02da1bd
Fixes #4366 - HTTP client uses SOCKS4 proxy hostname for SSL hostname verification.
...
Now setting correctly the host and port to the server destination
_after_ the SOCKS tunnel is established, similarly to what is done
for the HTTP CONNECT tunnel.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-12-03 21:40:55 +01:00
Simone Bordet
9628ea3bc1
Fixes #3512 - File descriptor is not released after zip file uploaded via jetty-client.
...
In case of multiple parts only the last iterator was closed.
Now, every part's iterator is closed.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-12-03 11:36:53 +01:00
Simone Bordet
902603fc9e
Fixes #4374 - Jetty client: Response.AsyncContentListener.onContent is not called.
...
Now the various content listeners inherit from each other, like
it should have been from the beginning.
This also allowed to remove code duplication due to the default
implementation of the methods in various places.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-11-29 12:05:30 +01:00
Simone Bordet
3b817821e7
Merge pull request #3740 from eclipse/jetty-10.0.x-3537-bootstrap_websocket_http2
...
Issue #3537 - Bootstrap websocket on HTTP/2
2019-11-28 15:47:26 +01:00
olivier lamy
80da9e22db
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-11-27 10:09:37 +10:00
olivier lamy
dc1a3384b0
ooops typo
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-11-27 07:18:59 +10:00
olivier lamy
c291df5463
we do not want dependencies definied as range even for test transitive dependencies
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-11-27 07:04:57 +10:00
Simone Bordet
f14ab3fc39
Merge branch 'jetty-10.0.x' into 'jetty-10.0.x-3537-bootstrap_websocket_http2'.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-11-22 09:43:01 +01:00
Joakim Erdfelt
0f7a3b2d91
Updating to version 9.4.25-SNAPSHOT
2019-11-20 16:08:38 -06:00
Joakim Erdfelt
363d5f2df3
Updating to version 9.4.24.v20191120
2019-11-20 15:25:01 -06:00
Joakim Erdfelt
dc03431de2
Merge branch 'release-9.4.23' into jetty-9.4.x
2019-11-20 07:14:53 -06:00
Simone Bordet
04dc257641
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-11-19 10:50:31 +01:00
Simone Bordet
e89e8ae16e
Improved toString() for ConnectionPool implementations.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-11-19 10:43:09 +01:00
Joakim Erdfelt
453d41940b
Updating to version 9.4.24-SNAPSHOT
2019-11-18 13:52:51 -06:00
Joakim Erdfelt
abbccc65d6
Updating to version 9.4.23.v20191118
2019-11-18 13:09:44 -06:00
Simone Bordet
27e5755b34
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-11-18 10:33:16 +01:00
Simone Bordet
bf2482a7ea
Moved implementation from Adapter classes to default methods in
...
the interface to avoid binary compatibility problems in case the
interface is changed.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-11-18 10:29:55 +01:00
Simone Bordet
c6ec9fb4d2
Fixed handling of DATA frames arriving _before_ the upgrade.
...
Now CONNECT with :protocol requests will demand DATA frames only
after the upgrade.
Other requests will demand DATA frames during the handling of
the request HEADERS frame.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-11-16 19:56:00 +01:00
Simone Bordet
06ce13e226
Merged branch 'jetty-10.0.x' into 'jetty-10.0.x-3537-bootstrap_websocket_http2'.
2019-11-14 12:42:15 +01:00
Simone Bordet
e7322a79b2
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-11-13 23:44:22 +01:00
Simone Bordet
1b686eaba4
Fixed test failures after merge.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-11-13 08:39:51 +01:00
Greg Wilkins
46a3368f3b
Issue #2578 - Listener behavior cleanup (Jetty 10.0.x) ( #3966 )
...
* Avoid creating listener list for rarely used requestAttributeListener
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #3964
Keep a list of EventListeners in the AbstractConnector to make it
more efficient to add and iterate over them.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #2578 EventListener
Use addEventListener rather than bespoke listener methods.
Support getEventListenerBeans at Container level for fast lookup
improve javadoc
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #2578 EventListener
fixed test
more javadoc
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #2578 EventListener
fixed tests
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #3964
Don't use null for empty lists of listeners
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* fix merge
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #2578 EventListener
Resolve differences between eventListeners added as beans and beans
added as EventListeners. The behaviour should now be the same
regardless of how they listener is added and all listeners are now
beans.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #2578 EventListener
Add only SelectorManager listeners to manager from connector
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #2578 EventListener
Fixed javadoc
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #2578 EventListener
removed old TODO
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #2578 EventListener
connector cannot be null
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #2578 EventListener
javadoc
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #3964
AbstractConnector keeps a specific list of HttpChannel.Listeners
to avoid Connection.Listeners and MBean listeners being added to
the HttpChannel listener list.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #2578 EventListener
fixed merge
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* fixed javadoc
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #2578 EventListener
removed the ability to set/clear context listeners
Instead just remove non-durable ones.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #3964 Listeners
Simplified listener handling by avoiding null connector, previously
only needed for testing.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* fixed bad merge
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #3964 Listeners
Fixed test that assumed HttpChannel listeners were not cleared by a recycle
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #3964 Listeners
Separated out durable vs cyclic HttpChannel.Listeners, so as to
simplify handling.
Deprecated cyclic HttpChannel.Listeners, as I'm not sure the channel is
the right place for them.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* removed deprecated cyclic HttpChannel listeners
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* removed deprecated cyclic HttpChannel listeners - import
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4003 Cleanup quickstart
* Fixed tests that scan for "Started" on console
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* updates from review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-11-13 11:04:38 +11:00
Simone Bordet
aa57463175
Fixes #4301 - Demand beforeContent is not forwarded.
...
Now correctly handling no demand before the content
in FCGI and HTTP2 transports.
Fixed HttpRequest to correctly forward onBeforeContent()
to wrapped listeners.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-11-12 23:33:21 +01:00
Simone Bordet
e2ccf8a1bc
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-11-12 17:06:14 +01:00
Simone Bordet
4825832a53
Merge pull request #4286 from eclipse/jetty-9.4.x-4277-httpclient_async_gzip
...
Fixes #4277 - Reading streamed gzipped body never terminates.
2019-11-12 19:04:05 +03:00
Simone Bordet
5f9edb1361
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-11-12 16:41:33 +01:00
Simone Bordet
b1d231b9e7
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-11-11 16:45:12 +01:00
Lachlan
c336616c96
Issue #2709 - reduce default headerCacheSize to 1024 ( #4292 )
...
make headerCacheSize on HttpReceiverOverHTTP configurable
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-11-08 21:57:49 +11:00
Simone Bordet
a83c297a11
Fixes #4277 - Reading streamed gzipped body never terminates.
...
Fixed handling of demand in case of gzipped response content.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-11-07 22:32:11 +01:00
Joakim Erdfelt
43d95cd984
Updating to version 9.3.29-SNAPSHOT
2019-11-05 13:02:10 -06:00
Joakim Erdfelt
d7dd68d6e9
Updating to version 9.3.28.v20191105
2019-11-05 11:46:40 -06:00
Joakim Erdfelt
b17439c731
Updating to version 9.2.30-SNAPSHOT
2019-11-05 11:23:21 -06:00
Joakim Erdfelt
36c95fdd43
Updating to version 9.2.29.v20191105
2019-11-05 10:43:15 -06:00
Greg Wilkins
dd53a8d70f
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-11-05 09:17:29 +11:00
Greg Wilkins
869c3b51ce
Issue #4265 Remove doError ( #4266 )
...
* Issue #4265 Remove doError
The doError method and the ErrorDispatchHandler class were
hang overs from when we needed to dispatch into a context to get sendError called, which would then generate the error page.
Now sendError doesn't do any generation, rather it changes state that arranges either for a minimal error page to be generated or an ERROR dispatch to a real handler/servlet to generate the error page.
Thus the ErrorDispatchHandler and doError methods can now be removed.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4265 Remove doError
Moved the error page dispatching logic back to the ErrorHandler class to assist with backwards compatibility
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4265 Remove doError
Moved the error page dispatching logic back to the ErrorHandler class to assist with backwards compatibility
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4265 doError
Updates from review.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-11-05 08:45:46 +11:00
Joakim Erdfelt
e137ee3cd7
Issue #4217 - SslConnection DecryptedEndpoint flush eternal busy loop
...
+ Cleanup from review
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-10-30 14:03:16 -05:00
Joakim Erdfelt
c58fd58e41
Testing Large TLS Records for Jetty 9.2.x
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-10-29 19:14:07 -05:00
Joakim Erdfelt
e665c8f806
Issue #4217 - SslConnection DecryptedEndpoint flush eternal busy loop
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-10-24 16:26:43 -05:00
Joakim Erdfelt
1ed13b6b30
Updating to version 9.4.23-SNAPSHOT
2019-10-22 09:19:41 -05:00
Joakim Erdfelt
b1e6b55512
Updating to version 9.4.22.v20191022
2019-10-22 08:20:50 -05:00
Simone Bordet
c2cde806d1
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-10-21 21:37:30 +02:00
Simone Bordet
73eb82c20f
Issue #4217 - SslConnection.DecryptedEndpoint.flush eternal busy loop.
...
Updates after review.
Added test case.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-10-19 20:06:10 +02:00
Simone Bordet
991cf20cce
Issue #4217 - SslConnection.DecryptedEndpoint.flush eternal busy loop.
...
Releasing the decrypted input buffer so that it can be re-acquired
with an expanded capacity.
Looping around only if the buffer size has changed.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-10-19 12:27:58 +02:00
Simone Bordet
2e633a4e86
Fixes #4217 - SslConnection.DecryptedEnpoint.flush eternal busy loop.
...
Releasing the encrypted output buffer so that it can be re-acquired
with an expanded capacity.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-10-17 19:41:52 +02:00
Simone Bordet
7c11c7f85f
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-10-16 23:34:08 +02:00
Simone Bordet
20e0453da8
Merged branch 'jetty-9.4.x' into 'jetty-9.4.x-4201-httpclient_throw_sslhandshakeexception'.
2019-10-16 18:51:15 +02:00
Simone Bordet
364288886e
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-10-16 18:40:08 +02:00
Simone Bordet
1e360244a5
Fixes #4209 - Unused TLS connection is not closed in Java 11.
...
Added workarounds for the Java 11 behavior.
In fill(), call closeInbound() if we filled -1 and the handshake
did not start yet. This avoids to send a ClientHello to the peer
even if we are closing.
In flush(), if the handshake status is NEED_UNWRAP but we are
closing, force a wrap().
Added test cases.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-10-16 13:10:40 +02:00
Simone Bordet
4769de8a2b
Issue #4209 - Unused TLS connection is not closed in Java 11.
...
Code cleanup.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-10-16 13:02:24 +02:00
Simone Bordet
3ce87f717c
Fixes #4201 - Throw SSLHandshakeException in case of TLS handshake failures.
...
Now rethrowing other exceptions as SSLHandshakeException
if they happen during the TLS handshake.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-10-15 16:44:30 +02:00
Simone Bordet
95ccdd448e
Issue #4177 - Configure HTTP proxy with SslContextFactory.
...
Small signature fixes.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-10-11 11:29:12 +02:00
Simone Bordet
2ebd1ff62d
Fixes merge from branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-10-10 10:42:51 +02:00
Simone Bordet
cf687457e7
Issue #4177 - Configure HTTP proxy with SslContextFactory.
...
Small fixes after merge.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-10-10 10:41:42 +02:00
Simone Bordet
6430177685
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-10-10 10:38:38 +02:00
Simone Bordet
a73568df28
Fixes #4177 - Configure HTTP proxy with SslContextFactory.
...
Updates after review.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-10-10 10:00:17 +02:00
Simone Bordet
c8175ec107
Fixes #4177 - Configure HTTP proxy with SslContextFactory.
...
It is now possible to pass a `SslContextFactory.Client` to HttpProxy
so that it is possible to use a keystore for the proxy communication
and another keystore for the server communication.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-10-09 17:37:00 +02:00
Simone Bordet
783f3b49b0
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-10-09 10:22:18 +02:00
Simone Bordet
742f564332
Fixes #4170 - Client-side alias selection based on SSLEngine.
...
Fixed setting of host/port in AbstractConnectorHttpClientTransport
and HttpProxy so that the creation of SSLEngine can use the proper
host/port pair, and can be subsequently used in TLS components.
Introduced SslContextFactory X509ExtendedKeyManagerWrapper and
X509ExtendedTrustManagerWrapper as utility classes used internally
and in tests.
The test case for this issue required 3 keystores, so other test
classes have been refactored to use the new keystores.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-10-08 18:32:23 +02:00
Simone Bordet
c93dddec30
Fixes #2429 - Review HttpClient backpressure semantic.
...
Fixes after merge.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-10-08 12:18:14 +02:00
Simone Bordet
e2a493d7b0
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-10-08 09:52:21 +02:00
Simone Bordet
a4603c4237
Issue #2429 - Review HttpClient backpressure semantic.
...
Updated after review.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-10-08 00:52:11 +02:00
Joakim Erdfelt
d7a189fa18
Updating to version 10.0.0-SNAPSHOT
2019-10-03 12:05:26 -05:00
Joakim Erdfelt
fd6a2cb9f6
Updating to version 10.0.0.alpha1
2019-10-03 11:25:06 -05:00
Simone Bordet
ef05f730e6
Issue #4115 - Drop HTTP/2 pseudo headers.
...
Added Javadocs.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-10-03 16:58:16 +02:00
Simone Bordet
3be178c966
Merged 'jetty-9.4.x' into 'jetty-9.4.x-2429-httpclient_backpressure'.
2019-10-03 13:17:39 +02:00
Simone Bordet
9fbc41f1d5
Fixes #4150 - Module org.eclipse.jetty.alpn.client not found, required by org.eclipse.jetty.proxy
...
Made jetty-alpn-client required by jetty-client.
Fixed groupId for test-proxy-webapp.
Added test case for the failing configuration.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-10-02 23:11:02 +02:00
Joakim Erdfelt
6fc42d8ba2
Merge branch 'release-9.4.21' into jetty-9.4.x
2019-10-01 13:35:43 -05:00
Simone Bordet
ea99b3ac69
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-10-01 17:37:30 +02:00
Simone Bordet
72d1a297a0
Merge pull request #4109 from mofleury/jetty-9.4.x
...
Support meaningful JMX ObjectNames for HttpDestinations by avoiding race condition at creation
2019-10-01 17:31:45 +02:00
Simone Bordet
1cb09db75a
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-09-30 09:01:57 +02:00
Marc-Olivier Fleury
8e51a4d532
adjusted formatting to follow standards
...
Signed-off-by: Marc-Olivier Fleury <mofleury@gmail.com>
2019-09-30 08:34:54 +02:00
Simone Bordet
2c75e876a3
Fixes #3787 - Jetty client throws EOFException instead of SSLHandshakeException on certificate errors.
...
Now exceptions thrown by fill() or flush() are stored in a field.
Further fill() operations will rethrow the original exception rather
than returning -1.
Returning -1 to application was causing them to close() with a generic
failure that was triggering the EOFException reported in this issue.
Now applications see the original exception and can close() with the
proper cause.
Re-enabled HostnameVerificationTest that was reproducing this issue
reliably but was @Disabled a while back and never re-enabled.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-09-26 18:30:43 +02:00
Simone Bordet
d12df30df7
Issue #3787 - Jetty client throws EOFException instead of SSLHandshakeException on certificate errors.
...
Code cleanups.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-09-26 18:18:13 +02:00
Joakim Erdfelt
7807eafad9
Updating to version 9.4.22-SNAPSHOT
2019-09-26 10:46:28 -05:00
Joakim Erdfelt
72970db61a
Updating to version 9.4.21.v20190926
2019-09-26 09:59:15 -05:00
Joakim Erdfelt
6ebc7840da
Merge pull request #4021 from eclipse/jetty-10.0.x-remove-deprecations
...
Removing @Deprecated methods / classes from jetty-9.4.x merge
2019-09-24 13:37:54 -05:00
Joakim Erdfelt
cf993e579e
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-09-23 12:07:43 -05:00
Simone Bordet
b3be28086b
Fixes #4113 - HttpClient fails with JDK 13 and TLS 1.3.
...
1. Now forwarding the fillable event rather than assuming that is due
to garbage bytes or by a server close. This ensures that a HTTP read
consumes the TLS bytes and the `NewSessionTicket` message.
2. Avoid to set the `SslConnection` onto the `EndPoint` in
`SslClientConnectionFactory` - this allows upgrades to work properly,
for example when tunnelling through a secure proxy.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-09-23 17:59:37 +02:00
Marc-Olivier Fleury
ebe28c27e4
using computeIfAbsent to avoid the duplicate registering of Destinations in the MBean Server
...
Signed-off-by: Marc-Olivier Fleury <mofleury@gmail.com>
2019-09-20 14:55:45 +02:00
Simone Bordet
d39f19cc23
Issue #2429 - Review HttpClient backpressure semantic.
...
Introduced a Response.DemandedContentListener to explicitly separate
the will to request more content from the notification that the content
has been consumed.
Updated all transports to follow the new semantic: rather than waiting
for the callback to complete before delivering more content, now they
wait for the demand to be positive to deliver more content.
Since now the content may be unconsumed but there can be more demand,
all transport implementation had to be changed to use RetainableByteBuffer
to retain content buffers that were not consumed.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-09-19 17:19:25 +02:00
Simone Bordet
9ee302be68
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-09-12 12:14:46 +02:00
Simone Bordet
8c1e0b0714
Fixes #4082 - Debug logging causes NullPointerException in client.
...
Using BufferUtil to guard against NPEs.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-09-12 12:14:15 +02:00
Simone Bordet
d69a1f0f58
Merged branch 'jetty-10.0.x' into 'jetty-10.0.x-3537-bootstrap_websocket_http2'.
2019-09-12 00:11:01 +02:00
Chris Walker
f7a0156961
Merge 9.4.x
2019-09-05 13:20:19 -04:00
康智冬
3a6b26d292
fix typo ( #4055 )
...
Signed-off-by: KangZhiDong <worldkzd@gmail.com>
2019-09-05 13:17:30 -04:00
Chris Walker
189ba7a671
Merge from 9.4.x
2019-09-02 14:49:33 -04:00
康智冬
49ba6d1acb
fix typo and grammar ( #4045 )
...
Signed-off-by: KangZhiDong <worldkzd@gmail.com>
2019-09-02 14:29:50 -04:00
Joakim Erdfelt
583e443c66
Removing @Deprecated methods / classes from jetty-9.4.x merge
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-08-23 15:53:14 -05:00
olivier lamy
a36af67abf
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-08-22 20:45:57 +10:00
Olivier Lamy
fe3d3f7158
fix checkstyle in test sources ( #4013 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-08-22 19:56:41 +10:00
Simone Bordet
01af85db42
Issue #3537 - Bootstrapping WebSockets with HTTP/2.
...
Implemented upgrade logic for WebSocket over HTTP/2.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-08-14 14:57:21 +02:00
Joakim Erdfelt
f1efc99918
Updating to version 9.4.21-SNAPSHOT
2019-08-13 17:34:20 -05:00
Joakim Erdfelt
84700530e6
Updating to version 9.4.20.v20190813
2019-08-13 16:13:21 -05:00
Simone Bordet
a700907522
Issue #250 - Implement HTTP CONNECT for HTTP/2. ( #3539 )
...
Fixes #250 - Implement HTTP CONNECT for HTTP/2.
Modified HTTP/2 implementation to support the CONNECT method.
Implemented semantic defined by RFC 8441.
Implemented section 8.3 of RFC 7540.
Introduced HTTP2Client.streamIdleTimeout.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-08-13 19:07:04 +03:00
Jan Bartel
b734c373e8
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-07-29 14:34:52 +10:00
Simone Bordet
8431686939
Issue #3883 - Client: support embedding threadlocal data (e.g. distributed tracing data) into the request.
...
Added test case that shows how to do it.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-07-26 14:51:53 +02:00
olivier lamy
6df9ef3a15
Updating to version 10.0.0-SNAPSHOT
2019-07-12 06:54:56 +10:00
olivier lamy
8cbfd51e80
Updating to version 10.0.0-alpha0
2019-07-12 06:54:56 +10:00
olivier lamy
a34e641a27
Updating to version 10.0.0-SNAPSHOT
2019-07-11 17:20:27 +10:00
olivier lamy
2e58f2f515
Updating to version 10.0.0-alpha0
2019-07-11 14:19:45 +10:00
Greg Wilkins
d744d097de
Checkstyle cleanup ( #3847 )
...
* Checkstyle cleanup
* fixed bug from reformat
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-07-03 17:24:08 +02:00
Greg Wilkins
b7a7a53a18
Jetty 10.0.x reformat ( #3812 )
...
* Removing Legacy Method Separators
* Restyling branch `jetty-9.4.x`
* Applying changes highlighted by checkstyle
* Removing Legacy Method Separators
* Restyling branch `jetty-10.0.x`
* Applying checkstyle changes
* Applying checkstyle changes
* Applying XML restyling
* Restyling XML in branch `jetty-10.0.x`
* Fixing XML codestyle for IntelliJ
* Fixing XML style mistakes
* Fixing XML restyling in branch `jetty-10.0.x`
* Revert "Applying XML restyling"
* Updating checkstyle for XML codestyle
* Revert "Restyling XML in branch `jetty-10.0.x`"
# Conflicts:
# jetty-xml/src/test/resources/org/eclipse/jetty/xml/configureWithAttr.xml
# jetty-xml/src/test/resources/org/eclipse/jetty/xml/configureWithElements.xml
* Adding back build-resources
* Reformatting pom.xml files
* Disabling Checkstyle job
* fixed empty string on line wrap
* reformatted with latest intellij style
* misc checkstyle fixes
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-24 17:42:39 +02:00
Greg Wilkins
9706d70484
Jetty 9.4.x reformat ( #3811 )
...
* Removing Legacy Method Separators
* Restyling branch `jetty-9.4.x`
* Applying changes highlighted by checkstyle
* Applying XML restyling
* Fixing XML codestyle for IntelliJ
* Fixing XML style mistakes
* Revert "Applying XML restyling"
* Updating checkstyle for XML codestyle
* Reformatting pom.xml files
* Fixed empty string from line wraps
* Update intellij style to not do expression relative formatting. Reformatted code based on that.
* Increasing line split on Eclipse IDE Formatter to 512
* Restoring setting on internal default value.
+ IntelliJ will not export settings on things that set to their
internal default values.
We want to keep those values as a hedge against future default
value changes in future releases of IntelliJ.
* Fixing intellij codestyle
* do not allow single line simple methods
* misc checkstyle fixes
* re-exported with correct name and all values
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-24 17:40:30 +02:00
Simone Bordet
790051556f
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-06-13 10:03:54 +02:00
Simone Bordet
0b56089327
Merge pull request #3772 from eclipse/jetty-9.4.x-3758-http2_dont_send_empty_trailers
...
Issue #3758 - Avoid sending empty trailer frames for http/2 requests.
2019-06-13 09:35:22 +02:00
Simone Bordet
82f7647629
Issue #3758 - Avoid sending empty trailer frames for http/2 requests.
...
Added one more test case and comments about handling of
`content.isConsumed()` in HTTP/2.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-06-12 19:15:15 +02:00
Simone Bordet
8f53d14e15
Issue #3758 - Avoid sending empty trailer frames for http/2 requests.
...
Modified the sender logic to allow specific subclasses to decide
when to send the trailers, if any.
This allows HTTP/2 to correctly compute the end_stream flag and avoid
sending empty trailers frames with end_stream=true.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-06-12 10:51:15 +02:00
Joakim Erdfelt
ae21126cad
Updating to version 9.4.20-SNAPSHOT
2019-06-10 13:40:17 -05:00
Joakim Erdfelt
afcf563148
Updating to version 9.4.19.v20190610
2019-06-10 11:17:56 -05:00
olivier lamy
d377db5d26
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-05-23 14:18:39 +10:00
Olivier Lamy
f2c59a3cb7
add convenient StringUtil isEmpty method ( #3687 )
...
* add StringUtil.isEmpty
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-05-23 09:01:36 +10:00
Greg Wilkins
b0bc9c9200
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-05-17 16:47:45 +02:00
Joakim Erdfelt
b44ecc932a
Issue #2909 - Replace B64Code with java.util.Base64
...
+ Deprecated B64Code
+ All code that isn't B64CodeTest is now using java.util.Base64
+ B64CodeTest is updated to confirm change to java.util.Base64
is possible without change in behavior. Just have to make
sure you use the appropriate Encoder / Decoder for the task
at hand (default vs mime vs url)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-05-15 10:08:11 +02:00
Joakim Erdfelt
52bb963186
Merge branch `jetty-9.4.x` into `jetty-10.0.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# aggregates/jetty-all-compact3/pom.xml
# jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTest.java
# jetty-deploy/src/test/java/org/eclipse/jetty/deploy/bindings/GlobalWebappConfigBindingTest.java
# jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/HttpClientTest.java
# jetty-http/src/test/java/org/eclipse/jetty/http/HttpParserTest.java
# jetty-http2/http2-alpn-tests/pom.xml
# jetty-http2/http2-http-client-transport/pom.xml
# jetty-infinispan/infinispan-remote-query/src/test/java/org/eclipse/jetty/server/session/infinispan/RemoteQueryManagerTest.java
# jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ConnectHandlerTest.java
# jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java
# jetty-server/src/test/java/org/eclipse/jetty/server/ProxyConnectionTest.java
# jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextTest.java
# jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ErrorPageTest.java
# jetty-servlets/src/test/java/org/eclipse/jetty/servlets/CrossOriginFilterTest.java
# jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipDefaultTest.java
# jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipTester.java
# jetty-servlets/src/test/java/org/eclipse/jetty/servlets/HeaderFilterTest.java
# jetty-servlets/src/test/java/org/eclipse/jetty/servlets/PutFilterTest.java
# jetty-util/src/test/java/org/eclipse/jetty/util/BufferUtilTest.java
# jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceCollectionTest.java
# jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/DecoderReaderManySmallTest.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/DelayedStartClientOnServerTest.java
# jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/DelayedStartClientTest.java
# jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AltFilterTest.java
# jetty-websocket/jetty-websocket-client/src/test/java/org/eclipse/jetty/websocket/client/HttpClientInitTest.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientCloseTest.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/AbstractWebSocketConnection.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/ByteAccumulatorTest.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WSServer.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketServerFactoryTest.java
# jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java
# pom.xml
# tests/jetty-http-tools/src/main/java/org/eclipse/jetty/http/tools/matchers/HttpFieldsMatchers.java
# tests/test-http-client-transport/pom.xml
# tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/ServerTimeoutsTest.java
# tests/test-integration/src/test/java/org/eclipse/jetty/test/support/rawhttp/HttpResponseTesterTest.java
2019-05-01 15:02:31 -05:00
Joakim Erdfelt
5e7426674d
Moving to IPv6 Assumption (from junit Group/Tag)
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-30 14:36:17 -05:00
Joakim Erdfelt
e33dfabba9
Moving to IPv6 Assumption (from junit Group/Tag)
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-30 12:26:14 -05:00
Joakim Erdfelt
734be56938
Updating to version 9.4.19-SNAPSHOT
2019-04-29 16:27:23 -05:00
Joakim Erdfelt
e1bc35120a
Updating to version 9.4.18.v20190429
2019-04-29 15:40:33 -05:00
Joakim Erdfelt
05bb111580
Updating to version 9.4.18-SNAPSHOT
2019-04-18 15:59:49 -05:00
Joakim Erdfelt
aa1c656c31
Updating to version 9.4.17.v20190418
2019-04-18 14:44:28 -05:00
Joakim Erdfelt
5882d63ba7
Updating to version 9.3.28-SNAPSHOT
2019-04-18 13:54:17 -05:00
Joakim Erdfelt
d3e249f869
Updating to version 9.3.27.v20190418
2019-04-18 13:10:03 -05:00
Joakim Erdfelt
2c14d93885
Updating to version 9.2.29-SNAPSHOT
2019-04-18 12:17:07 -05:00
Joakim Erdfelt
1dffa36fe3
Updating to version 9.2.28.v20190418
2019-04-18 11:23:17 -05:00
Joakim Erdfelt
c75136fe63
Merge branch 'release-9.4.16' into jetty-9.4.x
2019-04-18 10:13:20 -05:00
Joakim Erdfelt
3ab1ea3181
Merge branch `jetty-9.2.x` into `jetty-9.3.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTest.java
# jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientURITest.java
# jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/AbstractHttpClientServerTest.java
# jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/HttpClientTest.java
# jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ConnectHandlerTest.java
# jetty-server/src/main/java/org/eclipse/jetty/server/handler/DefaultHandler.java
# jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java
# jetty-spdy/spdy-http-client-transport/src/test/java/org/eclipse/jetty/spdy/client/http/HttpClientTest.java
# jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java
# pom.xml
2019-04-17 16:47:15 -05:00
Joakim Erdfelt
72b4f92280
Updating to tests to protect if IPv6 is unavailable.
...
+ Updating to jetty-test-helper 4.2.1 with new Net.class
+ Assume.assumeTrue(Net.isIpv6InterfaceAvailable());
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-16 18:10:55 -05:00
Joakim Erdfelt
ec34fafc3f
Updating to tests to protect if IPv6 is unavailable.
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-16 17:27:26 -05:00
Joakim Erdfelt
879e161c22
Updating to tests to protect if IPv6 is unavailable.
...
+ Updating to jetty-test-helper 3.1.1 with new Net.class
+ Assume.assumeTrue(Net.isIpv6InterfaceAvailable());
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-16 16:34:12 -05:00
Simone Bordet
d6b6aa4285
Increased connection timeouts.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-04-16 16:38:17 +02:00
Simone Bordet
8e48f516c4
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-04-16 11:50:01 +02:00
Simone Bordet
267991982e
Increased timeouts for tests that connect to external sites.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-04-16 11:43:49 +02:00
Simone Bordet
c7a2d8b7c6
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-04-15 18:22:09 +02:00
Simone Bordet
64549fb19c
Updated Conscrypt to 2.1.0.
...
Tagged tests that connect to external servers as "external".
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-04-15 18:10:21 +02:00
Joakim Erdfelt
79537a5f51
Updating to version 9.4.17-SNAPSHOT
2019-04-11 11:00:24 -05:00
Joakim Erdfelt
e0aa4ae4c0
Updating to version 9.4.16.v20190411
2019-04-11 10:01:26 -05:00
Simone Bordet
c7de2f5b9f
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-04-07 10:56:17 +02:00
Simone Bordet
36700bec50
Merge pull request #3442 from eclipse/jetty-9.4.x-3411-httpclient_timeout_infinite_redirect
...
Fixes #3411 - HttpClient does not timeout during multiple redirection.
2019-04-07 10:48:45 +02:00
olivier lamy
4ad8553fb1
fix format removing extra space
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-04-07 10:06:06 +10:00
Simone Bordet
40c2e76786
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-04-06 13:45:54 +02:00
Simone Bordet
aa7e9ee060
Merge pull request #3474 from eclipse/jetty-9.4.x-3180-review_unixsocket
...
Issue #3180 - Review client support for Unix sockets.
2019-04-06 11:55:29 +02:00
Olivier Lamy
8829602201
Exclude ipv6 tests for ci profile (Jenkins) ( #3528 )
...
* exclude ipv6 test as currently failing on kubernetes, using junit tag and ci profile activated via Jenkinsfile
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* upgrade surefire to 3.0.0-M3
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-04-06 13:27:42 +10:00
Joakim Erdfelt
9b19374c5d
Updating to version 9.2.28-SNAPSHOT
2019-04-03 19:38:05 -05:00
Joakim Erdfelt
84dfe74b97
Updating to version 9.2.27.v20190403
2019-04-03 19:04:45 -05:00
Joakim Erdfelt
c70034766e
Updating to version 9.3.27-SNAPSHOT
2019-04-03 18:46:31 -05:00
Joakim Erdfelt
dae476e369
Updating to version 9.3.26.v20190403
2019-04-03 18:16:32 -05:00
Joakim Erdfelt
2ccde9772b
Undoing bad release-9.3.26
2019-04-03 18:11:16 -05:00
Simone Bordet
a18c2c49f9
Issue #3464 - Split SslContextFactory into Client and Server
...
Fixed a couple of places where Server was used instead of Client.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-04-03 19:24:14 +02:00
Simone Bordet
ec273b7cf0
Fixes after merge.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-04-03 19:13:19 +02:00
Greg Wilkins
9f4b3542cb
Updating to version 9.3.27-SNAPSHOT
2019-04-03 17:32:08 +11:00
Greg Wilkins
7ec6d2fb32
Updating to version 9.3.26.v20190403
2019-04-03 13:06:51 +11:00
Simone Bordet
9c13cf3a52
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-04-02 17:37:56 +02:00
Simone Bordet
6fb243ff6c
Issue #3464 - Split SslContextFactory into Client and Server
...
Introduced SslContextFactory subclasses Client and Server.
Replaced all usages of SslContextFactory with either Client or Server
as required.
Refactored configuration checking so that warnings are not emitted
when non necessary.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-03-21 14:42:42 +01:00
Simone Bordet
bfc5b1fac5
Issue #3180 - Review client support for Unix sockets.
...
Reviewed the implementation.
Got rid of the single channel stored in the HttpClientTransport.
Re-enabled tests on the Unix socket transport.
Updated JNR to 0.22.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-03-19 17:37:12 +01:00
Simone Bordet
ec8a1bdb23
Merge pull request #3313 from eclipse/jetty-10.0.x-1350-dynamic_client_transport
...
Issue #1350 - Dynamic selection of the transport to use based on ALPN on the client side.
2019-03-19 15:31:11 +01:00
Simone Bordet
23da561fec
Fixes #3411 - HttpClient does not timeout during multiple redirection.
...
Updates after review.
Removed special logic to test for same URI redirection,
so it will fall back into the normal case where redirects
are counted against a maximum.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-03-15 09:48:49 +01:00
Simone Bordet
c6617884e8
Issue #1350 - Dynamic selection of the transport to use based on ALPN on the client side.
...
Simplified ProxyProtocolClientConnectionFactory
to use Origin.Address rather than InetSocketAddress.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-03-11 11:11:42 +01:00
Simone Bordet
29913f93bf
Issue #1350 - Dynamic selection of the transport to use based on ALPN on the client side.
...
Added javadocs and small changes after review.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-03-08 17:14:41 +01:00
Simone Bordet
4eb6094f82
Fixes #3411 - HttpClient does not timeout during multiple redirection.
...
Removed timeout after copying the request in case of redirects
(and authentications), to avoid that the timeout listener is
notified of intermediate exchanges and resets the timeout.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-03-07 16:04:18 +01:00
Simone Bordet
aa211b033d
Issue #1350 - Dynamic selection of the transport to use based on ALPN on the client side.
...
Introduced `HttpClientTransportDynamic` to be able to switch transport dynamically.
Refactored other transports and HttpDestination, removing now unnecessary classes.
Introduced ProxyProtocolClientConnectionFactory and used it for testing.
Updated OSGi tests now that jetty-client depends on jetty-alpn-client.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-03-06 10:26:10 +01:00
Greg Wilkins
a652ce20ee
Issue #3012 refactored HttpCompliance
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-03-06 17:20:31 +11:00
Simone Bordet
39d122a9fb
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-02-28 16:58:23 +01:00
Simone Bordet
057575f1cb
Issue #3373 - OutOfMemoryError: Java heap space in GZIPContentDecoder.
...
Modified jetty-client content decoding to be fully non-blocking;
this allows for a better backpressure and less usage of the buffer
pool.
Modified GZIPContentDecoder to aggregate decoded ByteBuffers in
a smarter way that avoids too many data copies and pollution of
the buffer pool with intermediate size buffers.
Removed duplicate test GZIPContentDecoderTest.
Improved javadocs and improved AsyncMiddleManServlet
to release buffers used by the GZIPContentDecoder.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-28 16:11:26 +01:00
Joakim Erdfelt
ddc904f1f6
Merge branch `jetty-9.4.x` into `jetty-10.0.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# VERSION.txt
# aggregates/jetty-all-compact3/pom.xml
# 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-conscrypt-client/pom.xml
# jetty-alpn/jetty-alpn-conscrypt-server/pom.xml
# jetty-alpn/jetty-alpn-java-client/pom.xml
# jetty-alpn/jetty-alpn-java-server/pom.xml
# jetty-alpn/jetty-alpn-openjdk8-client/pom.xml
# jetty-alpn/jetty-alpn-openjdk8-server/pom.xml
# jetty-alpn/jetty-alpn-server/pom.xml
# jetty-alpn/pom.xml
# jetty-annotations/pom.xml
# jetty-ant/pom.xml
# jetty-bom/pom.xml
# jetty-cdi/cdi-2/pom.xml
# jetty-cdi/cdi-core/pom.xml
# jetty-cdi/cdi-full-servlet/pom.xml
# jetty-cdi/cdi-servlet/pom.xml
# jetty-cdi/cdi-websocket/pom.xml
# jetty-cdi/pom.xml
# jetty-cdi/test-cdi-webapp/pom.xml
# jetty-client/pom.xml
# jetty-continuation/pom.xml
# jetty-deploy/pom.xml
# jetty-distribution/pom.xml
# jetty-documentation/pom.xml
# jetty-fcgi/fcgi-client/pom.xml
# jetty-fcgi/fcgi-server/pom.xml
# jetty-fcgi/pom.xml
# jetty-gcloud/jetty-gcloud-session-manager/pom.xml
# jetty-gcloud/pom.xml
# jetty-hazelcast/pom.xml
# jetty-home/pom.xml
# jetty-http-spi/pom.xml
# jetty-http/pom.xml
# jetty-http2/http2-alpn-tests/pom.xml
# jetty-http2/http2-client/pom.xml
# jetty-http2/http2-common/pom.xml
# jetty-http2/http2-hpack/pom.xml
# jetty-http2/http2-http-client-transport/pom.xml
# jetty-http2/http2-server/pom.xml
# jetty-http2/pom.xml
# jetty-infinispan/pom.xml
# jetty-io/pom.xml
# jetty-jaas/pom.xml
# jetty-jaspi/pom.xml
# jetty-jmh/pom.xml
# jetty-jmh/src/main/java/org/eclipse/jetty/http/jmh/MultiPartBenchmark.java
# jetty-jmx/pom.xml
# jetty-jndi/pom.xml
# jetty-jspc-maven-plugin/pom.xml
# jetty-maven-plugin/pom.xml
# jetty-memcached/jetty-memcached-sessions/pom.xml
# jetty-memcached/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/pom.xml
# jetty-osgi/test-jetty-osgi-context/pom.xml
# jetty-osgi/test-jetty-osgi-fragment/pom.xml
# jetty-osgi/test-jetty-osgi-server/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-spring/pom.xml
# jetty-start/pom.xml
# jetty-unixsocket/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-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/AbstractJsrRemote.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/ClientContainer.java
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/annotations/JsrCallable.java
# jetty-websocket/javax-websocket-server-impl/pom.xml
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/OnPartialTest.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/SessionTrackingTest.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/samples/echo/ConfiguredEchoSocket.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/samples/echo/LargeEchoAnnotatedSocket.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/samples/echo/LargeEchoConfiguredSocket.java
# jetty-websocket/jetty-websocket-tests/pom.xml
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/CloseTrackingEndpoint.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/BadNetworkTest.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientCloseTest.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientOpenSessionTracker.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientSessionsTest.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientWriteThread.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/SlowClientTest.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/ContainerEndpoint.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/ServerCloseCreator.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/ServerCloseTest.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/SlowServerTest.java
# jetty-websocket/jetty-websocket-tests/src/test/resources/jetty-logging.properties
# jetty-websocket/pom.xml
# jetty-websocket/websocket-api/pom.xml
# jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/StatusCode.java
# jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/WriteCallback.java
# jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/extensions/IncomingFrames.java
# jetty-websocket/websocket-client/pom.xml
# jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java
# jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketUpgradeRequest.java
# jetty-websocket/websocket-client/src/test/resources/jetty-logging.properties
# jetty-websocket/websocket-common/pom.xml
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/LogicalConnection.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/Parser.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketRemoteEndpoint.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/AbstractEventDriver.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/EventDriver.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/JettyAnnotatedEventDriver.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/AbstractExtension.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/ExtensionStack.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/identity/IdentityExtension.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/AbstractWebSocketConnection.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/FrameFlusher.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/FramePipes.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/scopes/DelegatedContainerScope.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/scopes/SimpleContainerScope.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/scopes/WebSocketContainerScope.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ClosePayloadParserTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/GeneratorParserRoundtripTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ParserTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/PingPayloadParserTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/RFC6455ExamplesParserTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/TextPayloadParserTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/WebSocketRemoteEndpointTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase1_1.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase1_2.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase2.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase7_3.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/events/EventDriverTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/DummyIncomingFrames.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/DeflateFrameExtensionTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/io/FrameFlusherTest.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/io/LocalWebSocketConnection.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/test/BlockheadClient.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/test/BlockheadConnection.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/test/DummyConnection.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/test/IncomingFramesCapture.java
# jetty-websocket/websocket-server/pom.xml
# jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/IdleTimeoutTest.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/SimpleServletServer.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketProtocolTest.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/ABSocket.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/examples/echo/BigEchoSocket.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/RFCSocket.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/SessionSocket.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/misbehaving/MisbehavingClassTest.java
# jetty-websocket/websocket-server/src/test/resources/jetty-logging.properties
# jetty-websocket/websocket-servlet/pom.xml
# jetty-xml/pom.xml
# pom.xml
# tests/pom.xml
# tests/test-continuation/pom.xml
# tests/test-distribution/pom.xml
# tests/test-http-client-transport/pom.xml
# tests/test-integration/pom.xml
# tests/test-jmx/jmx-webapp-it/pom.xml
# tests/test-jmx/jmx-webapp/pom.xml
# tests/test-jmx/pom.xml
# tests/test-loginservice/pom.xml
# tests/test-quickstart/pom.xml
# tests/test-sessions/pom.xml
# tests/test-sessions/test-file-sessions/pom.xml
# tests/test-sessions/test-gcloud-sessions/pom.xml
# tests/test-sessions/test-hazelcast-sessions/pom.xml
# tests/test-sessions/test-infinispan-sessions/pom.xml
# tests/test-sessions/test-infinispan-sessions/src/test/java/org/eclipse/jetty/server/session/ClusteredSessionScavengingTest.java
# tests/test-sessions/test-jdbc-sessions/pom.xml
# tests/test-sessions/test-memcached-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-http2-webapp/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-simple-webapp/pom.xml
# tests/test-webapps/test-webapp-rfc2616/pom.xml
2019-02-28 08:26:58 -05:00
Olivier Lamy
c3719b2bab
Add jdk12 build in Jenkinsfile ( #3376 )
...
* add jdk12 build stage
* test last release of infinispan for jdk12 build
* fix upperBound dependency for jboss logging
* upgrade juniper to 5.4.0 and disable infinispan test if JRE.JAVA_12
* Fixed annotations to exclude any JDK > 11 for 3 tests.
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-27 12:37:21 +10:00
Joakim Erdfelt
9cdb59d4d7
Updating to version 9.4.16-SNAPSHOT
2019-02-15 13:35:15 -05:00
Joakim Erdfelt
eb70b24016
Updating to version 9.4.15.v20190215
2019-02-15 11:53:00 -05:00
Simone Bordet
92417c0954
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-13 15:19:09 +01:00
Simone Bordet
ec3adb0c11
Issue #3350 - Do not expect to be able to connect to https URLs with the HttpClient created from a parameterless constructor.
...
This is a regression introduced by fixing #2817 .
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-13 09:37:05 +01:00
Simone Bordet
477d7cf1da
Merge pull request #3342 from eclipse/jetty-10.0.x-3320-review_module_info
...
Fixes #3320 - Review Jetty 10 module-info.java.
2019-02-12 21:51:36 +01:00
olivier lamy
0ef58dd42e
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-02-11 17:47:50 +10:00
Simone Bordet
b9f89af847
Fixes #3320 - Review Jetty 10 module-info.java.
...
Reviewed module-info.java files.
For those that have a "requires static" added a comment about
why the dependency is optional.
Rearranged directives in alphabetical order.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-08 17:30:27 +01:00
Simone Bordet
d575091c08
Fixes #3178 - BufferingResponseListener does not clear buffer in onHeaders.
...
Updated javadocs to specify that the class is not reusable.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-08 13:35:40 +01:00
Simone Bordet
e2506d4811
Merge pull request #3168 from eclipse/jetty-10.0.x-3162_jetty_servlet_api
...
Issue #3162 - Use Jetty specific Servlet API jar.
2019-02-07 17:33:14 +01:00
Simone Bordet
6d44b13945
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-02-07 10:44:40 +01: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
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
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
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
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
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
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
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
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
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
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
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
Simone Bordet
20f438d43a
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-01-22 17:44:06 +01:00
Simone Bordet
e135de98fa
Issue #132 - ClientConnector abstraction.
...
Rewrote HttpClientTransportOverUnixSockets in light of ClientConnector.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-01-22 17:33:29 +01:00
Simone Bordet
6c4ee083be
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-01-17 10:43:03 +01:00
olivier lamy
63f2023e05
happy new year!!
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-01 12:17:53 +10:00
Olivier Lamy
9b7afd8a03
Happy new year!! ( #3232 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-01 11:52:16 +10:00
Olivier Lamy
0dcdcc7baf
Jetty 10.0.x fix surefire arg line (to avoid locale dependent build) ( #3183 )
...
* surefire.argLine replaced by jetty.surefire.argLine
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-06 09:09:06 +10:00
olivier lamy
c0655ce634
Revert "fix argLine inheritance ( #3177 )"
...
This reverts commit 3e6ab2d1ac
.
2018-12-03 13:25:00 +10:00
Olivier Lamy
3e6ab2d1ac
fix argLine inheritance ( #3177 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-03 11:20:20 +10:00
Simone Bordet
bfa2dbf68c
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>
2018-11-29 16:51:29 +01:00
Simone Bordet
5f972b451c
Jetty 10.0.x 2978 add module info ( #3120 )
...
Fixes #2978 - Add module-info to relevant Jetty modules.
Added module-info.java for Jetty modules that are not test modules.
Moved jetty-http test utility classes to new module "jetty-http-tools".
Removed generation of test-jar from websocket-core.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-11-22 12:37:35 +01:00
Joakim Erdfelt
21f66bb972
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-11-21 10:45:05 -06:00
Greg Wilkins
041e8fd9cf
Issue #3038 SSL Connection Leak
...
Don't call handleContentMessage after content call if the content call
returns true.
This is a slight bending of the parser contract to work around the current
client interpretation that a true return will prevent other events from being
delivered.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-21 17:28:40 +01:00
Greg Wilkins
7dcc9d2829
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-11-20 14:10:52 +01:00
Greg Wilkins
8c4ee8496f
Jetty 9.4.x 3038 ssl connection leak ( #3121 )
...
Issue #3038 - SSL connection leak.
Fixed SSL spin caused when fill had NEED_WRAP, but a flush/wrap
produced 0 bytes and stayed in NEED_WRAP
Removed check of isInputShutdown prior to filling that allowed EOF to
overtake data already read.
Fix for leak by shutting down output in HttpConnection if
filled -1 and the HttpChannelState was no longer processing
current request.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-20 13:53:42 +01:00
Joakim Erdfelt
29fd18e046
Updating to version 9.4.15-SNAPSHOT
2018-11-14 16:42:40 -06:00
Joakim Erdfelt
c4550056e7
Updating to version 9.4.14.v20181114
2018-11-14 15:19:10 -06:00
Simone Bordet
aaa9a1e410
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2018-11-13 18:12:16 +01:00
Simone Bordet
f2ed692a1b
Merge pull request #3099 from eclipse/jetty-9.4.x-HttpClient-dump-improvements
...
Fixes Issue #3103 - HttpClient buffer leak found by dump improvements
The leak problem was an additional, unnecessary, call retain() in ResponseNotifier.notifyContent() that was leaking `ByteBuffer`s.
2018-11-13 18:04:17 +01:00
Greg Wilkins
25914e4776
Issue #3103
...
use consumer to configure test HttpClient
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-13 17:15:59 +01:00
Greg Wilkins
d1f52d1534
Issue #3103
...
review results
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-13 16:57:26 +01:00
Greg Wilkins
78a775396e
Issue #3103
...
delay setting transport.setHttpClient until late in doStart
Do not add DumpableCollection as a bean
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-13 16:52:04 +01:00