Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
20,361 Commits 59 Branches 460 Tags 355 MiB
Commit Graph

20361 Commits

Author SHA1 Message Date
Joakim Erdfelt 19e91a6a40
Issue #4483 - Cleanup of InetAddressSetTest (#4484) 
* More resiliency on bad DNS servers

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-01-16 14:05:11 -06:00
Simone Bordet 6d65799bad Fixes #4481 - Fix NeedWantClientAuthTest for OpenJDK 13.0.2/11.0.6. 
Updated the keystores to PKCS12 and added the Basic Constraint CA:true
to the server certificate.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-01-16 15:20:34 +01:00
Jan Bartel 86e3333916
Issue #4434 Implement context default request/response encodings. (#4455) 
* Issue #4434 Implement context default request/response encodings.

Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-01-17 00:40:06 +11:00
Jan Bartel f1474a4a3f
Issue #4431 Add tests for default-context-path (#4467) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-01-17 00:39:16 +11:00
Joakim Erdfelt b75cf1c6a6
Merge pull request #4479 from eclipse/jetty-9.4.x-4383-npe-multipart 
Issue #4383 - Minimal NPE prevention on MultiPart
 2020-01-15 16:40:03 -06:00
Joakim Erdfelt eba24b6b83
Issue #4383 - Updates behavior to eliminate ISE 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-01-15 15:48:51 -06:00
Joakim Erdfelt 37f8503442
Issue #4383 - Minimal NPE prevention on MultiPart 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-01-15 15:31:43 -06:00
Joakim Erdfelt d4f72256e7
Removing javadoc:aggregate-jar due to MJAVADOC-618 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-01-15 12:54:20 -06:00
Joakim Erdfelt 01a5974f4b
Merge branch `jetty-9.4.x` into `jetty-10.0.x` 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	Jenkinsfile
#	examples/async-rest/async-rest-webapp/src/test/java/org/eclipse/jetty/example/asyncrest/DemoServer.java
#	jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTest.java
#	jetty-http/src/test/java/org/eclipse/jetty/http/HttpParserTest.java
#	jetty-http/src/test/java/org/eclipse/jetty/http/HttpTester.java
#	jetty-http/src/test/java/org/eclipse/jetty/http/MultiPartParserTest.java
#	jetty-http/src/test/java/org/eclipse/jetty/http/PathMapTest.java
#	jetty-http/src/test/java/org/eclipse/jetty/http/matchers/HttpFieldsMatchersTest.java
#	jetty-maven-plugin/src/test/java/org/eclipse/jetty/maven/plugin/it/TestGetContent.java
#	jetty-server/src/test/java/org/eclipse/jetty/server/CookieCutterLenientTest.java
#	jetty-server/src/test/java/org/eclipse/jetty/server/CookieCutterTest.java
#	jetty-server/src/test/java/org/eclipse/jetty/server/PartialRFC2616Test.java
#	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ServletLifeCycleTest.java
#	jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipContentLengthTest.java
#	jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipDefaultNoRecompressTest.java
#	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
#	jetty-unixsocket/src/test/java/org/eclipse/jetty/unixsocket/UnixSocketClient.java
#	jetty-util/src/test/java/org/eclipse/jetty/util/B64CodeTest.java
#	jetty-util/src/test/java/org/eclipse/jetty/util/resource/FileSystemResourceTest.java
#	jetty-util/src/test/java/org/eclipse/jetty/util/ssl/X509Test.java
#	jetty-webapp/src/test/java/org/eclipse/jetty/webapp/ClasspathPatternTest.java
#	jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/LargeMessageTest.java
#	jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/endpoints/ClientAnnotatedEndpointScannerGoodSignaturesTest.java
#	jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/endpoints/ClientAnnotatedEndpointScannerInvalidSignaturesTest.java
#	jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/metadata/EncoderMetadataSetTest.java
#	jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/utils/ReflectUtilsTest.java
#	jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/ConfiguratorTest.java
#	jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/DelayedStartClientOnServerTest.java
#	jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/RestartContextTest.java
#	jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/ServerAnnotatedEndpointScannerGoodSignaturesTest.java
#	jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/ServerAnnotatedEndpointScannerInvalidSignaturesTest.java
#	jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/SessionTest.java
#	jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/ErrorCloseTest.java
#	jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientConnectTest.java
#	jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientSessionsTest.java
#	jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/WebSocketClientTest.java
#	jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/PartialListenerTest.java
#	jetty-websocket/websocket-api/src/test/java/org/eclipse/jetty/websocket/api/extensions/ExtensionConfigTest.java
#	jetty-websocket/websocket-api/src/test/java/org/eclipse/jetty/websocket/api/util/QuoteUtilQuoteTest.java
#	jetty-websocket/websocket-api/src/test/java/org/eclipse/jetty/websocket/api/util/QuoteUtilTest.java
#	jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ConnectionManagerTest.java
#	jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/TomcatServerQuirksTest.java
#	jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/WebSocketClientInitTest.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/GeneratorTest.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ParserTest.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/TextPayloadParserTest.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase11.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase12.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase2.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase4.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/ab/TestABCase73.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/events/EventDriverTest.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/events/JettyAnnotatedScannerTest.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/ByteAccumulatorTest.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/DeflateFrameExtensionTest.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/PerMessageDeflateExtensionTest.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/io/ConnectionStateTest.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/io/http/HttpResponseHeaderParserTest.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/message/MessageDebug.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/message/Utf8CharBufferTest.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/test/UnitGenerator.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/util/Utf8PartialBuilderTest.java
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/RedirectWebSocketClientTest.java
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/SimpleServletServer.java
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase1.java
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase2.java
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase3.java
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase4.java
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase5.java
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase6.java
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase6BadUTF.java
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase6GoodUTF.java
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase7.java
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase7BadStatusCodes.java
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase7GoodStatusCodes.java
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/TestABCase9.java
#	pom.xml
#	tests/test-continuation/src/test/java/org/eclipse/jetty/continuation/ContinuationsTest.java
#	tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/JdbcTestHelper.java
#	tests/test-webapps/test-jetty-webapp/src/test/java/org/eclipse/jetty/TestServer.java
#	tests/test-webapps/test-proxy-webapp/src/test/java/org/eclipse/jetty/TestTransparentProxyServer.java
 2020-01-15 12:20:20 -06:00
