Joakim Erdfelt
5ef5ec6c28
Fixing build
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-10-02 16:48:54 -05:00
Joakim Erdfelt
b4960f36e5
Removing javadoc:aggregate for release script
2019-10-02 16:14:13 -05:00
Joakim Erdfelt
7a6b5f6752
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-10-02 14:43:26 -05:00
Joakim Erdfelt
c19d33dc59
Merge pull request #4149 from eclipse/jetty-9.4.x-4121-qtp-threadfactory
...
Issue #4121 - ThreadFactory support in QTP
2019-10-02 14:43:08 -05:00
Joakim Erdfelt
b022cffce0
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-10-02 13:49:47 -05:00
Joakim Erdfelt
ed9031bd30
Merge pull request #4143 from eclipse/jetty-9.4.x-4141-classcastexception-request-async
...
Fixes #4141 - Servlet not async + async Filter + wrapped request
2019-10-02 13:49:21 -05:00
Joakim Erdfelt
b121ba786b
Issue #4121 - Tests for ThreadFactory support in QTP
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-10-02 13:37:22 -05:00
Joakim Erdfelt
b82b337e8e
Merge branch 'jetty-9.4.x' into jetty-9.4.x-4121-qtp-threadfactory
2019-10-02 12:55:25 -05:00
Simone Bordet
7cf5dfdebf
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-10-02 17:07:18 +02:00
Simone Bordet
2f06976e41
Fixed flaky test and code cleanup.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-10-02 17:06:45 +02:00
Joakim Erdfelt
dd18c698f5
Issue #4121 - ThreadFactory support in QTP
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-10-02 07:46:12 -05:00
Greg Wilkins
87a707c219
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-10-02 22:11:03 +10:00
Greg Wilkins
813fcb79ab
Jetty 9.4.x 4105 4121 4122 queued thread pool ( #4146 )
...
Several QTP fixes:
* #4105 Threads without jobs now check if they should idle die before waiting rather than before, this allows idling under steady load. 3ad6780
* #4121 ThreadFactory behaviour supported by doing thread config within newThread call. 7b306d7
* #4122 Always clear the interrupted status. c37a4ff
task = queue.poll(timeout);
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-10-02 22:07:00 +10:00
Simone Bordet
bc663d2d63
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-10-02 10:18:40 +02:00
Simone Bordet
7810f2dec2
Reverted 82a00524d1
.
...
The connection upgrade check is necessary both after the parsing and
after the handling. After the parsing covers HTTP/2 prior knowledge
"PRI * HTTP/2" case; after the handling covers the WebSocket case.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-10-02 10:18:06 +02:00
Joakim Erdfelt
bb939f6f71
Merge pull request #4145 from eclipse/jetty-9.4.x-4144-naked-request-cast
...
Fixing #4144 - handle wrapped requests better
2019-10-01 19:06:07 -05:00
Joakim Erdfelt
e9ac2c8c97
Fixing #4144 - handle wrapped requests better
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-10-01 17:49:30 -05:00
Joakim Erdfelt
7d533bdabc
Adding missing copyright header.
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-10-01 17:30:24 -05:00
Joakim Erdfelt
0a5c710bdd
Fixes #4141 - Servlet not async + async Filter + wrapped request
...
+ Fixing ClassCastException
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-10-01 17:24:27 -05:00
Joakim Erdfelt
21396b08d8
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-10-01 13:56:35 -05: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
17b25ca74a
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-10-01 18:11:01 +02:00
Simone Bordet
a380f6b7b9
Merge pull request #4081 from eclipse/jetty-9.4.x-HttpConnection_UpgradeCheck
...
Remove unnecessary Connection upgrade check
2019-10-01 18:10:23 +02: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
ca1b706107
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-10-01 17:25:32 +02:00
Simone Bordet
5b829a10e4
Cosmetics.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-10-01 17:23:29 +02:00
Lachlan Roberts
b83dd8472d
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-10-01 16:06:58 +10:00
Lachlan
fef5975b86
Merge pull request #4108 from eclipse/jetty-9.4.x-4104-WSSession_SendAfterClose
...
Issue #4104 - WebSocketSession will reject outgoing frames if closed
2019-10-01 15:46:16 +10:00
Lachlan
4fff51361d
Merge pull request #4101 from eclipse/jetty-9.4.x-4096-ReservedThreadExecutor_stop
...
Issue #4096 - allow thread to exit ReservedThreadExecutor on stop
2019-10-01 15:44:37 +10:00
Lachlan
e80ee375b6
Merge pull request #4131 from travisspencer/fix-4130
...
Issue #4130 - Don't add scopes if none are provided
2019-10-01 10:28:28 +10:00
Simone Bordet
1cb09db75a
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-09-30 09:01:57 +02:00
Simone Bordet
062afc59ad
Merge pull request #4126 from eclipse/jetty-9.4.x-3787-httpclient_eofexception_instead_of_sslhandshakeexception
...
Issue #3787 - Jetty client throws EOFException instead of SSLHandshakeException on certificate errors
2019-09-30 08:54:23 +02:00
Simone Bordet
a85a18e0d8
Fixes #3787 - Jetty client throws EOFException instead of SSLHandshakeException on certificate errors.
...
Fixed indent.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-09-30 08:53:12 +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
Travis Spencer
201264d17b
Don't add scopes if none are provided
...
Signed-off-by: Travis Spencer <travis@curity.io>
2019-09-28 18:05:48 +02:00
Simone Bordet
4d3423e88f
Fixes #3787 - Jetty client throws EOFException instead of SSLHandshakeException on certificate errors.
...
Marked the test with @Tag("external") since it
contacts the external server tools.ietf.org.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-09-27 15:18:57 +02:00
Lachlan Roberts
aa417f939e
Fix WebSocket CompressExtension releaseDeflater() bug.
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-09-27 10:18:35 +10:00
Simone Bordet
ad2770ddc2
Fixes #3787 - Jetty client throws EOFException instead of SSLHandshakeException on certificate errors.
...
Updates after review.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-09-27 00:15:34 +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
Lachlan Roberts
44cb6881e4
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-09-26 08:17:38 +10:00
Lachlan
ba728eee5d
Issue #4105 - atomically increment idle count when starting new thread in QTP ( #4118 )
...
* Issue #4105 - starting a thread in QTP now increments idle count
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
* Issue #4105 - improve comments in test
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-09-26 08:15:07 +10:00
Joakim Erdfelt
39ee316a7f
Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x
2019-09-25 12:42:47 -05:00
Joakim Erdfelt
f6ca4f138a
Testing gpg signature setup
2019-09-25 12:42:32 -05:00
Lachlan Roberts
af081459ee
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-09-25 15:06:17 +10:00
Lachlan
3edc6c9102
Issue #3734 - throw ISE for WebSocket suspend after close (jetty-9.4) ( #4098 )
...
* Issue #3734 - throw ISE for WebSocket suspend after close
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
* Issue #3734 - suspend is error if onClose() has been called
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-09-25 14:55:13 +10:00
Greg Wilkins
11b60db4c3
Issue #4047 Graceful Write ( #4100 )
...
Added test to reproduce issue
Fixed bug from #2772 where output was shutdown on DONE without checking for END.
Fixed aggregation logic to aggregate last write if aggregation already started
Improved comments and clarify conditions
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-09-25 12:13:56 +10:00