c6633e8d67
fixed bad merge
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-12-04 15:32:28 +11:00
806953f1b5
Merge branch 'jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-12-03 10:08:15 -06:00
a5e31dce20
Merge pull request #4386 from eclipse/jetty-9.4.x-4385-sslcontextfactory-sni-noexception
...
Issue #4385 - Limit new UnsupportedOperationException to direct SslContextFactory usage
2019-12-03 10:05:56 -06:00
5545e906f0
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-12-03 12:52:29 +11:00
db9ad2fcec
Issue #4323 Ensure QoSFilter handles IllegalStateException ( #4372 )
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-12-03 12:16:24 +11:00
f99eb29195
Issue #4369 Update jsp documenation; remove old config from webdefault.xml ( #4384 )
...
* Issue #4369 Update jsp documenation; remove old config from webdefault.xml
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-12-03 12:15:02 +11:00
d1376c71eb
Issue #4385 - Correcting exception variable name.
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-12-02 16:02:18 -06:00
65738e770f
Issue #4385 - Fixing client testcase assertion
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-12-02 16:00:37 -06:00
85cda88b40
Issue #4376 Async Content Complete ( #4377 )
...
* Issue #4376 Async Content Complete
Added test harness to reproduce unready completing write.
Fixed test by not closing output prior to becoming READY
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4376 Async Content Complete
ERROR state still needs to be closed!
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4376 Async Content Complete
close after last blocking write
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4376 Async Content Complete
If completion has to do a flush, then we need a call to closed to
avoid leaking buffers.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4376 Async Content Complete
Reformat
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-12-03 08:50:36 +11:00
c0f8a46c35
Merge branch 'jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunDistro.java
2019-12-02 15:29:30 -06:00
d99ae19201
Merge pull request #4290 from eclipse/jetty-9.4.x-4269-restore-PrintWriter-contract
...
Issue #4269 - Restoring PrintWriter contract on errors
2019-12-02 15:22:22 -06:00
c9a65c4676
Allow building against newest version of maven-artifact-transfer ( #4381 )
...
In later versions of maven-artifact-transfer the package names have
been refactored, this change accomodates for that.
Signed-off-by: Mat Booth <mat.booth@redhat.com>
2019-12-03 07:08:01 +10:00
5b1f9d5f15
Issue #4385 - Client no longer needs override.
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-12-02 12:15:02 -06:00
816e34bddf
Issue #4385 - Base Class usage now is a WARN logging event in SNI usage
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-12-02 12:13:13 -06:00
e1d64af578
Issue #4385 - Minimize impact of deprecated SNI mode on base class
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-12-02 12:00:21 -06:00
666ee4ef60
Issue #4385 - Remove UnsupportedOperationException in SslContextFactory
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-12-02 10:57:15 -06:00
60f00d43c8
Restoring date of release 10.0.0-alpha0
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-12-02 10:23:18 -06:00
10736f332b
Merge branch 'release-10.0.0.alpha1' into jetty-10.0.x
2019-12-02 10:21:37 -06:00
afb81ed738
Issue #4349 - test client negotiation of internal extensions ( #4355 )
...
Added tests for WebSocket client negotiation of requested internal extensions. Changed the algorithm to remove from the requested list rather than add to the negotiated one.
Fixed other issues with the parsing of ExtensionConfig not giving correct errors for invalid content.
2019-12-02 08:45:32 +11:00
b4fa776b50
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-11-29 11:13:32 +01:00
acbc87a5da
Issue #4341 - do not modify payload ByteBuffer sending WebSocket frames ( #4359 )
...
- test that Frame buffer is unchanged after sending
- Generator and FrameFlusher no longer modify frame payload
- permessage-deflate no longer modify frame payload
- remove Buffer allocation from Generator
- outgoing autoFragment no longer modifies buffer
- minor cleanups and optimizations from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-11-29 08:41:20 +11:00
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
d7cf3729a5
Merge pull request #4354 from eclipse/jetty-9.4.x-4351-lazy-servlet-init-not-atomic
...
Issue #4351 Lazy servlet init is not atomic
2019-11-28 11:44:38 +01:00
dc0fac5806
Issue #4351 - Lazy servlet init is not atomic.
...
Code cleanup.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-11-28 11:07:24 +01:00
e9c3eb0d73
remove duplicate TestFrameHandler from websocket core tests
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-11-28 14:27:00 +11:00
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
07efbb728d
Issue #4351 Lessen wait times.
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-11-28 09:34:39 +11:00
a6cdec548c
Revert "Issue #4351 Found simpler test"
...
This reverts commit 5bc6593337
2019-11-28 09:16:14 +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
a7fbe7a6bb
Updating to version 10.0.0-SNAPSHOT
2019-11-26 17:22:06 -06:00
57e5cd8a4d
Updating to version 10.0.0.alpha1
2019-11-26 16:44:13 -06: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
Greg Wilkins
Joakim Erdfelt
Jan Bartel
Mat Booth
Lachlan
Simone Bordet
olivier lamy