Joakim Erdfelt 81d32f64f0
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/EventSocket.java
#	jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketUpgradeRequest.java
#	jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java
 2020-01-15 11:44:43 -06:00
Joakim Erdfelt 33a5a257aa
Updates from review 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-01-15 11:32:04 -06:00
Joakim Erdfelt d701065c20
Skipping pmd/checkstyle on javadoc stage 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-01-15 08:38:49 -06:00
Joakim Erdfelt 33ed4713eb
Moving maven threading to individual stages. 
+ Javadoc stage is sensitive to multi-threaded execution

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-01-15 08:37:25 -06:00
Joakim Erdfelt aecc9a4af6
Bumping up javadoc stage timeout to 40 minutes 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-01-14 16:56:06 -06:00
Joakim Erdfelt 0d9605823a
Restoring unicode testcase 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-01-14 16:05:55 -06:00
Joakim Erdfelt 1c00006ca7
Checkstyle now mandatory on build 
+ Removed checkstyle suppressions
+ Force scan on source directories (main and test)
+ Excluding generated / filtered / copied sources
+ Removed Jenkins job for checkstyle

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-01-14 14:47:16 -06:00
Joakim Erdfelt 988b11d2bc
Fixing checkstyle violations 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-01-14 14:43:06 -06:00
Joakim Erdfelt 8c65309963
Addressing Checkstyle violations in src/test/java 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-01-14 12:33:34 -06:00
Simone Bordet 9b5aa73f59 Fixes #3385 Modernize jetty-util-ajax. 
Added type parameter to methods that were using raw types.
Updated the implementation to use generics.
Deprecated static methods.
Updated usages.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-01-14 13:14:16 +01:00
Simone Bordet 51b97d5170 Issue #4459 - Move multipart classes to jetty-server. 
Removed Surefire Plugin configuration no longer needed.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-01-14 12:23:26 +01:00
Lachlan Roberts c7b6ccca98 Issue #4475 - add tests not reading until EOF 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-01-14 19:14:48 +11:00
Lachlan Roberts 16c406b55c Issue #4475 - add test for fragmented frames 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-01-14 15:15:56 +11:00
Lachlan Roberts 26d12b9c2d Issue #4475 - proof of concept 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-01-14 14:52:50 +11:00
Lachlan Roberts a7b9df96fd cleanup WebSocket logging in EventSocket 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-01-14 10:33:19 +11:00
Lachlan e1f19be353
Closes #2620 - guard against exceptions for WebSocket onClose and onError (#4346) 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-01-14 09:22:56 +11:00
Lachlan 5bd4cee7c8
Fixes #4408 - fix issues with javax metadata and decoders (#4452) 
Remove the metadata cache per endpoint class, to allow deployment of the same class with different EndpointConfig settings.

