Commit Graph

22522 Commits

Author SHA1 Message Date
Joakim Erdfelt e81c847998
Happy New Year 2021 (Jetty 10 edition)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-21 15:05:57 -06:00
Joakim Erdfelt 9c7b6cb62e
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-01-21 14:56:21 -06:00
Joakim Erdfelt 176e29e408
Happy New Year 2021
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-21 12:31:00 -06:00
Simone Bordet 7b1e64f6a5 Issue #5880 - Move test-simple-webapp to demos.
Adding dependency to jstl.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-01-21 17:25:24 +01:00
Simone Bordet 9fe5700260
Fixes #5880 - Move test-simple-webapp to demos. (#5881)
* Fixes #5880 - Move test-simple-webapp to demos.

Moved test-simple-webapp to demos under demo-simple-webapp.
Moved the JSP demos into their own module: out of demo-jetty-webapp into demo-jsp-webapp.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-01-21 15:27:03 +01:00
gregw 781f589c7c Added history to VERSION.txt
http://web.archive.org/web/19980125013900/http://www.mortbay.com/
2021-01-21 10:12:36 +01:00
Lachlan f2cde85390
Merge pull request #5874 from eclipse/jetty-10.0.x-5866-WebSocketProgrammaticUpgrade
Issue #5866 - allow WebSocket programmatic upgrades
2021-01-20 16:07:07 +11:00
Lachlan Roberts c8beacb9ad Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-01-20 16:03:50 +11:00
Lachlan 759805580b
Merge pull request #5860 from eclipse/jetty-9.4.x-5851-WebSocketServletCleanup
Issue #5851 - remove WebSocketServletFactory as ServletContext attribute on destroy
2021-01-20 15:50:48 +11:00
Joakim Erdfelt 7d167e17fa
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-01-19 10:41:29 -06:00
Simone Bordet f17cc9b311 Improvements to the Jetty documentation.
Fixed typos.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-01-18 17:09:10 +01:00
Simone Bordet 14f829a8f5
Merge pull request #5886 from eclipse/jetty-10.0.x-5882-simplify_alpn_modules
Fixes #5882 - Simplify ALPN modules.
2021-01-18 10:17:49 +01:00
Simone Bordet f52521ba75 Fixes #5882 - Simplify ALPN modules.
Deleted alpn-<version>.mod files, replaced by a single alpn-java.mod.
This new module _provides_ "alpn-impl" by default, and so does conscrypt.mod.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-01-15 16:51:26 +01:00
Simone Bordet e1f62c4905 Issue #5799 - Allow specifying the duration an object can stay in a pool.
Fixed AbstractConnectionPool.accept() to wrap the entry into an EntryHolder.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-01-14 20:09:15 +01:00
Joakim Erdfelt 2e53ec5384 Updating to version 9.4.37-SNAPSHOT 2021-01-14 11:27:24 -06:00
Joakim Erdfelt 238ec6997c Updating to version 9.4.36.v20210114 2021-01-14 10:29:28 -06:00
Joakim Erdfelt 25a3d19734
Adding IPv6 Address (non-literal) without port test case
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-14 10:03:06 -06:00
Jan Bartel 87a2cc2698 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-01-13 22:41:32 +01:00
Jan Bartel b99eb3f76c
Issue #5684 Fix and re-enable ServletRequestLogTest. (#5877)
Signed-off-by: Jan Bartel <janb@webtide.com>
2021-01-13 22:35:36 +01:00
Lachlan 16acdcf7e9
Merge pull request #5852 from eclipse/jetty-10.0.x-5850-UpgradeRequestNPE
Fix NPE from WebSocketSession.getUserPrincipal() in Jetty10
2021-01-13 12:01:24 +11:00
Lachlan Roberts 0d48b8b991 Issue #5866 - add Programmatic WebSocket Upgrade to Jetty API
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-13 10:45:45 +11:00
Lachlan Roberts 78707fffde CreatorNegotiator should remain private, use from on WebSocketNegotiator
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-13 09:55:19 +11:00
Jan Bartel 51709dce9d Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-01-12 17:50:22 +01:00
Jan Bartel a5a8327a1e
Issue #5684 Fix testSetBadBoolean and remove @Disabled (#5875)
Signed-off-by: Jan Bartel <janb@webtide.com>
2021-01-12 17:48:37 +01:00
Simone Bordet 4b775525ff Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-01-12 17:16:47 +01:00
Simone Bordet 03ec5bb773
Merge pull request #5825 from rk1165/issue_5786
Issue #5786 : Revisit Statistics classes
2021-01-12 17:15:44 +01:00
Jan Bartel 8cd0d45ed0 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-01-12 16:52:47 +01:00
Ludovic Orban e9832492b3 Add missing files to previous merge of remote-tracking branch origin/jetty-9.4.x into jetty-10.0.x
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-01-12 16:31:13 +01:00
Ludovic Orban 058a488c30 Merge remote-tracking branch origin/jetty-9.4.x into jetty-10.0.x
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-01-12 16:22:11 +01:00
Jan Bartel 46031c225a Re-enable PathWatcherTest after fix for 5830
Signed-off-by: Jan Bartel <janb@webtide.com>
2021-01-12 16:13:50 +01:00
Jan Bartel 395645aaef Clarify reason for Disabled annotation on test classes.
Signed-off-by: Jan Bartel <janb@webtide.com>
2021-01-12 15:45:08 +01:00
Ludovic Orban ba5ba010b8
Merge pull request #5801 from eclipse/jetty-9.4.x-5799-pool-max-duration2
Implement max duration of HTTP ConnectionPools
2021-01-12 15:42:32 +01:00
Ludovic Orban 0dec883fda implement connection pool max duration 2021-01-12 15:41:56 +01:00
Jan Bartel f16e3c965b Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-01-12 12:22:50 +01:00
Jan Bartel 03ae75f407 Add reason for @Disabled.
Signed-off-by: Jan Bartel <janb@webtide.com>
2021-01-12 12:20:28 +01:00
Jan Bartel a36f8d2819 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-01-12 12:15:50 +01:00
Jan Bartel 2adea58037 Remove old comment from JdbcLoginServiceTest
Signed-off-by: Jan Bartel <janb@webtide.com>
2021-01-12 12:14:56 +01:00
Jan Bartel 34f71cf036 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-01-12 12:00:38 +01:00
Jan Bartel e1e16ae54b
Issue #5870 Windows URI case comparison fails (#5873)
* Issue #5870 Windows URI case comparison fails

