Commit Graph

17909 Commits

Author SHA1 Message Date
Greg Wilkins d27f4ee556 Fixes #4550 XmlConfiguration named parameters
Fixed #4550 named parameters with a moderate refactor.
The named parameter matching was duplicated, only considering number of args and not applied to call arguments.    This refactor puts all the behaviour in common methods and reorders the arguments to match parameters.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-02-06 14:11:58 +01:00
Ludovic Orban 386d9348ca Use contants for CR and LF fields index
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2020-02-06 10:06:33 +01:00
Greg Wilkins 1b59e42294 Issue #4541 Large response header
Fix #4541 by initially allocated a header buffer of `min(_config.getResponseHeaderSize(), _config.getOutputBufferSize())`
Only allocate a buffer of `getResponseHeaderSize` if an overflow results.

This should have no effect on the majority of responses where `getOutputBufferSize` is greater than `getResponseHeaderSize` other than the cost of a min operation.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-02-05 10:29:41 +01:00
Greg Wilkins 13458ab515 Fixed bad format
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-02-04 16:29:58 +01:00
Ludovic Orban 5df1ad9b66 change the format of detector's generated protocol name
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2020-02-04 12:42:35 +01:00
Ludovic Orban 58b1db610c detectAndUpgrade() shortcut on empty buffer
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2020-02-04 10:49:27 +01:00
Ludovic Orban 37edc016d2 improve debug logs
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2020-02-04 09:21:41 +01:00
Ludovic Orban 75b4719592 Implement detector connection factory with protocol detection mechanism
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2020-02-03 16:56:53 +01:00
Jan Bartel ecd0fe97f7
Issue #4520 Reinstate throw of UnreadableSessionDataException (#4528)
* Issue #4520 Reinstate throw of UnreadableSessionDataException

Signed-off-by: Jan Bartel <janb@webtide.com>
2020-02-01 11:13:58 +01:00
Greg Wilkins 4dbf8a3a9e
Issue #4495 ReservedThreadExecutor optimise (#4499)
* Issue #4495 ReservedThreadExecutor optimise

Use synchronousQueue for task handoff

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

* Issue #4495 ReservedThreadExecutor optimise

updates from review

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

* Issue #4495 ReservedThreadExecutor optimise

Use a linked queue rather than a deque(as a stack).  This should be simpler, better optimised and less contended.  Idling has been simplified so that a reserve thread is always dropped every idle period.

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

* Issue #4495 ReservedThreadExecutor optimise

reverted RTE and added a JMH benchmark

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

* More variants and longer tests

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

* Added LQ

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

* removed SQ2

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

* Issue #4495 ReservedThreadExecutor optimise

Replaced real implementation with SQ

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

* Issue #4495 RTE optimise

Removed alternate implementations

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

* Issue #4495 RTE optimise

updates from review

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-01-31 19:54:44 +01:00
Greg Wilkins b6f2fd2432
Issue #4529 Servlet in error page (#4530)
Added option for #4529 to control showing the servlet in an error page.
Error configuration really needs a module, but will add in 10 with a refactor.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-01-31 19:53:05 +01:00
Jesse McConnell 769cd9de69
Merge pull request #3364 from eclipse/jetty-9.4.x_maven_plugin_site
Issue #3247 Generate jetty-maven-plugin website
2020-01-31 07:14:24 -06:00
Greg Wilkins f88eb73a91
Issue #4533 Hard close from Dispatcher (#4534)
* Issue #4533 Hard close from Dispatcher

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

#4533 Do hard close from Dispatcher so response wrappers may intercept close.

* Issue #4533 Hard close from Dispatcher

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

#4533 improve test after review

* Issue #4533 Hard close from Dispatcher

Some renaming of methods to make it clear that softClose should only be used as part of sendError handling.  If softClose is used by other components, then sendError can be prevented from setting the error status.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-01-31 11:55:14 +01:00
Simone Bordet 1ee26ba736 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2020-01-30 12:09:35 +01:00
Simone Bordet 4139b67d8f Replaced references to branch 'master' with 'jetty-9.3.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-01-30 11:32:37 +01:00
Simone Bordet 7746be770a Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2020-01-30 10:17:10 +01:00
Simone Bordet f52ed62f36 Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2020-01-30 10:09:34 +01:00
Simone Bordet 305e4609b2 Updated ALPN version for JDK 8u241 and 8u242.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-01-30 10:03:38 +01:00
Jan Bartel 9850c29839
Issue #4247 use context default for samesite cookie attribute (#4512)
* Issue #4247 use context default for samesite cookie attribute

Signed-off-by: Jan Bartel <janb@webtide.com>
2020-01-29 11:05:35 +01: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 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 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
Greg Wilkins a76fd0e948 updated Weld
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-01-21 10:21:52 +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
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 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
Joakim Erdfelt 7b38981d25 Updating to version 9.4.26.v20200117 2020-01-17 06:21:47 -06: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
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
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
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 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
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