Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-19 13:06:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,087 Commits 78 Branches 466 Tags
Commit Graph

21087 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joakim Erdfelt
25a2326221
Merge pull request #5054 from eclipse/jetty-10.0.x-5043-AnonymousWebSocketListener 
Issue #5043 - allow anonymous WebSocketListener / Endpoint classes to be used
 2020-07-22 14:49:48 -05:00
Jan Bartel
b5eff0eb6b Skip javadoc for test-jetty-osgi-webapp-resources war. 2020-07-22 11:21:33 +02:00
Jan Bartel
3f5d94f80f Fix TestJettyOSGiClasspathResources test. 
Also remove unnecessary deploy of tinybundle for
TestJettyOSGiBootWithJavaxWebSocket.
 2020-07-21 18:41:57 +02:00
Jan Bartel
c4ffb65791 Fix new pom and TestJettyOSGiClasspathResource. 
Test is still a WIP: in jetty-10 there are errors that don't occur in
jetty-9, still investigating.
 2020-07-21 15:48:06 +02:00
Jan Bartel
c791c58a92 Fix pom for test-jetty-osgi-webapp-resources 2020-07-21 14:29:56 +02:00
gregw
965e73e9e9 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-07-20 12:01:53 +02:00
Jan Bartel
89045959ac
Issue #5013 Classloader.getResources resolves preferentially from osgi bundle loader (#5034) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-07-20 11:05:18 +02:00
gregw
6125a07a63 Issue #5053 
removed weak random from Masker.
 2020-07-17 17:59:57 +02:00
gregw
88ec429b9c Issue #5053 
removed weak random from digest.
 2020-07-17 13:02:46 +02:00
gregw
f6d39849e8 Improves #5053 by giving option of secure or pseudo random 
Allow random to be passed in and can default to a weak pseudo random.
 2020-07-17 12:19:22 +02:00
Joakim Erdfelt
8e7bfa0ee5
Some jetty-servlet test cleanup 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-07-16 14:28:08 -05:00
Joakim Erdfelt
2d3b5d3f05
Moving badly merged jetty-jmh source files into correct location 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-07-16 13:20:43 -05:00
Greg Wilkins
beca81c990
Fixes #5053 CWE-331 (#5056) 
Replace uses of Random with SecureRandom.
We do not believe any of these uses of Random represent any security vulnerability, but we are making this
change for an abundance of caution and to avoid warnings from 3rd party scanning tools.
 2020-07-16 15:31:19 +02:00
Jan Bartel
668174d91d Issue #5025 - wrong welcome file handling with dispatcher.include() and non-default mapping (#5026) 
Signed-off-by: Grzegorz Grzybek <gr.grzybek@gmail.com>
Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-07-16 12:26:39 +02:00
Lachlan Roberts
0a30525653 Issue #5043 - allow WebSocketListener / Endpoint anonymous classes to be used 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-16 12:44:54 +10:00
Lachlan Roberts
00777fe05a Issue #5043 - add testing for WebSocketListener / Endpoint as anonymous classes 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-16 12:21:03 +10:00
beango1
ce62664fb4 Update startup-unix-service.adoc 
JETTY_USER variable need to be set for the init script to run as 'jetty' instead of root
Signed-off-by: Binh Trinh <beango@gmail.com>
 2020-07-16 10:08:22 +10:00
Lachlan Roberts
ef60808bae fix licence headers and imports from merge 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-16 09:27:46 +10:00
Lachlan
fc473f3368
Merge pull request #5031 from eclipse/jetty-10.0.x-5018-WebSocketClientRequestTimeout 
Issue #5018 - add WebSocketClient UpgradeRequest timeout to jetty 10
 2020-07-16 09:19:47 +10:00
Lachlan Roberts
f0f153cc97 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-07-16 09:10:07 +10:00
Lachlan
bbb0f6617c
Merge pull request #5042 from eclipse/jetty-9.4.x-5019-SslReload 
Issue #5019 - hot-reload SSL certificates if keystore file changed
 2020-07-16 09:09:03 +10:00
Lachlan
cadaf87583
Merge pull request #5046 from eclipse/jetty-10.0.x-4985-AttributeNameSet 
Issue #4985 - fix NPE related to use of Attributes.Wrapper getAttributeNameSet() Jetty 10
 2020-07-16 08:51:56 +10:00
Lachlan Roberts
c09e4d6f86 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-16 08:46:29 +10:00
Lachlan
42ea202858
Merge pull request #5047 from eclipse/jetty-9.4.x-moduleCommentDoNotEdit 
the "DO NOT EDIT" comment in .mod files should start with '#'
 2020-07-16 08:43:00 +10:00
