Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
25,879 Commits 69 Branches 462 Tags 354 MiB
Commit Graph

4057 Commits

Author SHA1 Message Date
Simone Bordet 70ea0a235a
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-10-22 15:10:16 +02:00
Baoyi Chen 8404eb0db1
Add log.isDebugEnabled() to reduce string allocation (#8743) 
Signed-off-by: Baoyi Chen <chen.bao.yi@qq.com>
 2022-10-20 17:28:01 +10:00
Joakim Erdfelt b37c1fe311
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-10-05 13:04:18 -05:00
Joakim Erdfelt d3050dee7b
Fix bad js replace in demos / test 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2022-10-05 09:13:57 -05:00
Joakim Erdfelt 8867b9198a
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-10-01 15:14:17 -05:00
dependabot[bot] c6f118ecc8
Bump jetty-test-helper from 5.9 to 6.0 (#8636) 
* Bump jetty-test-helper from 5.9 to 6.0

Bumps [jetty-test-helper](https://github.com/eclipse/jetty.toolchain) from 5.9 to 6.0.
- [Release notes](https://github.com/eclipse/jetty.toolchain/releases)
- [Commits](https://github.com/eclipse/jetty.toolchain/compare/jetty-test-helper-5.9...jetty-test-helper-6.0)

---
updated-dependencies:
- dependency-name: org.eclipse.jetty.toolchain:jetty-test-helper
  dependency-type: direct:production
  update-type: version-update:semver-major
...

* Fixing broken testcase

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2022-10-01 15:07:42 -05:00
Lachlan Roberts 1cc91d36ef Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-09-23 14:42:23 +10:00
Lachlan Roberts b2b7517297 Issue #7286 - fix potential issue with websocket write timeout 
Let websocket-core handle any idleTimeout & writeTimeouts instead of bad attempt to do it in Jetty/Javax API layers.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-09-19 19:04:08 +10:00
Lachlan Roberts 7795e9442c add getter for the WebSocketUpgradeHandler configuration 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-09-19 16:34:44 +10:00
Lachlan 6b2db685cd
Merge pull request #8473 from eclipse/jetty-10.0.x-WebSocketUpgradeHandler-Configuration 
add getter for the WebSocketUpgradeHandler configuration
 2022-09-19 10:51:33 +10:00
Olivier Lamy 6b1611592d
merge back release branch to bump version to 11.0.13-SNAPSHOT (#8594) 
* Updating to version 11.0.12

* Updating to version 11.0.13-SNAPSHOT

* add release jetty-9.4.49.v20220914 and 10.0.12 in VERSION.TXT
 2022-09-16 19:50:26 +10:00
Olivier Lamy dbd07146ec
merge back release branch to bump version to 10.0.13-SNAPSHOT (#8593) 
* Updating to version 10.0.12

* Updating to version 10.0.13-SNAPSHOT

* VERSION.TXT =+ content of jetty-9.4.49.v20220914 release

* remove strange line and reorder
 2022-09-16 19:50:12 +10:00
Simone Bordet 7fb4ac559d
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-09-06 09:40:25 +02:00
Simone Bordet 77ad0189ba
Fixes #8532 - Review System.nanoTime() usages. (#8535) 
* Fixes #8532 - Review System.nanoTime() usages.

Introduced o.e.j.util.NanoTime class to deal with nanoTimes.

Now NanoTime.now() should be used instead of System.nanoTime(),
and various <unit>[elapsed|since|until]() methods to calculate nanoTimes.

Furthermore, comparing 2 nanoTimes should be done via isBefore(),
rather than using the < operator, which is wrong as specified in
the System.nanoTime() javadocs.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-09-06 09:30:02 +02:00
Lachlan Roberts 458e42e7d6 add getter for the WebSocketUpgradeHandler configuration 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-08-17 21:55:13 +10:00
Lachlan Roberts 98029458a3 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-08-17 19:17:10 +10:00
Lachlan Roberts 030978d192 remove check for isOutputOpen and ignore failure in callback. 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-08-04 07:44:37 +10:00
Lachlan Roberts 8a8bc4e45b Issue #8353 - do not attempt to send pong frame after output closed 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-07-29 16:45:46 +10:00
Joakim Erdfelt 252539d77d
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-07-18 12:39:14 -05:00
Olivier Lamy 9149945945
simplify pom by using simple property rather than xml fragment (#7580) 
* simplify pom by using simple property rather than xml fragment

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2022-07-14 09:42:28 +10:00
Greg Wilkins 57949d7fe0 change to reimport to jetty-12 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2022-07-04 16:03:45 +10:00
Greg Wilkins 9ad531294c change to reimport to jetty-12 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2022-07-04 16:01:09 +10:00
Greg Wilkins bb8b1663d0 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-07-04 10:57:40 +10:00
Greg Wilkins 2b817f06c6
Combined ByteBufferPool (#8171) 
All `ByteBufferPool` can now be accessed as `RetainableByteBufferPools`.

Users now need to configure only a single buffer pool and there is just the additional retained parameter that needs consideration.
Default buffer pool has been changed to logarithmic, but we may wish to review that before next release.
Default factor size has been increased to 4096.
 2022-07-04 10:38:30 +10:00
Lachlan Roberts b999e72706 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-06-29 17:12:36 +10:00
Lachlan 8e0ccad495
Merge pull request #8176 from eclipse/jetty-10.0.x-8170-WebSocketHttp2Close 
Issue #8170 - fix WebSocket close over HTTP/2
 2022-06-29 17:12:12 +10:00
Lachlan Roberts e5a4a04b2a Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-06-29 16:37:23 +10:00
Lachlan 13c61684fe
Merge pull request #8164 from eclipse/jetty-10.0.x-8151-websocketClose 
Issue #8151 - make websocket close non-blocking
 2022-06-29 16:30:27 +10:00
Joakim Erdfelt eddff4d2ee
Merge Release 11.0.11 back into `jetty-11.0.x` (#8193) 
* Updating to version 11.0.11

* Updating to version 11.0.12-SNAPSHOT
 2022-06-22 16:24:57 -05:00
Joakim Erdfelt 64d12e2a5a
Merge Release 10.0.11 back into `jetty-10.0.x` branch (#8194) 
* Updating to version 10.0.11

* Updating to version 10.0.12-SNAPSHOT
 2022-06-22 16:24:48 -05:00
Joakim Erdfelt 8149350c10
Merge Release 11.0.10 back into `jetty-11.0.x` (#8181) 
* Updating to version 11.0.11-SNAPSHOT
 2022-06-21 14:45:00 +02:00
Joakim Erdfelt c2bc103cb9
Merge Release 10.0.10 back into `jetty-10.0.x` (#8180) 
* Updating to version 10.0.11-SNAPSHOT
 2022-06-21 14:41:41 +02:00
Lachlan Roberts 4d217cd75b Issue #8151 - add close with callback to Jetty WebSocket API 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-06-17 18:17:49 +10:00
Lachlan Roberts e4b0db8666 Issue #8170 - fix WebSocket close over HTTP/2 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-06-17 15:28:16 +10:00
Joakim Erdfelt 309b6a9b66
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-06-15 14:42:05 -05:00
Joakim Erdfelt d63569d025
Migrate code from jetty-util Logger to slf4j Logger (#8162) 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2022-06-15 20:01:48 +02:00
Lachlan Roberts ed541d344c Issue #8151 - make websocket close non-blocking 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-06-14 16:43:59 +10:00
Simone Bordet 7ed02d04ba
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-06-13 14:14:28 +02:00
Lachlan 0699bc5326
Use static exceptions for closing websocket flushers and in ContentProducer (#8155) 
* Use StaticException class in jetty-util for websocket flushers.
* Use StaticException class for ContentProducer recycle and consumeAll

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
Co-authored-by: Ludovic Orban <lorban@bitronix.be>
 2022-06-13 14:11:31 +02:00
Lachlan Roberts 8ddabd5a05 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-06-10 09:43:44 +10:00
Lachlan b1c19c0b0f
Merge pull request #8134 from eclipse/jetty-10.0.x-websocketPermessageDeflatePools 
Improve cleanup of deflater/inflater pools for PerMessageDeflateExtension
 2022-06-10 09:43:23 +10:00
Lachlan Roberts 3901159093 remove IOException from Extension.close() interface. 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-06-09 08:12:06 +10:00
Joakim Erdfelt 69216a5e3d
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-06-08 12:46:30 -05:00
Joakim Erdfelt 8de55150fe
Cherry-pick of Improvements to PathSpec for Jetty 10.0.x (#8136) 
* Cherry-pick of Improvements to PathSpec.
* From commit: 5b4d1dd1c6
* Fixing ConstraintSecurityHandler usage of PathMappings
* Fixing bad INCLUDE logic from cherry-pick in ServletHandler.doScope()
* Cleanup of non ServletPathSpec behaviors in ServletPathMapping class
* Skip optional group name/info lookup if regex fails.
* Prevent NPE on static servletPathMappings
* Update WebSocketMappings to use new PathMappings.getMatched(String)

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2022-06-08 12:36:30 -05:00
Lachlan Roberts f4c54f4571 remove close to incomingFlusher in PerMessageDeflateExtension 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-06-08 10:49:23 +10:00
Lachlan Roberts e578791518 Changes from review 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-06-08 10:44:17 +10:00
Lachlan Roberts 5a24f90064 Improve cleanup of deflater/inflater pools for PerMessageDeflateExtension 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-06-07 18:52:48 +10:00
Lachlan Roberts 311d3e823a Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-05-16 14:42:42 +10:00
Lachlan Roberts a93896b22f Issue #7977 - prevent possible NPE from UpgradeHttpServletRequest 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-05-12 16:10:15 +10:00
Joakim Erdfelt 4861897606
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-05-06 16:32:45 -05:00