Jesse McConnell
2720868475
Updating to version 9.4.12.v20180830
2018-08-30 08:56:44 -05:00
Greg Wilkins
5afe2e215f
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-08-23 17:17:46 +10:00
Joakim Erdfelt
ce6bc23ccb
Issue #2817 - Client SSL Defaults
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-08-16 14:35:39 -05:00
Joakim Erdfelt
a107ac3b8a
Ensure Client ContainerProvider behavior is reset properly.
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-08-10 11:14:10 -05:00
Kazuhiro Sera
96218e8bc4
Fix typos detected by github.com/client9/misspell
...
Signed-off-by: Kazuhiro Sera <seratch@gmail.com>
2018-08-10 23:52:16 +09:00
Simone Bordet
ee68e7fdec
Merge pull request #2769 from eclipse/jetty-9.4.x-issue-2767-websocket-client-default-policy
...
Issue #2767 - WebSocket Policy on JSR356 ClientContainer not represented correctly
2018-08-08 13:02:09 +02:00
WalkerWatch
ab3f4832ad
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-08-07 21:47:02 -04:00
WalkerWatch
e485b8d78d
Fixing second typo for #2781
2018-08-07 21:45:38 -04:00
WalkerWatch
b249021b6d
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-08-07 21:18:25 -04:00
WalkerWatch
997106b5d4
Resolves #2781 - Typo in javadoc
2018-08-07 21:17:29 -04:00
Joakim Erdfelt
9a4b780781
Issue #2767 - WebSocket Policy on JSR356 ClientContainer not represented correctly
...
+ Added Client unit tests for large messages
+ Re-enabled Server unit tests for large messages
+ Added more Server unit tests for large messages
+ In case of JSR356 Server with policy (and Behavior of SERVER)
is controlling javax.websocker.server.ServerContainer
and a user chooses to use that ServerContainer to
connect to a remote websocket endpoint (using ServerContainer
as a client), then the policy is delegated down to the
Client Container with a different behavior (only).
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-08-06 15:21:22 -05:00
Joakim Erdfelt
9390c2df3f
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-08-06 09:04:58 -05:00
Joakim Erdfelt
586484850f
Issue #2768 - JSR356 Session.getUserProperties() is null during @OnOpen
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-08-02 09:16:34 -05:00
Simone Bordet
0892ed8983
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2018-07-18 16:25:39 +02:00
Clément Delgrange
51769fc645
Fixes #2694 - Dynamic imports of Websocket servlet
...
Fixes the dynamic imports of `org.eclipse.jetty.websocket.server` and `org.eclipse.jetty.websocket.server.pathmap` as explained in the issue #2694 proposition 2. (previously the content of `org.eclipse.jetty.websocket.server` was not imported)
Signed-off-by: Clément Delgrange <cl.delgrange@protonmail.com>
2018-07-12 11:55:59 +02:00
Joakim Erdfelt
0b69f00665
Updating to version 9.4.12-SNAPSHOT
2018-07-11 17:32:16 -05:00
Joakim Erdfelt
260596dd10
Updating to version 9.4.12.RC0
2018-07-11 16:30:55 -05:00
Joakim Erdfelt
4204187eae
Fixing compilation error
2018-07-03 12:31:12 -05:00
Joakim Erdfelt
30f6132117
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-07-03 10:55:22 -05:00
Joakim Erdfelt
33c497a883
Issue #2683 - FrameFlusher.toString() isn't thread safe
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-06-27 07:06:38 -05:00
Joakim Erdfelt
2e5f106285
Issue #2655 - Applying changes requested from review.
...
+ WebSocketClient all constructors now delegate down into one
implementation
+ NativeWebSocketServletConfiguration is now managed properly
+ WebSocketServletFactory can find Executor as bean too
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-06-20 12:59:23 -05:00
Joakim Erdfelt
870c87f2f7
Issue #2655 - Removing closed WebSocket Session's from WebSocketClient
...
+ Correcting Native WebSocketConfiguration impact.
+ CDI requires a customized DecoratedObjectFactory, which is bound
later in the lifecycle, which means we cannot rely on it being
provided directly in the constructors, but rather have to look
for it in the ServletContext.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-06-13 16:53:14 -05:00
Greg Wilkins
346879f2a5
Merge pull request #2664 from mperktold/jetty-9.4.x
...
Issue #2662 Unnecessary boxing conversions
2018-06-13 22:52:27 +02:00
Matthias Perktold
f901efc413
Issue #2662 - Unnecessary boxing conversions
...
Signed-off-by: Matthias Perktold <tias251@gmail.com>
2018-06-13 16:20:12 +02:00
Joakim Erdfelt
591b0a2e37
Post-Merge build fixes
2018-06-12 12:54:41 -05:00
Joakim Erdfelt
0cd4dacbac
Merge remote-tracking branch 'origin/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-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-server/src/main/config/etc/jetty-http.xml
# jetty-server/src/main/config/etc/jetty-ssl.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-util/src/main/java/org/eclipse/jetty/util/MultiException.java
# jetty-util/src/test/java/org/eclipse/jetty/util/MultiExceptionTest.java
# jetty-webapp/pom.xml
# jetty-websocket/javax-websocket-client-impl/pom.xml
# jetty-websocket/javax-websocket-server-impl/pom.xml
# jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/AnnotatedServerEndpointConfig.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/TrackingSocket.java
# jetty-websocket/pom.xml
# jetty-websocket/websocket-api/pom.xml
# jetty-websocket/websocket-client/pom.xml
# jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ClientCloseTest.java
# jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ClientConnectTest.java
# jetty-websocket/websocket-common/pom.xml
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/ByteAccumulator.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/CompressExtension.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/WebSocketRemoteEndpointTest.java
# jetty-websocket/websocket-server/pom.xml
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketUpgradeFilterTest.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/misbehaving/MisbehavingClassTest.java
# jetty-websocket/websocket-servlet/pom.xml
# jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/extensions/FragmentExtensionTest.java
# jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/jsr356/sockets/pong/PongContextListener.java
# jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/jsr356/ConfiguratorTest.java
# jetty-xml/pom.xml
# pom.xml
# tests/pom.xml
# tests/test-continuation/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-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-webapp-rfc2616/pom.xml
2018-06-12 11:11:38 -05:00
Joakim Erdfelt
e4bfe00dce
Updating to version 9.4.12-SNAPSHOT
2018-06-05 14:18:37 -05:00
Joakim Erdfelt
d5fc0523cf
Updating to version 9.4.11.v20180605
2018-06-05 13:23:02 -05:00
Simone Bordet
d846414c66
Issue #2625 - Test failure: websocket.client/ClientCloseTest.testStopLifecycle.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-06-05 20:09:31 +02:00
Joakim Erdfelt
1269419b32
Issue #2603 - Improving ByteAccumulator max size calc
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-05-31 07:21:03 -05:00
Joakim Erdfelt
277912864f
Issue #2604 - Improving ByteAccumulator testing and errors
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-05-31 07:20:16 -05:00
Simone Bordet
b75a2df679
Issue #2605 - Failing test: WebSocketUpgradeFilterTest.testStopStartOfHandler
...
Ignored for now.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-05-30 17:34:16 +02:00
Lachlan Roberts
903803c30e
Issue #2584 - changes from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-05-30 14:26:54 +10:00
Lachlan Roberts
69aaabac24
fixes to printed exception stack traces in tests
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-05-29 17:55:14 +10:00
Lachlan Roberts
52ffe24389
Merge remote-tracking branch 'eclipse/jetty-9.4.x' into jetty-9.4.x-stackTraceRemoval
2018-05-29 10:57:51 +10:00
Joakim Erdfelt
a6547eaf83
Issue #2559 - Use Configurator declared in ServerEndpointConfig over @ServerEndpoint annotation
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-05-25 06:29:33 -05:00
Lachlan Roberts
0ebe50ae8b
Issue #2567 - Switched order of StacklessLogging and request sending to prevent logging the stack trace
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-05-24 16:16:08 +10:00
Lachlan Roberts
fe9bfda2c3
Issue #2567 - Unreachable Code in MisbehavingClassTest
...
Reworked MisbehavingClassTest to fix sections of unreachable code causing exception stack traces to be logged.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-05-24 10:15:47 +10:00
Joakim Erdfelt
bc16b6efae
Issue #2559 - Use Configurator declared in ServerEndpointConfig over @ServerEndpoint annotation
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-05-22 09:44:20 -05:00
Simone Bordet
7a7aa0f1b1
Fixes #2536 - Broken ClientConnectTest.testConnectionTimeout_Concurrent.
...
Using try-with-resources to keep the Socket instance
from being GCd before the test finishes.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-05-16 14:48:05 +02:00
Simone Bordet
804b770581
Issue #2536 - Broken ClientConnectTest.testConnectionTimeout_Concurrent.
...
Updated the code to show more information when it fails.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-05-16 14:25:14 +02:00
Joakim Erdfelt
1732ffca51
Updating to version 9.4.11-SNAPSHOT
2018-05-03 11:48:05 -05:00
Joakim Erdfelt
daa59876e6
Updating to version 9.4.10.v20180503
2018-05-03 10:55:19 -05:00
Joakim Erdfelt
d20e19af77
Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x
2018-05-02 13:38:58 -05:00
Joakim Erdfelt
57b9f2ef22
Minor typo
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-04-27 08:27:31 -05:00
Joakim Erdfelt
76dec16fde
Issue #2491 - minor revert based on review
2018-04-26 16:12:29 -05:00
Joakim Erdfelt
c596fcaac1
Issue #2491 - FragmentExtension produces out of order frames
...
+ Adding testcase to ensure no regression
+ All data frames that arrive, are now sent through the
IteratingCallback to ensure that that input frame order
is preserved.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-04-26 12:54:15 -05:00
Joakim Erdfelt
440d89750a
Track frameCount for tests now
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-04-26 12:51:49 -05:00
Joakim Erdfelt
5d83d98e96
AbstractExtension properly handles Callback error now
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-04-26 12:51:18 -05:00
Joakim Erdfelt
9b8540aef4
OpCode.isDataFrame(byte) missing CONTINUATION
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-04-26 12:50:32 -05:00