Signed-off-by: Jan Bartel <janb@webtide.com>

* Issue #5870 - Updating Windows tests

+ Eliminating OS.MAC (as it doesn't support drive letters)
+ Adding alt URI syntax version as well

Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-12 11:44:56 +01:00
Jan Bartel 798337a3f6 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-01-12 11:39:17 +01:00
Jan Bartel 1a7c3deb09
Issue #5830 Remove com.sun.nio.file import. (#5838)
* Issue #5830 Remove native classes from PathWatcher.

Removed use of com.sun.nio.file.SensitivityWatchEventModifier, no longer needed.
This has the desirable side-effect of getting rid of com.sun.nio.file package imports.

Signed-off-by: Jan Bartel <janb@webtide.com>
2021-01-12 11:30:04 +01:00
Simone Bordet 847e8c612f Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-01-12 11:30:00 +01:00
Simone Bordet 6e1cd862e4
Fixes #5845 - Use UTF-8 encoding for client basic auth if requested. (#5847)
* Fixes #5845 - Use UTF-8 encoding for client basic auth if requested.

* Introduced get/setCharset in BasicAuthenticator on server-side.
* Looking for the "charset" parameter on the client-side, and if there, use it.
* Added test case.
* Code cleanups.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-01-12 11:26:33 +01:00
Simone Bordet 750de51974 Issue #1673 - jetty-demo/etc/keystore should not be distributed.
Updated documentation: now the test-keystore is generated on-the-fly.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-01-12 10:56:35 +01:00
Simone Bordet 7fe8d1d4ad Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-01-12 10:43:02 +01:00
Simone Bordet 17891673b1
Merge pull request #5867 from eclipse/jetty-9.4.x-5689-keyStore_absolute_path
Fixes #5689 - Jetty ssl keystorePath doesn't work with absolute path.
2021-01-12 10:07:41 +01:00
Lachlan 01c4390808
Merge pull request #5862 from eclipse/jetty-10.0.x-1673-generateTestKeystore
Issue #1673 - generate test keystore instead of distributing one
2021-01-12 17:18:24 +11:00
Lachlan Roberts 2d43661fe3 Set the javax ws upgrade request in constructor.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-12 11:47:35 +11:00
Lachlan 7aae1801e6
Merge pull request #5861 from eclipse/jetty-10.0.x-getMappings
Fix bad refactor of WebSocket getMappings method.
2021-01-12 11:17:50 +11:00
Lachlan Roberts c7d3542398 add newline at end of pom.xml file
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-12 11:10:11 +11:00