20309 Commits

Author SHA1 Message Date
Lachlan Roberts
6698592139 Add tests for Javax ServerContainer default configuration.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-28 18:15:27 +11:00
Greg Wilkins
56754f4a29
Issue #4504 Forwarded Host and Server (#4511)
X-Forwarded-Host has precedence of X-Forwarded-Server and outcome is not order dependent.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-01-24 11:20:52 +01:00
olivier lamy
cdcef4f328 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-01-24 20:04:41 +10:00
olivier lamy
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
Lachlan
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
Lachlan Roberts
f76687ad68 Issue 4383 - changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-24 11:06:37 +11:00
Lachlan Roberts
6c2c4d8ad7 Issue 4450 - remove ConfigurationCustomizer static method
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-24 11:05:14 +11:00
Lachlan
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
Lachlan Roberts
64d72abde6 Extension interface now uses CoreSession and not Configuration
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-23 10:20:40 +11:00
olivier lamy
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
Olivier Lamy
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
Jan Bartel
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
Lachlan Roberts
bc88224f19 combine ConfigurationHolder and ConfigurationCustomizer
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-22 18:15:59 +11:00
Lachlan Roberts
f35a01c73c further checkstyle fixes
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-22 17:26:07 +11:00
Lachlan Roberts
acabec2e91 fix licence headers and checkstyle
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-22 16:08:08 +11:00
Lachlan Roberts
86037367bc Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-4450-WebSocketCoreJPMS 2020-01-22 14:51:51 +11:00
Lachlan Roberts
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
Greg Wilkins
a76fd0e948 updated Weld
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-01-21 10:21:52 +01:00
Jan Bartel
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
Lachlan Roberts
0ab7751ef2 Issue #4383 - fix javadoc build issue
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-21 18:22:22 +11:00
Lachlan Roberts
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
Jan Bartel
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
Lachlan Roberts
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
Jan Bartel
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
Simone Bordet
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
Jan Bartel
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
Jan Bartel
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
Simone Bordet
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
Joakim Erdfelt
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
Chris Walker
738c582468
Fixing documentation note 2020-01-17 12:29:28 -06:00
Chris Walker
f37720fca4
Merge 9.4.x 2020-01-17 12:27:37 -06:00
Chris Walker
20af3c1b13
Noted 9.3 is deprecated 2020-01-17 12:25:04 -06:00
Joakim Erdfelt
56fc476d55 Updating to version 9.4.27-SNAPSHOT 2020-01-17 07:00:10 -06:00
Simone Bordet
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
Joakim Erdfelt
7b38981d25 Updating to version 9.4.26.v20200117 jetty-9.4.26.v20200117 2020-01-17 06:21:47 -06:00
Simone Bordet
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
Simone Bordet
9998069cb8 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-01-17 10:44:34 +01:00
Simone Bordet
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
Simone Bordet
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
Simone Bordet
2551ee758d
Merge pull request #4490 from lorban/trivial-change
remove blank line
2020-01-17 10:13:24 +01:00
Simone Bordet
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
Ludovic Orban
45be0f4bf7 remove blank line
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2020-01-17 10:05:27 +01:00
Simone Bordet
fd52ff697e Merged branch 'jetty-9.4.x' into 'jetty-9.4.x-4444-tls_idle_timeout'. 2020-01-17 09:58:10 +01:00
Simone Bordet
d60b4459bf Fixes #2643 - Switch SslContextFactory.keystoreType from JKS to PKCS12.
Updated old keystores to new PKCS12 keystores.
Removed unused keystores and truststores.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-01-17 09:48:51 +01:00
Simone Bordet
65d50258b7 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-01-17 09:02:14 +01:00
Lachlan Roberts
08b1be6ea8 Issue #4475 - improve testing for MessageInputStream
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-17 18:37:47 +11:00
Lachlan Roberts
3d309a5797 Issue #4475 - use state machine for MessageInputStream
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-17 18:37:20 +11:00
Lachlan Roberts
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
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