7ebf673ad3
fix merge for DemoBaseTests.testSessionDump() to Jetty 10
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-11-28 10:37:54 +11:00
e8746ecf44
Merge pull request #4371 from lachlan-roberts/jetty-10.0.x-4368-MultiPartsReview
...
Issue #4368 - remove MultiParts interface and simplify MultiPart cleanup
2019-11-28 09:59:10 +11:00
4af28579f0
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-11-27 05:52:44 -06:00
380cebc3bb
Merge pull request #4337 from eclipse/jetty-9.4.x-4329-rewrite-rules-demobase
...
Issue #4329 - Fixing RuleContainer to handle path parameters
2019-11-27 05:52:15 -06:00
15c9f0bfc2
Issue #4329 - Cleaning up SessionDump
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-11-27 05:51:39 -06:00
de3ff4726e
Merge pull request #4336 from eclipse/jetty-9.4.x-2195-jvm-arg-expansion
...
Fixes #2195 - Jetty start.jar can expand properties in JVM Args now
2019-11-27 05:47:12 -06:00
76bb8d2327
Issue #4368 directly use MultiPartFormInputStream instead of MultiParts
...
MultiPart cleanup is now done in Request.onCompleted()
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-11-27 17:20:01 +11:00
6988c4feaa
Issue #4368 - make MultiParts a class instead of interface
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-11-27 15:35:21 +11:00
02bb5affd9
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-11-27 15:32:04 +11:00
c440a3f972
Issue #4363 Restore contextXml config for jetty maven plugin ( #4367 )
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-11-27 14:56:59 +11:00
9dbdb97529
Merge pull request #4324 from eclipse/jetty-10.0.x-4315-OnlyStopWSSessionsOnce
...
Issue #4315 - stop WebSocketSessions only after onClose
2019-11-27 14:24:31 +11:00
2410f9d6c4
Issue #4315 - Jetty and Javax WebSocketSessions are no longer LifeCycles
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-11-27 13:51:14 +11:00
149ac97b6f
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-11-27 11:58:12 +11:00
cfd21864cf
Issue #4350 Remove exclude of MultiInputStreamParser from jetty-util osgi ( #4356 )
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-11-27 11:45:33 +11:00
80da9e22db
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-11-27 10:09:37 +10:00
dc1a3384b0
ooops typo
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-11-27 07:18:59 +10:00
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
c4791d8a58
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-11-26 14:15:47 -06:00
19e740451a
Bump up jetty-version-maven-plugin to version 2.6
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-11-26 14:15:23 -06:00
2777229867
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
# build-resources/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/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/infinispan-common/pom.xml
# jetty-infinispan/infinispan-embedded-query/pom.xml
# jetty-infinispan/infinispan-embedded/pom.xml
# jetty-infinispan/infinispan-remote-query/pom.xml
# jetty-infinispan/infinispan-remote/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-openid/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/test/java/org/eclipse/jetty/server/ErrorHandlerTest.java
# 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/pom.xml
# jetty-websocket/javax-websocket-server/pom.xml
# jetty-websocket/jetty-websocket-api/pom.xml
# jetty-websocket/jetty-websocket-common/pom.xml
# jetty-websocket/jetty-websocket-server/pom.xml
# jetty-websocket/jetty-websocket-tests/pom.xml
# jetty-websocket/pom.xml
# jetty-websocket/websocket-core/pom.xml
# jetty-websocket/websocket-servlet/pom.xml
# jetty-xml/pom.xml
# pom.xml
# tests/jetty-jmh/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-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-cdi-common-webapp/pom.xml
# tests/test-webapps/test-felix-webapp/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-owb-cdi-webapp/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
# tests/test-webapps/test-weld-cdi-webapp/pom.xml
2019-11-26 10:46:22 -06:00
5d7f7d6499
Merge branch 'release-9.4.24' into jetty-9.4.x
2019-11-26 10:31:28 -06:00
efe76ff2e0
Issue #4152 - fragment outgoing frames before the ExtensionStack ( #4232 )
...
* Added FragmentingFlusher to abstract the fragmentation of frames.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
* Handle failure case of Fragmenting Flusher
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
* Fragment outgoing frames before the ExtensionStack
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
* update javadoc
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
* separate frame size validation for incoming and outgoing frames
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
* fix test
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
* reimplement FragmentingFlusher with the new TransformingFlusher
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-11-26 14:51:40 +11:00
3b7400b3f7
rerunFailingTestsCount only for Jenkins
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-11-25 16:09:39 +10:00
fed9479ffd
Merge pull request #4348 from eclipse/jetty-9.4.x-995-encodeString
...
Issue #995 - UrlEncoded.encodeString should not encode unreserved characters
2019-11-25 08:54:57 +11:00
668cd86283
Issue #995 - UrlEncoded.encodeString should not encode unreserved chars
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-11-22 17:50:28 +11:00
2dbd19f902
Merge pull request #4343 from eclipse/jetty-10.0.x-4342-OpenIdHttpClient
...
Issue #4342 - fix creation of HttpClient in jetty-openid.xml for jetty10
2019-11-22 08:58:48 +11:00
11adf00338
Issue #2634 fix occasional exception stack trace in UnixSocketTest ( #4339 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-11-21 17:16:08 +10:00
07680b4bb2
Issue #2634 fix occasional exception stack trace in UnixSocketTest ( #4339 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-11-21 17:04:16 +10:00
091c6f22e6
Issue #4342 - fix creation of HttpClient in jetty-openid.xml for jetty10
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-11-21 16:00:40 +11:00
0f7a3b2d91
Updating to version 9.4.25-SNAPSHOT
2019-11-20 16:08:38 -06:00
217602e97f
Issue #4334 - Enhancing JSON Test
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-11-20 15:48:22 -06:00
363d5f2df3
Updating to version 9.4.24.v20191120
2019-11-20 15:25:01 -06:00
ba1fe2826d
Merge pull request #4335 from eclipse/jetty-9.4.x-improve-error-handler-output
...
Issue #4334 - Improve testing of ErrorHandler behavior
2019-11-20 15:21:07 -06:00
09641c9581
Issue #4329 - Fixing RuleContainer to handle path parameters
...
+ Introducing HttpURI.setParam(String)
+ Updating DemoBaseTest.testSessionDump() to follow expected behavior
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-11-20 14:09:44 -06:00
cf0df6e3ff
Issue #4334 - Improve testing of ErrorHandler behavior
...
+ Cleanup from PR review
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-11-20 13:17:17 -06:00
5798471966
Fixes #2195 - Jetty start.jar can expand properties in JVM Args now
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-11-20 10:54:59 -06:00
cba60d2e37
Fixing typo in stalebot message
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-11-20 09:58:44 -06:00
87eefa344a
Fixes #3083 - Aligning default in ini to XML default
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-11-20 09:54:24 -06:00
9e40fc9a6f
Issue #4334 - Improve testing of ErrorHandler behavior
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-11-20 09:47:33 -06:00
c34faa125f
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
# build-resources/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/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/infinispan-common/pom.xml
# jetty-infinispan/infinispan-embedded-query/pom.xml
# jetty-infinispan/infinispan-embedded/pom.xml
# jetty-infinispan/infinispan-remote-query/pom.xml
# jetty-infinispan/infinispan-remote/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-openid/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/pom.xml
# jetty-websocket/javax-websocket-server/pom.xml
# jetty-websocket/jetty-websocket-api/pom.xml
# jetty-websocket/jetty-websocket-common/pom.xml
# jetty-websocket/jetty-websocket-server/pom.xml
# jetty-websocket/jetty-websocket-tests/pom.xml
# jetty-websocket/pom.xml
# jetty-websocket/websocket-core/pom.xml
# jetty-websocket/websocket-servlet/pom.xml
# jetty-xml/pom.xml
# pom.xml
# tests/jetty-jmh/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-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-cdi-common-webapp/pom.xml
# tests/test-webapps/test-felix-webapp/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-owb-cdi-webapp/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
# tests/test-webapps/test-weld-cdi-webapp/pom.xml
2019-11-20 07:16:38 -06:00
dc03431de2
Merge branch 'release-9.4.23' into jetty-9.4.x
2019-11-20 07:14:53 -06:00
cff6bb444a
Issue #4128 - test the decoding of OpenId Credentials ( #4166 )
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-11-20 14:23:19 +11:00
4d1031899e
Issue #4329 - New testcase for demo-base /test/session/
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-11-19 14:17:56 -06:00
89fe1c38ef
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-11-19 17:09:40 +01:00
d44a6935ef
Issue #4331 - Improve handling of HttpOutput.close() for pending writes.
...
Added test case that verifies the current behavior (abort the response
in case complete() is called with a pending write()).
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-11-19 17:09:04 +01:00
ba30800f66
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-11-19 21:27:30 +10:00
9ab6a073fa
we do not need those repositories now
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-11-19 20:28:43 +10:00
04dc257641
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-11-19 10:50:31 +01:00
e89e8ae16e
Improved toString() for ConnectionPool implementations.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-11-19 10:43:09 +01:00
cef80aca2e
Revert "jetty-websocket-tests code cleanup"
...
This reverts commit 044a899a99
2019-11-19 19:14:54 +11:00
Lachlan Roberts
Joakim Erdfelt
Jan Bartel
olivier lamy
Simone Bordet