e137ee3cd7
Issue #4217 - SslConnection DecryptedEndpoint flush eternal busy loop
...
+ Cleanup from review
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-10-30 14:03:16 -05:00
2e4bb568d4
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-10-30 13:16:59 -04:00
c50c4536dd
Added additional, http/2 specific documentation for #4253
2019-10-30 13:16:30 -04:00
ef0595c0b9
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-10-30 11:36:40 -04:00
372313a388
Updating security reports. Resolves #4253
2019-10-30 11:36:14 -04:00
c58fd58e41
Testing Large TLS Records for Jetty 9.2.x
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-10-29 19:14:07 -05:00
d3153f3277
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-1743-refactor-maven-plugin-redux
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-10-29 13:51:05 +11:00
93a5ff0b89
Issue #4217 - SslConnection DecryptedEndpoint flush eternal busy loop
...
+ Small cleanup of duplicate if statements
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-10-25 16:41:26 -05:00
e665c8f806
Issue #4217 - SslConnection DecryptedEndpoint flush eternal busy loop
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-10-24 16:26:43 -05:00
65dc704d32
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-24 10:58:45 -05:00
9b3b174862
Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x
2019-10-24 06:35:04 -05:00
344a064b39
Release script should commit only what it created.
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-10-24 06:34:50 -05:00
7cb238db25
Issue #1743 Extra tests and code cleanups
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-10-24 08:41:57 +11:00
fea8bb794d
Issue #4240 - use default charset utf-8 for cgi request form encoding ( #4241 )
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-10-24 08:24:19 +11:00
1ed13b6b30
Updating to version 9.4.23-SNAPSHOT
2019-10-22 09:19:41 -05:00
b1e6b55512
Updating to version 9.4.22.v20191022
2019-10-22 08:20:50 -05:00
a9e543c1c0
Issue #4227 - do not use encodeRedirectURL for openid redirects ( #4233 )
...
* Issue #4227 - do not use encodeRedirectURL for openid redirects
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
* changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-10-22 22:47:29 +11:00
f6f423f558
Issue #4152 - make WS Parser autoFragment data frames to maxFrameSize ( #4219 )
...
* Issue #4152 - make WS Parser autoFragment data frames to maxFrameSize
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
* Issue #4152 - fix broken tests
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
* Issue #4152 - fix broken tests
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
* changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-10-22 16:17:50 +11:00
c2cde806d1
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-10-21 21:37:30 +02:00
add8ffca5b
Merge pull request #4218 from eclipse/jetty-9.4.x-4217-tls_flush_buffer_overflow_busy_loop
...
Fixes #4217 - SslConnection.DecryptedEnpoint.flush eternal busy loop.
2019-10-21 21:32:22 +02:00
1c5949f856
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'
2019-10-21 21:28:39 +02:00
a547a77d74
Merge pull request #4230 from gouessej/jetty-9.4.x
...
Issue #4160 , fixes some spelling mistakes
2019-10-21 21:27:29 +02:00
a0c9a14a62
Issue #4160 , fixes some spelling mistakes
...
Signed-off-by: Julien Gouesse <gouessej@orange.fr>
2019-10-21 20:21:55 +02:00
9ae1ca4e64
fix another major version constant
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-10-21 21:20:12 +10:00
8fb408f776
Code cleanups.
...
Made class Entry public since it's used in method signatures.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-10-20 17:21:14 +02:00
61b2f9870b
Code cleanups.
...
Made Violation public since it's used in method signatures.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-10-20 17:21:14 +02:00
eb17b90924
Merge pull request #4224 from eclipse/jetty-10.0.x_fix_major_minor_version
...
Issue #4222 Jetty 10.0.x fix major minor version
2019-10-20 17:05:16 +02:00
fd792bc637
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-10-20 17:03:21 +02:00
862ac407f1
Code cleanup.
...
Made methods that were exposing RateTracker (a package private class)
non-public, since no code outside jetty-servlets could have used them.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-10-20 16:54:11 +02:00
dc59addb6f
Code cleanup.
...
Made method reportDifferences(...) private since it was exposing
package private class TimeNSize and no code outside of jetty-util
could have used it.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-10-20 16:50:31 +02:00
d2f714cd6a
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-10-20 16:20:10 +02:00
95b205aa34
Class InetPattern is package private, so made nnewInetRange(String)
...
private because no code outside jetty-util could call that method.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-10-20 16:18:58 +02:00
9a7e6d96de
Merged remote-tracking branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-10-20 16:10:39 +02:00
92bfcb6c73
Class Managed is package private, so made addBean(Object, Managed)
...
private because no code outside of jetty-util could call that method.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-10-20 16:10:01 +02:00
66dd5ad788
use last jacoco plugin 0.8.5
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-10-20 21:44:15 +10:00
85cb8e8c5d
Issue #4222 fix major/minor version
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-10-20 09:33:22 +10:00
d502f25518
fix modules for test
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-10-20 09:32:48 +10:00
73eb82c20f
Issue #4217 - SslConnection.DecryptedEndpoint.flush eternal busy loop.
...
Updates after review.
Added test case.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-10-19 20:06:10 +02:00
991cf20cce
Issue #4217 - SslConnection.DecryptedEndpoint.flush eternal busy loop.
...
Releasing the decrypted input buffer so that it can be re-acquired
with an expanded capacity.
Looping around only if the buffer size has changed.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-10-19 12:27:58 +02:00
203eef4029
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-10-19 10:29:01 +11:00
890c0b26cb
Fixes #4203 and #4204 - Transfer-Encoding + Content-Length behaviors ( #4205 )
...
* Issue #4203 - Updating test to verify report on Transfer-Encoding
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
* Fixes #4203 - Transfer-Encoding + Content-Length is 400 Bad Request
+ Fixing validation to not be header order dependent.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
* Issue #4203 - Fixing hasTransferEncoding reset and testcase assumption
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
* Issue #4204 - Transfer-Encoding RFC7230 behaviors
+ More test cases and implementation.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
* Issue #4204 - Transfer-Encoding RFC7230 behaviors
+ Adjusting HttpParser to handle the case where we have multiple
Transfer-Encoding headers and none declare the 'chunked' token.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
* Issue #4204 - Transfer-Encoding RFC7230 behaviors
+ Making changes from PR review
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
* Issue #4203 Transfer Encoding
request with TE and no chunking is a Bad Request
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-10-19 08:05:15 +11:00
ed74a459a7
Issue #4138 - only warn if metadata issuer is not consistent with config
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-10-18 10:31:50 +11:00
02276113f6
Issue #4214 - fix WS flaky test ClientConnectTest ( #4215 )
...
* Issue #4214 - fix flaky ClientConnectTest and change WS connectTimeout
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
* Issue #4214 - changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-10-18 10:11:57 +11:00
3d19f61122
Issue #4193 - Fix InetAccess port control ( #4206 )
...
* issue exclude/include con name InetAccesHandler - add better unit test
this logic:
String name =
baseRequest.getHttpChannel().getConnector().getName();
return _names.test(name) && _addrs.test(addr);
Is not correct. it's treating the connector name exactly like the
filter. But that's not what it's intended to do. It's supposed to tell
what connectors are applicable to this filter. And what connectors are
not affected.
For example in the unit test there exists 2 connectors:
http
tls
We want to restrict the http connector, but we want to leave tls
connector alone.
So we would specify:
include = 192.168.1.1-192.168.1.254
includeConnector = http
The way the logic is above, it is treating the connector name as if it's
the filter itself. Which is not what I intended.
What i need in psuedo-code is this:
if (there are no "include connectors" OR if this connector is
included) AND (if this connector is not in the excluded list)
---> Then apply the IP filter.
Signed-off-by: Nicholas DiPiazza <nicholas.dipiazza@lucidworks.com>
* exclude should take precedence over include
Signed-off-by: Nicholas DiPiazza <nicholas.dipiazza@lucidworks.com>
* Issue #4193 InetAccessHandler
reverted changes to IncludeExcludeSet
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4193 InetAccessHandler
updates from review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-10-18 09:03:28 +11:00
2e633a4e86
Fixes #4217 - SslConnection.DecryptedEnpoint.flush eternal busy loop.
...
Releasing the encrypted output buffer so that it can be re-acquired
with an expanded capacity.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-10-17 19:41:52 +02:00
337b6c1439
Issue #4138 - Changes from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-10-17 15:59:21 +11:00
894fc9b115
Issue #4208 - Content-Length in 304 ( #4211 )
...
* Issue #4208 Content-Length in 304
Added tests for RFC7230 section 3.3.2 for 304 and HEAD responses with content length.
Fixed HttpGenerator to set content-length in 304 response
Fixed insufficient content written check for 304
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4208 Content-Length in 304
Use contentLengthField
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-10-17 14:26:19 +11:00
08effc9880
Updating Websocket documentation for Jetty 10 per #1165 ( #4172 )
...
* Updating Websocket documentation for Jetty 10 per #1165
* Issue #1165 - updating documentation with WriteCallback async examples
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
* Grammatical changes.
2019-10-17 12:44:48 +11:00
329b819d72
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-10-16 23:36:47 +02:00
869184c827
Merge pull request #4200 from eclipse/jetty-9.4.x-4190-deadlock_httpoutput_close
...
Fixes #4190 Jetty hangs after thread blocked in SharedBlockingCallbac…
2019-10-16 23:35:52 +02:00
Joakim Erdfelt
Chris Walker
Jan Bartel
Lachlan
Simone Bordet
Julien Gouesse
olivier lamy
Greg Wilkins
Chris Walker