5f9edb1361
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-11-12 16:41:33 +01:00
454175af1a
Merge pull request #4293 from eclipse/jetty-9.4.x-4282-review_httpparser_nocontent
...
Issue #4282 - Review HttpParser handling in case of no content.
2019-11-12 17:55:40 +03:00
b1d231b9e7
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-11-11 16:45:12 +01:00
4f98bf0f2e
Merge pull request #4291 from eclipse/jetty-9.4.x-4283-wrong_package_openjdk8_client_alpn_processor
...
Fixes #4283 - Wrong package for OpenJDK8ClientALPNProcessor.
2019-11-11 17:16:29 +03:00
ca72a8fd71
Issue #4282 HttpParser no content
...
Added HTTP/0.9 test
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-11-11 17:27:56 +11:00
04bc4c786e
Issue #1743 Rename JettyWebAppContext to MavenWebAppContext
...
Checkstyle fixes
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-11-11 17:21:04 +11:00
3fd1daa5c8
Merge branch 'jetty-9.4.x' into jetty-9.4.x-4282-review_httpparser_nocontent
2019-11-11 17:15:13 +11:00
c50cc856a8
Issue #1743 Remove dup call of configureUnassembledWebApp
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-11-11 16:44:12 +11:00
084345fb9a
Issue #1743 Update doco.
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-11-11 15:46:42 +11:00
7b9f7ab37e
Merge pull request #4207 from eclipse/jetty-9.4.x-4189-OpenIdHttpClient
...
Issue #4138 - use HttpClient for OpenID Authentication
2019-11-11 13:52:41 +11:00
39aac30137
Issue #4138 - Changes from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-11-11 13:51:48 +11:00
ee0f9fc1d0
Issue #4033 Percent Encoded Bad Requests ( #4272 )
...
* Modernizing testcase
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
* Issue #4033 Percent Encoded Bad Requests
Added test to demonstrate bad percent encoded request
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #4033 - adding sanity test for percent paths and checkAlias()
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
* Eliminating 9.3.0.RC0 dependency
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
* Issue #4033 - More tests for Resource checkAlias() behavior
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
* Issue #4033 - Splitting badDecodePath
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
* Issue #4033 - More badDecodePath tests
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
* Issue #4033 Percent Encoded Bad Requests
reverted decodePathBehaviour
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* testing pull request building
* Issue #4033
updates after review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-11-11 12:01:26 +11:00
8faafdd063
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-11-11 11:28:32 +11:00
47447b5cf5
Issue #4282 - Review HttpParser handling in case of no content.
...
Fixed handling of returning true from headerComplete() and
contentComplete().
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-11-11 01:13:13 +01:00
b84669b9cd
Issue #1743 Update maven jetty plugin doc
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-11-11 10:12:16 +11:00
d043cf6318
Fixed links for linking separate guides
2019-11-08 12:23:17 -05:00
c336616c96
Issue #2709 - reduce default headerCacheSize to 1024 ( #4292 )
...
make headerCacheSize on HttpReceiverOverHTTP configurable
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-11-08 21:57:49 +11:00
089dd479c7
add module-info lines to use ServiceLoader with Authenticator.Factory
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-11-08 21:06:51 +11:00
1b0e252a83
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-11-08 09:59:51 +01:00
1d8a2fe03a
Code cleanup.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-11-08 09:56:36 +01:00
1ea9108141
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-11-08 08:59:27 +01:00
e37524c8a7
Code cleanup.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-11-08 08:54:49 +01:00
39867b28fc
Fixes #4283 - Wrong package for OpenJDK8ClientALPNProcessor.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-11-07 23:03:15 +01:00
4ab910bdc0
Issue #4287 - Move getUriLastPathSegment() to URIUtil
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-11-07 15:52:00 -06:00
cc58a74662
Merge branch 'jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebInfConfiguration.java
# jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebInfConfigurationTest.java
2019-11-07 15:37:30 -06:00
a83c297a11
Fixes #4277 - Reading streamed gzipped body never terminates.
...
Fixed handling of demand in case of gzipped response content.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-11-07 22:32:11 +01:00
b119a8f59f
Fixed tests that were trying to connecting to 0.0.0.1.
...
On new Linux kernels, at least, trying to connect to 0.0.0.1
hangs, while before it was failing immediately.
The tests have now a short connect timeout to avoid to hang.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-11-07 22:24:21 +01:00
cc289980cf
Merge pull request #4268 from eclipse/jetty-9.4.x-4173-NPE-WebInfConfiguration
...
Issue #4173 Avoid NPE generating name of tmp dir in WebInfConfiguration
2019-11-07 14:49:20 -06:00
c8e09a1026
Issue #4284 NPE guard on exception
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-11-08 07:13:51 +11:00
e103a5e1a7
Merge branch 'jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# jetty-server/src/main/java/org/eclipse/jetty/server/handler/ErrorHandler.java
# tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
2019-11-07 13:25:04 -06:00
fcf91d8964
Merge branch 'jetty-9.3.x' into jetty-9.4.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
# 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-java-client/pom.xml
# jetty-alpn/jetty-alpn-java-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/cdi-core/pom.xml
# jetty-cdi/cdi-full-servlet/pom.xml
# jetty-cdi/cdi-servlet/pom.xml
# jetty-cdi/cdi-websocket/pom.xml
# jetty-cdi/pom.xml
# jetty-cdi/test-cdi-webapp/pom.xml
# jetty-client/pom.xml
# jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTLSTest.java
# jetty-client/src/test/java/org/eclipse/jetty/client/ssl/SslBytesClientTest.java
# jetty-client/src/test/resources/jetty-logging.properties
# 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-memcached-session-manager/pom.xml
# jetty-gcloud/jetty-gcloud-session-manager/pom.xml
# jetty-gcloud/pom.xml
# jetty-hazelcast/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/pom.xml
# jetty-io/pom.xml
# jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java
# 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-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-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-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/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-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketProtocolTest.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/browser/BrowserDebugTool.java
# jetty-websocket/websocket-servlet/pom.xml
# jetty-xml/pom.xml
# pom.xml
# tests/pom.xml
# tests/test-continuation/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-memcached-sessions/pom.xml
# tests/test-sessions/test-gcloud-sessions/pom.xml
# tests/test-sessions/test-infinispan-sessions/pom.xml
# tests/test-sessions/test-jdbc-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-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-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-webapp-rfc2616/pom.xml
2019-11-07 12:24:50 -06:00
5de1289ac0
Merge branch 'release-9.3.28' into jetty-9.3.x
2019-11-07 12:10:00 -06:00
0df21b6e86
Merge branch 'jetty-9.2.x' into jetty-9.3.x
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# VERSION.txt
# aggregates/jetty-all/pom.xml
# apache-jsp/pom.xml
# apache-jstl/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-server/pom.xml
# jetty-alpn/pom.xml
# jetty-annotations/pom.xml
# jetty-ant/pom.xml
# jetty-cdi/pom.xml
# jetty-client/pom.xml
# jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTLSTest.java
# jetty-continuation/pom.xml
# jetty-deploy/pom.xml
# jetty-distribution/pom.xml
# jetty-fcgi/fcgi-client/pom.xml
# jetty-fcgi/fcgi-server/pom.xml
# jetty-fcgi/pom.xml
# jetty-http-spi/pom.xml
# jetty-http/pom.xml
# jetty-http2/http2-alpn-tests/pom.xml
# jetty-io/pom.xml
# jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java
# jetty-jaas/pom.xml
# jetty-jaspi/pom.xml
# jetty-jmx/pom.xml
# jetty-jndi/pom.xml
# jetty-jsp/pom.xml
# jetty-jspc-maven-plugin/pom.xml
# jetty-maven-plugin/pom.xml
# jetty-monitor/pom.xml
# jetty-nosql/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-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-spdy/pom.xml
# jetty-spdy/spdy-client/pom.xml
# jetty-spdy/spdy-core/pom.xml
# jetty-spdy/spdy-example-webapp/pom.xml
# jetty-spdy/spdy-http-client-transport/pom.xml
# jetty-spdy/spdy-http-common/pom.xml
# jetty-spdy/spdy-http-server/pom.xml
# jetty-spdy/spdy-server/pom.xml
# jetty-spring/pom.xml
# jetty-start/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/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-server/src/test/java/org/eclipse/jetty/websocket/server/browser/BrowserDebugTool.java
# jetty-websocket/websocket-servlet/pom.xml
# jetty-xml/pom.xml
# pom.xml
# tests/pom.xml
# tests/test-continuation/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-hash-sessions/pom.xml
# tests/test-sessions/test-jdbc-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-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-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-webapp-rfc2616/pom.xml
2019-11-07 12:09:39 -06:00
82f804af91
Merge pull request #4273 from eclipse/jetty-9.4.x-prtest
...
Updating http to https
2019-11-07 12:03:01 -06:00
6151892155
Merge pull request #4278 from eclipse/jetty-9.4.x-4264-revert-doError-signature
...
Issue #4264 Revert doError signature
2019-11-07 09:36:54 -06:00
64a916e6ec
Issue #4173 - use JarFileResource's Jar java.io.File object if present
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-11-07 05:11:48 -06:00
d0f74c5532
Issue #4124 - autobahn tests for jetty, javax websocket APIs ( #4147 )
...
- do not select duplicate extensions in javax default Configurator
- correctly copy payload for ping frames in jetty & javax frame handlers
- add ByteBuffer to javadoc for onMessage in jetty api
- cleaned up some test logging for EventSocket
- add autoFragment and maxFrameSize settings to WebSocketPolicy
- fix early validation for multiple extensions in setExtensions
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-11-07 11:06:14 +11:00
2310196532
Issue #1777 - configuration for jetty-10 WebSocketClient to be stopped at shutdown
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-11-07 11:02:25 +11:00
18e7ee5940
Issue #4237 - allow openid module to be configured without context xml ( #4244 )
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-11-07 10:53:25 +11:00
070d2b235e
Issue #4264 Revert doError signature
...
revert the doError signature.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-11-07 09:31:52 +11:00
13a574557b
JarFileResource.getFile() now returns the Jar's java.io.File object
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-11-06 16:09:54 -06:00
2d9f128410
Issue #4173 - simplify base name lookup
...
+ Some cleanup of logging
+ Exception during getResourceBaseName() results in empty canonical segment
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-11-06 16:06:05 -06:00
b455b8abcc
Eliminating 9.3.0.RC0 dependency
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-11-06 05:18:12 -06:00
79c2b819c7
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-11-06 16:49:35 +11:00
f55fbdb7eb
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-11-06 16:09:02 +11:00
aefbdfca58
Issue #2266 Rework Scanner and use it for Jetty Maven Plugin ( #4239 )
...
* Issue #2266 Rework Scanner and use it for Jetty Maven Plugin
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-11-06 15:55:20 +11:00
9a8a259a45
Issue #1743 Update doc for jetty maven plugin
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-11-06 15:41:27 +11:00
9f0cb2e30b
Issue #1743 Refactor to avoid always calling configureUnassembledWebApp
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-11-06 15:40:03 +11:00
335f07f71e
Issue #1743 Refactor to make unassembled webapp params clearer.
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-11-06 12:23:00 +11:00
ee7f860a2e
Issue #1743 Field and method names; remove scanTargets
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-11-06 11:30:47 +11:00
Simone Bordet
Greg Wilkins
Jan Bartel
Lachlan
Chris Walker
Joakim Erdfelt