JavaxServerFrameHandlerFactory now matches for decoders before matching for basic onMessage signatures.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-01-13 13:49:10 +11:00
Joakim Erdfelt f4fc78ac66
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-3578-epl2 2020-01-09 15:59:36 -06:00
Joakim Erdfelt 51c4cbeebe
Merge branch 'jetty-10.0.x-3578-epl2' of github.com:eclipse/jetty.project into jetty-10.0.x-3578-epl2 2020-01-09 15:57:20 -06:00
Joakim Erdfelt cfa476b65f
Removing Checkstyle jenkins stage (checkstyle is now always on) 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-01-09 15:57:09 -06:00
Joakim Erdfelt 1f8ad08281
Fixing Checkstyle violations 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-01-09 15:56:06 -06:00
Simone Bordet ce7c993c0e Fixes #3578 - Adopt EPL-2.0 for Jetty-10. 
Updated documentation files.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-01-09 21:56:05 +01:00
Greg Wilkins fdefa94486 fixed merge 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2020-01-10 07:23:56 +11:00
Greg Wilkins ee5cd7b3ea Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-01-10 07:21:41 +11:00
Greg Wilkins 96f6f2bb8d
Fix #4461 HttpOutput Aggregation (#4466) 
* Issue #4461 HttpOutput Aggregation

Added tests to check that aggregation continues after first flush of an aggregated buffer (this triggers both #4461 and the discovered bug of not aggregating because of empty at capacity aggregate buffer).

Added getAggregateSize method that does a compact to avoid empty at capacity aggregate buffer

Call onWriteComplete if residue of an overflow aggregation can itself be aggregated.

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #4461 HttpOutput Aggregation

Removed implicit compact from GzipHandler

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #4461 HttpOutput Aggregation

Improve test coverage

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #4461 HttpOutput Aggregation

Remove case that can never happen.

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #4461 HttpOutput Aggregation

updates from review

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2020-01-10 07:20:54 +11:00
Joakim Erdfelt 0e0f5822c3
Issue #3578 - Adding build reactor local remote-resources 
+ LICENSE and NOTICE.txt are now part of the remote-resources
  bundle on org.eclipse.jetty:build-resources:${project.version}
+ LICENSE and NOTICE.txt are managed only in one place now,
  the project root.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-01-09 13:59:51 -06:00
Simone Bordet 5f82e17d2f Issue #3578 - Adopt EPL-2.0 for Jetty-10. 
WIP: updated copyright headers for Java files.

TODO: doc files and META-INF files inside jars.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-01-09 20:10:19 +01:00
Simone Bordet a2ebb1dc8a
Merge pull request #4469 from eclipse/jetty-10.0.x-4459-move_multipart_to_server 
Fixes #4459 - Move multipart classes to jetty-server.
 2020-01-09 17:39:12 +01:00
Simone Bordet b2907f85f3
Merge pull request #4470 from eclipse/jetty-10.0.x-4460-custom_request_log_no_parameters 
Fixes #4460 - Provide a parameterless CustomRequestLog.
 2020-01-09 17:36:42 +01:00
Simone Bordet a1f155b44a Fixes #4460 - Provide a parameterless CustomRequestLog. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-01-09 16:39:03 +01:00
Simone Bordet 4e2c3f1447 Fixes #4459 - Move multipart classes to jetty-server. 
Moved multipart classes to jetty-server.
Updated jetty-http's pom.xml and module-info.java
removing the dependency on Servlet APIs.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-01-09 16:23:05 +01:00
Simone Bordet b14c9b6fae Updated copyright in new classes. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-01-07 17:40:11 +01:00
Simone Bordet 17ec83f5cf Merged 'jetty-10.0.x' into 'jetty-10.0.x-4450-WebSocketCoreJPMS'. 2020-01-07 17:26:31 +01:00
Simone Bordet c19d35b34f Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-01-07 17:24:30 +01:00
Simone Bordet 69808d3851
Merge pull request #4454 from JLLeitschuh/patch-1 
Use HTTPS instead of HTTP to download SNAPSHOT Deps
 2020-01-07 17:23:57 +01:00
Simone Bordet a5c99207fc Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-01-07 17:02:40 +01:00
Simone Bordet 923ec38adf Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2020-01-07 16:51:25 +01:00
Simone Bordet e3c8546667 Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2020-01-07 16:35:05 +01:00
Simone Bordet de890bb1b7 Happy New Year 2020. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-01-07 16:25:32 +01:00
Simone Bordet 8d2465c8ad Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-01-07 15:46:41 +01:00
Simone Bordet aed5a4458c Added forgotten @Deprecated annotation to deprecated method. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-01-07 15:40:46 +01:00