Lachlan Roberts
fef25e7825
Merge branch jetty-10.0.x into jetty-10.0.x-4538-MessageReaderWriter
2020-03-11 14:23:47 +11:00
Lachlan
b0ddba49da
Merge pull request #4593 from eclipse/jetty-10.0.x-4571-MessageSink
...
Issue #4571 - websocket aggregating text and binary MessageSinks
2020-03-11 14:14:15 +11:00
Greg Wilkins
360b878d02
Fixed merge
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-03-10 15:43:10 +01:00
Greg Wilkins
28d6009ac5
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-03-10 15:14:56 +01:00
Joakim Erdfelt
965483e4d9
Issue #4631 - Warning about skipping of <Arg> nodes is in wrong place for <Configure> ( #4632 )
...
* Issue #4631 - Fixing XML comment that was accidentally reformatted
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
* Issue #4631 - Warning about skipping of <Arg> nodes is in wrong place for <Configure>
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
* Issue #4631 - Improving testcase
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
* Issue #4631 - Removing test classes
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
* Issue #4631 - Cleaning up configure with index per PR review
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
* Issue #4631 - More named arg test cases
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
* Issue #4631 - Add testConfiguredWithNamedArgNotFirst
+ new testcase where <Arg> is needed, but is not the first node
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
* Cleanup configuration index usage
Signed-off-by: Greg Wilkins <gregw@webtide.com>
Co-authored-by: Greg Wilkins <gregw@webtide.com>
2020-03-10 15:11:22 +01:00
Simone Bordet
678385bfda
Merge pull request #4554 from eclipse/jetty-10.0.x-2788-graceful_http2_close
...
Fixes #2788 - Graceful close of HTTP/2 Connection.
2020-03-10 14:58:41 +01:00
Jan Bartel
dfa0e0adf7
Jetty 10.0.x 4507 forwardincludemappings ( #4590 )
...
* Issue #4507 Implement forward/include/async params for HttpServletMapping
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-03-10 11:05:52 +01:00
Lachlan
d938fca513
Merge pull request #4627 from eclipse/jetty-10.0.x-4577-InetAccessHandler_getPathInfo
...
Issue #4577 - request getPathInfo() could be null in InetAccessHandler
2020-03-10 16:02:08 +11:00
Mattias Andersson
82247f257d
Issue #4647 Hazelcast remote.xml configuration file do not configure hazelcast remote addresses ( #4649 )
...
* Fix for #4647
Signed-off-by: Mattias Andersson <andermaj@gmail.com>
Co-authored-by: Mattias Andersson <andermaj@gmail.com>
2020-03-10 10:35:48 +10:00
Mattias Andersson
9c3cfb92f9
Issue #4647 Hazelcast remote.xml configuration file do not configure hazelcast remote addresses ( #4649 )
...
* Fix for #4647
Signed-off-by: Mattias Andersson <andermaj@gmail.com>
Co-authored-by: Mattias Andersson <andermaj@gmail.com>
2020-03-10 10:33:13 +10:00
Simone Bordet
3a6c9b8049
Issue #2788 - Graceful close of HTTP/2 Connection.
...
Updates after review.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-10 01:29:13 +01:00
Simone Bordet
916b3e56ec
Merged 'jetty-10.0.x' into 'jetty-10.0.x-2788-graceful_http2_close'.
2020-03-09 20:01:25 +01:00
Jan Bartel
dfd3875dbc
Jetty 10.0.x 4506 metadata complete ( #4587 )
...
* Issue #4506 Do not introspect annotations on metadata-complete fragments
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-03-09 15:34:04 +01:00
olivier lamy
7554a3a903
fix merge
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-03-09 16:15:06 +10:00
olivier lamy
1c4a21c9be
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2020-03-09 14:28:53 +10:00
olivier lamy
67eb9b3531
use same version as in pom
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-03-08 21:10:39 +10:00
Olivier Lamy
3a77542303
upgrade shade plugin and align version ( #4639 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-03-05 09:10:12 +10:00
Joakim Erdfelt
f150062fde
Merge pull request #4629 from eclipse/jetty-9.4.x-4628-optional-depends
...
Issue #4628 - Non-Required Module Dependency Support
2020-03-03 11:44:49 -06:00
Joakim Erdfelt
c08ca2a16e
Merge pull request #4630 from eclipse/jetty-9.4.x-4620-console-capture
...
Issue #4620 - Better support for alt PrintStream in StdErrLog
2020-03-03 11:43:55 -06:00
olivier lamy
6f19040094
fix merge
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-03-03 21:05:49 +10:00
olivier lamy
77a54c21a1
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2020-03-03 20:53:26 +10:00
Olivier Lamy
3a8b45d20c
Issue #4619 align derby version ( #4626 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-03-03 10:20:27 +10:00
Lachlan
9ef7790e45
Merge pull request #4624 from eclipse/jetty-9.4.x-4123-OpenId_Docs
...
Issue #4123 - add documentation for OpenID to 9.4.x
2020-03-03 10:40:49 +11:00
Joakim Erdfelt
f2a4c6b615
Issue #4620 - Better support for alt PrintStream in StdErrLog
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-02 12:03:37 -06:00
Joakim Erdfelt
1ee8c8ad3a
Issue #4628 - Non-Required Module Dependency Support
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-02 10:13:29 -06:00
Lachlan Roberts
2897377370
Issue #4577 - request getPathInfo() could be null in InetAccessHandler
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-02 14:32:52 +11:00
Chris Walker
cfacaca26d
Docs for OpenID ( #4610 )
...
Co-authored-by: Lachlan <lachlan@webtide.com>
2020-03-02 10:56:19 +11:00
Lachlan Roberts
af18fb35ad
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'
2020-03-02 10:27:41 +11:00
Lachlan
b014e2faca
Merge pull request #4597 from eclipse/jetty-9.4.x-847-WSasyncWriteTimeout
...
Issue #847 - deprecate asyncWriteTimeout in the jetty websocket API
2020-03-02 10:19:01 +11:00
Lachlan
6151fc0c36
Merge pull request #4615 from eclipse/jetty-10.0.x-4598-InetAccessHandler
...
Issue #4598 - rework InetAccessHandler to use path mappings
2020-03-01 18:43:32 +11:00
Lachlan Roberts
95ecb4a3e8
Issue #4598 - Changes from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-29 16:14:20 +11:00
olivier lamy
7e181085d3
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2020-02-29 09:06:40 +10:00
Olivier Lamy
c29d966162
Issue #4616 hazelcast upgrade 3.12.6 ( #4617 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-02-29 09:01:14 +10:00
Joakim Erdfelt
b7ab2794fd
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
# 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-home/src/main/resources/etc/jetty-setuid.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-jmh/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-impl/pom.xml
# jetty-websocket/javax-websocket-server-impl/pom.xml
# jetty-websocket/jetty-websocket-tests/pom.xml
# jetty-websocket/pom.xml
# jetty-websocket/websocket-api/pom.xml
# jetty-websocket/websocket-client/pom.xml
# jetty-websocket/websocket-common/pom.xml
# jetty-websocket/websocket-server/pom.xml
# 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-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
2020-02-28 09:29:30 -06:00
Joakim Erdfelt
8aabb52557
Updating to version 9.4.28-SNAPSHOT
2020-02-27 13:03:44 -06:00
Joakim Erdfelt
a304fd9f35
Updating to version 9.4.27.v20200227
2020-02-27 12:21:57 -06:00
Joakim Erdfelt
5b7472f616
Fixing setuid.mod to use specific version of jar
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-02-27 12:04:29 -06:00
Greg Wilkins
95f20ddfeb
Use updated setuid with clearSupplementalGroups ( #4609 )
...
* Use updated setuid with clearSupplementalGroups
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* remove version from setuid.mod
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-02-27 18:56:16 +01:00
Simone Bordet
a2a75e8ecc
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2020-02-27 13:31:18 +01:00
Simone Bordet
75893dac9c
Fixes #4612 - ReservedThreadExecutor hangs when the last reserved thread idles out.
...
Explicitly removing the idled out thread from the stack,
rather than calling tryExecute().
Side benefit is that we are now removing idled out threads
that are least recently used.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-02-27 13:26:53 +01:00
Lachlan Roberts
ccd6c845e5
Merge remote-tracking branch 'origin/jetty-9.4.x-4598-InetAccessHandler' into jetty-10.0.x-4598-InetAccessHandler
2020-02-27 19:34:16 +11:00
Lachlan Roberts
2edc4920fd
Issue #4598 - fix InetAccessHandlerTest expectations to fit new behavior
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-27 18:29:29 +11:00
Lachlan Roberts
3c551e960c
Issue #4598 - rework InetAccessHandler to use only one IncludeExcludeSet
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-27 15:41:35 +11:00
Chris Walker
da9ec6fd34
Docs for OpenID ( #4610 )
...
Co-authored-by: Lachlan <lachlan@webtide.com>
2020-02-26 21:27:45 -06:00
Joakim Erdfelt
99a541f051
Fixing checkstyle violations
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-02-26 13:16:32 -06:00
Jan Bartel
2faec44dfb
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-02-26 16:40:35 +01:00
Hirotaka Ikoma
65a22e5e80
Fix NPE in HouseKeeper.stopScavenging ( #4604 )
...
* Fix NPE in HouseKeeper.stopScavenging
Signed-off-by: Hirotaka Ikoma <hikoma@gmail.com>
2020-02-26 16:38:50 +01:00
Greg Wilkins
5ba9411e5c
cleanup after merge
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-02-26 14:37:00 +01:00
Greg Wilkins
277ce5f3a5
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-02-26 14:36:22 +01:00
Joakim Erdfelt
18f8752ad0
Merge pull request #4607 from eclipse/jetty-9.4.x-4606-DateCache-formatNow
...
Issue #4606 - fixing formatTick use of `now`
2020-02-26 07:23:34 -06:00
