a4b85d1df2
Issue #4226 JavaxWebSocketServerContainer leaking into public signature
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-28 18:16:22 +11:00
6698592139
Add tests for Javax ServerContainer default configuration.
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-28 18:15:27 +11:00
cdcef4f328
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2020-01-24 20:04:41 +10:00
ff19bef4dc
alpn for jdk 1.8.0_242
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-01-24 19:59:28 +10:00
681d0bee3c
Merge pull request #4498 from eclipse/jetty-10.0.x-4383-MultiPartNPE
...
Issue #4383 - synchronize multiparts for cleanup from different thread
2020-01-24 11:42:59 +11:00
f76687ad68
Issue 4383 - changes from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-24 11:06:37 +11:00
b64964113c
Merge pull request #4486 from eclipse/jetty-9.4.x-4475-WebSocketStreamMessageOrder
...
Issue #4475 - fix WebSocket streaming message ordering
2020-01-24 10:01:22 +11:00
68aa814533
skip surefire execution for build-resources module
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-01-23 07:57:51 +10:00
9b9771d77d
spec addJspFile javadoc expect IllegalArgumentException if name is null or empty string ( #4510 )
...
* spec javadoc expect IllegalArgumentException if name is null or empty string
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-01-23 07:53:56 +10:00
158789b766
Issue #4505 Ensure get/setInitParam with null arg throws NPE ( #4509 )
...
* Issue #4505 Ensure get/setInitParam with null arg throws NPE
2020-01-22 10:48:34 +01:00
f9f2ccaefa
Issue #4383 - check for non multipart content type in constructor
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-22 14:26:36 +11:00
a76fd0e948
updated Weld
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-01-21 10:21:52 +01:00
d74caab345
Issue #4496 Update paxexam for osgi tests ( #4497 )
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-01-21 09:48:46 +01:00
0ab7751ef2
Issue #4383 - fix javadoc build issue
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-21 18:22:22 +11:00
b217a35415
Issue #4383 - add State diagram and other changes for review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-21 16:14:01 +11:00
45b3a34170
Issue #4432 Implement get/setSessionTimeout for ServletContext ( #4458 )
...
* Issue #4432 Implement get/setSessionTimeout for ServletContext
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-01-20 17:26:55 +01:00
c5d074e5f2
Issue #4383 - atomic state to MultiPart for multi-thread synchronization
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-20 22:36:23 +11:00
b520ca6d30
Issue #4433 - Implement ServletContext.addJspFile ( #4463 )
...
* Issue #4433 Implement ServletContext.addJspFile
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-01-20 09:45:35 +01:00
d0e6d123ba
Merge pull request #4494 from eclipse/jetty-10.0.x-3185-osgi_required_environment_java11
...
Fixes #3185 - Bundle-RequiredExecutionEnvironment: JavaSE-11 for Jett…
2020-01-20 09:43:55 +01:00
fedc7c6599
Issue #4360 Update to jasper 8.5.49 ( #4487 )
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-01-20 09:21:16 +01:00
b805bf1324
Issue #4361 Update to apache jsp 9.0.29 ( #4488 )
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-01-20 09:20:23 +01:00
ab94112f66
Fixes #3185 - Bundle-RequiredExecutionEnvironment: JavaSE-11 for Jetty 10.0.x.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-01-19 19:03:09 +01:00
92a2ceacbe
Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x
2020-01-17 12:51:13 -06:00
738c582468
Fixing documentation note
2020-01-17 12:29:28 -06:00
f37720fca4
Merge 9.4.x
2020-01-17 12:27:37 -06:00
20af3c1b13
Noted 9.3 is deprecated
2020-01-17 12:25:04 -06:00
56fc476d55
Updating to version 9.4.27-SNAPSHOT
2020-01-17 07:00:10 -06:00
b2eb1d068f
Merge pull request #4477 from eclipse/jetty-10.0.x-3385-modernize_json
...
Fixes #3385 Modernize jetty-util-ajax.
2020-01-17 13:31:12 +01:00
7b38981d25
Updating to version 9.4.26.v20200117
2020-01-17 06:21:47 -06:00
9a5cadca10
Fixes #3385 Modernize jetty-util-ajax.
...
Removed deprecated methods as suggested in review.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-01-17 12:04:23 +01:00
9998069cb8
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2020-01-17 10:44:34 +01:00
71716d71c4
Fixes #4444 - Connection timeout intermittently when using jetty 9.4.25.
...
Fixed write in doShutdownOutput() by updating the state before the write,
so that needsFillInterest() can check whether to also do a write or not.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-01-17 10:14:02 +01:00
65c0a76feb
Fixes #4444 - Connection timeout intermittently when using jetty 9.4.25.
...
Fixed handling of encrypted bytes to write in
needsFillInterest() when the TLS handshake status
is NOT_HANDSHAKING.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-01-17 10:14:02 +01:00
2551ee758d
Merge pull request #4490 from lorban/trivial-change
...
remove blank line
2020-01-17 10:13:24 +01:00
692d901129
Merge pull request #4446 from eclipse/jetty-9.4.x-4444-tls_idle_timeout
...
Fixes #4444 - Connection timeout intermittently when using jetty 9.4…
2020-01-17 10:10:34 +01:00
45be0f4bf7
remove blank line
...
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2020-01-17 10:05:27 +01:00
fd52ff697e
Merged branch 'jetty-9.4.x' into 'jetty-9.4.x-4444-tls_idle_timeout'.
2020-01-17 09:58:10 +01:00
65d50258b7
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2020-01-17 09:02:14 +01:00
08b1be6ea8
Issue #4475 - improve testing for MessageInputStream
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-17 18:37:47 +11:00
3d309a5797
Issue #4475 - use state machine for MessageInputStream
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-17 18:37:20 +11:00
3fd7094c01
Issue #4475 - suspend/resume to control reading frames while streaming
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-17 13:11:48 +11:00
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
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
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
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
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
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
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
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
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
Lachlan Roberts
olivier lamy
Jan Bartel
Greg Wilkins
Simone Bordet
Joakim Erdfelt
Chris Walker
Ludovic Orban