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

21333 Commits

Author SHA1 Message Date
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
Jan Bartel a991f77e0e Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-07-15 14:36:36 +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 497f3bafd4 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-07-15 11:27:31 +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 f9750c9632 Test aborting with exception before WS upgrade completes. 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-15 19:21:01 +10: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 fdd6f8858e Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-07-15 10:53:34 +02: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 c922b818eb Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-07-14 16:30:52 +02: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 0b57809c04 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-07-14 14:19:50 +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
Lachlan Roberts 25a7da2635 add test for abort with CompletableFuture.completeExceptionally() 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-14 21:47:31 +10:00
Lachlan Roberts 664cf5fb52 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-5018-WebSocketClientConnectFuture 2020-07-14 21:21:08 +10: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 9c910e9413 changes from review 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-14 18:09:40 +10: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
Lachlan Roberts dc91f690be use WorkDirExtension in KeystoreReloadTest to fix failing tests on jenkins 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-13 11:33:51 +10:00
Lachlan Roberts 80f09e1f71 fix issues with the ssl-reload module 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-10 18:44:44 +10:00
Lachlan Roberts f34873419e Issue #5019 - add jetty module files and xml to use ssl-reload with start.jar 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-10 18:44:35 +10:00
Lachlan Roberts 13e034fc5f Issue #5019 - add testing for the SslKeyStoreScanner 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-10 18:44:24 +10:00
Lachlan Roberts 24d0e50a0c Issue #5019 - add class to do SSL keystore hot-reload in new module 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-10 18:44:08 +10:00
olivier lamy 9b32bd336e upgrade github api version to fix usage of token 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-07-10 17:46:40 +10:00
olivier lamy 3ddccfe4bc support gh token for github api 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-07-10 15:12:03 +10:00
olivier lamy eefe3d202b revert fail release 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-07-10 15:04:22 +10:00
olivier lamy 9619a5a743 Updating to version 10.0.0.beta1 2020-07-10 14:23:28 +10:00
olivier lamy bc098e5bee fix VERSION.txt 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-07-10 06:51:43 +10:00
olivier lamy 822c1a6e0e fix VERSION.txt 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-07-10 06:49:46 +10:00
olivier lamy 6ff39cf848 Updating to version 11.0.0-SNAPSHOT 2020-07-10 06:25:08 +10:00
olivier lamy 4c250b0f93 Updating to version 11.0.0.beta1 2020-07-10 06:25:07 +10:00
Simone Bordet 80f1afb0fd Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 2020-07-09 16:19:41 +02:00
Simone Bordet 113595254b Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-07-09 16:19:24 +02:00