gregw
7c44d0a01a Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-07-15 23:38:04 +02:00
Greg Wilkins
5c1dda3f7c
Issue #5029 Relative Redirection (#5038) 
* Issue #5029 Relative Redirection

Provide option to allow relative redirection

* Issue #5029 Relative Redirection

Fixed checkstyle

* rename from review
 2020-07-15 23:14:26 +02:00
Grzegorz Grzybek
b08fd185c8
Issue #5025 - wrong welcome file handling with dispatcher.include() and non-default mapping (#5026) 
Signed-off-by: Grzegorz Grzybek <gr.grzybek@gmail.com>
 2020-07-15 14:29:33 +02:00
Jan Bartel
8cc380ed9e Fix ServletHandlerTest.testFiltersServletsListenersAsBeans 
In jetty-10, the Container.Listener is also dumped as a bean, whereas it is not in
jetty-9. The test was checking that nothing was dumped as a bean, so
changed the test to explicitly look for the special formatting for
listeners, filters and servlets.
 2020-07-15 11:26:58 +02:00
Lachlan Roberts
0f7d99c3bf add documentation for ssl-reload, change exception message in SslContextFactory 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-15 19:01:15 +10:00
gregw
eb1e0b6d51 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-07-15 10:52:57 +02:00
Sergey Tselovalnikov
6b57654b03
Avoid large allocations of temporary buffers in BuferUtil (#5045) 
* Avoid large allocations of tmp buffers in buferutil

Signed-off-by: Sergey Tselovalnikov <sergeicelov@gmail.com>

* review feedback

Signed-off-by: Sergey Tselovalnikov <sergeicelov@gmail.com>
 2020-07-15 10:07:27 +02:00
Lachlan Roberts
de1b6745c5 the DO NOT EDIT comment in .mod files should start with '#' 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-15 16:47:22 +10:00
Lachlan Roberts
037097211c fix cast for HttpServletMapping 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-15 16:03:12 +10:00
Lachlan Roberts
c40ba69222 add null checks in SslContextFactory for _factory, which could be null if reload failed 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-15 15:35:22 +10:00
Lachlan Roberts
2541f1f648 add javadoc for KeyStoreScanner class 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-15 11:20:57 +10:00
Jan Bartel
fb4cfa9be6 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-07-14 15:01:37 +02:00
Jan Bartel
6d88f966e1
Issue #4736 Use variables for osgi import ranges (#4963) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-07-14 14:22:38 +02:00
Jan Bartel
3b9def69bc Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-07-14 14:11:15 +02:00
Jan Bartel
b1e08ba4e0
Issue #5020 Make servlets,filters,listeners beans again (#5028) 
* Issue #5020 Make servlets,filters,listeners beans again

Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-07-14 11:20:20 +02:00
Lachlan Roberts
145dcf502c cleanups after merge 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-14 16:52:50 +10:00
Lachlan Roberts
df34a6269b Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-5018-WebSocketClientRequestTimeout 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-14 16:39:23 +10:00
Lachlan Roberts
a83844df32 changes from review 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-14 16:10:07 +10:00
Simone Bordet
7b05567b52 Issue #4808 - Review HttpClient Request header APIs. 
For some reason, Request.getHeaders() returned HttpFields,
but HttpRequest.getHeaders() returned HttpFields.Mutable,
and it was obviously wrong.

Fixed WebSocket code that was relying on this API error.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-07-13 16:44:07 +02:00
Lachlan Roberts
b03643961d add tests in KeystoreScannerTest for changes with symlinks 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-14 00:22:21 +10:00
Lachlan Roberts
62ee077b79 move code of ssl-reload module to jetty-util, move module files to jetty-server 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-13 23:11:09 +10:00
Lachlan Roberts
e92d35bd2c fix checkstyle error from extra newline 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-13 15:56:46 +10:00
Lachlan Roberts
fc0f4b28f9 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-13 15:06:09 +10:00
Lachlan Roberts
ca404f157f clean up and rename fields in EventSocket WebSocket test utility class 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-13 14:53:55 +10:00
Lachlan Roberts
6325d4b55c Issue #4985 - fix NPE related to use of Attributes.Wrapper getAttributeNameSet() 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-13 14:17:37 +10:00
Lachlan Roberts
0705d8ea77 generalize the exception type tested in KeystoreReloadTest 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-13 13:35:47 +10:00