Commit Graph

22606 Commits

Author SHA1 Message Date
Ludovic Orban 6d9d5484a7 lock all HttpInput methods to prevents concurrent threads to work on the same ByteBuffer
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-02-10 18:03:10 +01:00
Ludovic Orban f8bf885686 restore the committee's loop
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-02-10 18:02:37 +01:00
Ludovic Orban 03e2789699 Merge remote-tracking branch 'origin/jetty-9.4.x-5605-wakeup-blocked-threads' into jetty-10.0.x-5605-wakeup-blocked-threads 2021-02-10 15:53:38 +01:00
Ludovic Orban 3c46c53d91 fix the committee's loop
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-02-10 15:49:55 +01:00
gregw 9f2a4f5ad5 Fix #5605 write side
refactored the complete method to consider unrecoverable API states no matter what the httpout state
actually is.  This avoid duplication of OPEN, CLOSING, CLOSED etc. handling.
2021-02-10 15:35:48 +01:00
Ludovic Orban 3c4713db69 nit
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-02-09 17:47:11 +01:00
Ludovic Orban 12734b1496 committee loop rewrite
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-02-09 17:19:50 +01:00
Ludovic Orban ce29e7cf1c nits
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-02-09 17:12:17 +01:00
Ludovic Orban a29a054fe1 fix leak
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-02-09 17:02:54 +01:00
Ludovic Orban f81ff1707e move fill interested + pending read check out of upgrade
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-02-09 15:26:10 +01:00
Ludovic Orban 50a379d5cf align HttpInput and HttpOutput on recycle and reopen
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-02-09 09:27:26 +01:00
Ludovic Orban d297e9c473 unblock readers after consumeAll
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-02-09 09:26:34 +01:00
Ludovic Orban 9611a252a5 Merge remote-tracking branch 'origin/jetty-9.4.x-5605-wakeup-blocked-threads' into jetty-10.0.x-5605-wakeup-blocked-threads 2021-02-08 10:52:57 +01:00
gregw ed534b84ef Fix #5937
updates from review.
2021-02-05 15:36:34 +01:00
gregw 39f6f87ca7 Fix #5605 Unblock non container Threads
Simplification. Always abort on any pending read or write in completion.
2021-02-04 10:26:11 +01:00
gregw 096e8b83e9 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-5605-wakeup-blocked-threads 2021-02-04 09:58:39 +01:00
gregw 7235e492c8 Fix #5605 Unblock non container Threads
Simplification. Always abort on any pending read or write in completion.
2021-02-04 09:58:24 +01:00
Simone Bordet 4c67b886a4 Merged branch 'jetty-10.0.x-more_docs' into 'jetty-10.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-02-03 19:46:54 +01:00
gregw e9315fe51f Fix #5605 Unblock non container Threads
revert fillInterest cancellation and just abort connection instead.
tested for all transports
2021-02-03 17:27:25 +01:00
Simone Bordet 0ccaa9f87b Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-02-03 15:25:09 +01:00
Simone Bordet a26ad6d7ea
Merge pull request #5910 from eclipse/jetty-9.4.x-5787-managedselector_jmx
Fixes #5787 - Make ManagedSelector report better JMX data.
2021-02-03 15:22:58 +01:00
Simone Bordet 0bbc9429a1 Fixed javadoc error.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-02-03 15:21:44 +01:00
gregw 5f4919c45a Fix #5605 Unblock non container Threads
cleanup debug
2021-02-03 14:04:29 +01:00
gregw 70056e2c69 Fix #5605 Unblock non container Threads
fix test
2021-02-03 13:40:06 +01:00
Ludovic Orban 04cb3f3736
Merge pull request #5926 from eclipse/jetty-10.0.x-tck-run-12-servlet-upgrade
Implementation of HttpServletRequest.upgrade
2021-02-03 13:11:50 +01:00
Ludovic Orban 421ed6bf8d implementation of HttpServletRequest.upgrade
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-02-03 13:10:38 +01:00
gregw 25cbe652a0 Fix #5605 Unblock non container Threads
reorder
2021-02-03 11:27:25 +01:00
gregw a100d80d26 Fix #5605 Unblock non container Threads
Don't consumeAll before upgrade
2021-02-03 11:03:02 +01:00
Joakim Erdfelt 4b568264f1
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-02-02 12:17:10 -06:00
Joakim Erdfelt 5ad9bc9b3d
Merge pull request #5669 from eclipse/dependabot/maven/jetty-9.4.x/org.eclipse.jetty.toolchain-jetty-version-maven-plugin-2.7
Bump jetty-version-maven-plugin from 2.6 to 2.7
2021-02-02 12:15:53 -06:00
gregw a110fc3468 Fix #5605 Unblock non container Threads
test and fixes for the write side.
2021-02-02 17:55:15 +01:00
gregw 0d85c7d220 Fix #5605 Unblock non container Threads
test and fixes for the write side.
2021-02-02 17:49:17 +01:00
gregw b3268eb3b5 Fix #5605 Unblock non container Threads
Ensure that HttpInput is always closed to EOF, EarlyEOF or Error, so that non container threads doing blocking reads
will not block forever, even if late.   Delay recycling of HttpInput until next request is received.
2021-02-02 16:33:32 +01:00
Joakim Erdfelt b16313b1c8
Merge pull request #5876 from eclipse/jetty-10.0.x-logging-jmx-dynamic
Issue #5872 - JMX DynamicMBean for jetty-slf4j-impl
2021-02-02 08:59:48 -06:00
Joakim Erdfelt 4444e15d6e
Reducing build timeout from 4 hours to 2 hours
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-02-02 08:58:17 -06:00
gregw 9cc7be4842 Fix #5605 Unblock non container Threads
Ensure that HttpInput is always closed to EOF, EarlyEOF or Error, so that non container threads doing blocking reads
will not block forever, even if late.   Delay recycling of HttpInput until next request is received.
2021-02-02 14:03:38 +01:00
Jan Bartel 49098e6302 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Jan Bartel <janb@webtide.com>
2021-02-01 17:15:35 +01:00
Jan Bartel 4bf250fbaa
Jetty 9.4.x 5859 classloader leak queuedthreadpool (#5894)
* Issue #5859 Fix Classloader leak from QueuedThreadPool

Signed-off-by: Jan Bartel <janb@webtide.com>
2021-02-01 16:58:02 +01:00
olivier lamy 5b97d91f59 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2021-02-01 10:12:39 +10:00
Olivier Lamy efbd1813ff
force properties encoding when filtering resources (#5929)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-02-01 10:11:09 +10:00
Simone Bordet 2f766632b3 Fixes #5924 - Javadoc build triggers maven error
Fixed javadoc generation error.
Apparently, this is caused by a doxia dependency of asciidoctor-maven-plugin
that transitively pulls in Apache HttpClient, but at an older version
that causes this error:

Exception in thread “main” java.lang.NoSuchMethodError: ‘org.apache.http.HttpHost org.apache.http.client.utils.URIUtils.extractHost(java.net.URI)’

Adding Apache HttpClient as an explicit dependency of the asciidoctor-maven-plugin
works around the issue.

Co-authored-by: olivier lamy <oliver.lamy@gmail.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-02-01 00:32:24 +01:00
Simone Bordet f4323a3e3f Improvements to the Jetty documentation.
Moved documentation examples back into jetty-documentation module.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-02-01 00:24:13 +01:00
Joakim Erdfelt 17958ef79d
Issue #5924 - Disabling javadoc module (again)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-30 10:12:50 -06:00
olivier lamy f80792f377 version from pom interpolation and fix mvn central url
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-01-29 12:50:23 +10:00
Joakim Erdfelt 8c34fdd4ca
Merge pull request #5928 from eclipse/jetty-10.0.x-5924-asciidoc-breakout
Issue #5924 - Reorganized jetty-documentation
2021-01-28 16:08:32 -06:00
Joakim Erdfelt 6a5e1d3961
Merge pull request #5927 from eclipse/jetty-10.0.x-5942-enable-javadoc
Issue #5924 - Enable javadoc module again
2021-01-28 16:07:52 -06:00
Joakim Erdfelt 618bff71e2
Issue #5924 - Reorganized jetty-documentation
* New top level /documentation/
  Which is a parent pom
* Existing /jetty-documentation/ moved to new
  /documentation/jetty-documentation/ location
* New /documentation/jetty-asciidoctor-extensions/ project
  Created from the java code in the old
  /jetty-documentation/src/main/ tree
* Referencing new jetty-asciidoctor-extensions project
  in asciidoc plugin on /documentation/jetty-documentation/pom.xml
* All projects in /documentation/ are now on
  org.eclipse.jetty.documentation groupId

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-28 10:49:21 -06:00
Joakim Erdfelt f2fe26ffcd
Issue #5924 - Enable javadoc module again
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-28 10:10:26 -06:00
Jesse McConnell fb4ecf09e9
#5924 remove odd jetty-documentation dependency busting javadoc generation (#5925) 2021-01-28 10:56:21 +10:00
Joakim Erdfelt bf90ce2435
Issue #5942 - Disable javadoc module as it breaks the jenkins build.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-27 18:11:26 -06:00