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

830 Commits

Author SHA1 Message Date
Joakim Erdfelt b5a957f415
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-10-12 08:50:53 -05:00
Simone Bordet 1cd15e8d85
Fixes #5379 - Better handling for wrong SNI. (#5398) 
* Fixes #5379 - Better handling for wrong SNI.

Reworked the SNI logic.
Added support for IP addresses in the SAN extension of certificates in the X509 class.
Fixed keystores to have CN=localhost and SAN with ip=127.0.0.1 and ip=[::1].
Fixed tests that were not using the correct Host header.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-10-12 15:48:53 +02:00
Joakim Erdfelt c79246d507
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-10-12 08:44:37 -05:00
Joakim Erdfelt 4a382db625
Increasing timeout for success (for busy CI servers) 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-10-12 08:41:37 -05:00
Joakim Erdfelt b20f0fae46
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-10-12 06:20:49 -05:00
Joakim Erdfelt 857e888e8b
Issue #5401 - Move HttpTester to jetty-http 
+ leaving jetty-http-tools alone

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-10-07 14:50:31 -05:00
Joakim Erdfelt c223ee37ab Updating to version 11.0.0-SNAPSHOT 2020-10-02 16:38:23 -05:00
Joakim Erdfelt 9ce21ec22b Updating to version 11.0.0.beta2 2020-10-02 16:20:55 -05:00
Joakim Erdfelt 88f3dd5a52
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-09-29 11:37:46 -05:00
Joakim Erdfelt daac7dce31
Fixing Distribution Proxy testcase 
+ Including jetty-client in demo-proxy-webapp
+ Cleaning up redundant reference to alpn-client
  in jetty-proxy

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-29 06:03:21 -05:00
Joakim Erdfelt deb3d60d11
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-09-28 18:04:32 -05:00
Joakim Erdfelt 3c7cd43148
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-09-28 17:55:41 -05:00
Joakim Erdfelt 8b1fcf0b58
Issue #5362 - Adding SslContextFactory.Client to Proxy's HttpClient (#5363) 
- ProxyServletTest additions for server backend TLS
 - Updating test-proxy-webapp testing
 - Better class name for test
 - More documentation on purpose of test.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-28 17:39:59 -05:00
Joakim Erdfelt fcc3b6b4cd
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-09-25 10:09:58 -05:00
Chris Walker 70c8822eef
Updated module descriptions for consistency. Resolves #5313 2020-09-23 13:10:47 -05:00
Greg Wilkins 6305cbce72 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-09-14 18:10:22 +02:00
Greg Wilkins 780e1207c7
Issue #5254 List/Show modules (#5257) 
* Issue #5254 List/Show modules

 * simplified --list-modules output
 * added --show-module

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* improve module descriptions

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2020-09-14 18:07:16 +02:00
Simone Bordet 56687590e4 Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 2020-09-02 17:48:35 +02:00
Simone Bordet 3f0b1573ec Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-09-02 17:45:45 +02:00
Simone Bordet 1e90d13127 Fixes #5103 - Proxy sets protocol version to 2.0 instead of 1.1 when accessed from H2 client. 
Fixed by removing the explicit version copy.
Leaving it at default would make the client transport
decide the version based on the transport protocol it uses.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-09-02 16:39:02 +02:00
Simone Bordet 3c4f90cc96 Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 2020-09-02 10:05:39 +02:00
Simone Bordet 255be6861a Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-09-02 10:05:06 +02:00
Joakim Erdfelt acc6e3aac2
Issue #3974 - Reworking AsyncMiddleManServletTest for test failures. 
+ be more detailed when unexpected exceptions occur
+ dump client and server when timeout occurs
+ increasing client timeout on overflow/disk test methods

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-01 17:21:48 -05:00
Simone Bordet 06a2ebc48e Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 2020-08-27 00:02:55 +02:00
Simone Bordet 7fe313ae0e Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-08-25 16:35:09 +02:00
Simone Bordet 0b8b7061b8 Issue #3974 - Flaky AsyncMiddleManServletTest. 
Now using WorkDir instead of manually creating and
deleting test directories, so that tests run in
parallel won't interfere with each other.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-08-25 16:30:37 +02:00
Jan Bartel e47d2fb32b Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-08-24 17:20:56 +02:00
Jan Bartel 77779ed6d8
Issue #4996 - Regularlize logging (#5167) 
* Issue #4996 Regularize logging

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

Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-08-24 17:15:13 +02:00
Lachlan Roberts fc330bf03a Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-08-24 16:49:31 +10:00
Lachlan Roberts bfb6b9f39a Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-08-24 16:48:52 +10:00
Lachlan Roberts 65c4e86bdb Issue #3974 - disable testAfterContentTransformerOverflowingToDisk() 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-08-24 15:24:58 +10:00
olivier lamy 85a281f473 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-08-15 09:25:23 +08:00
Simone Bordet 46220a0f58 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-08-13 15:05:23 +02:00
Simone Bordet 7b3dccc1bf Issue #5104 - AbstractProxyServlet include incorrect protocol version in Via header when accessed over H2. 
Added HttpFields.computeField() for HttpHeader too and updated usages.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-08-13 11:50:43 +02:00
Simone Bordet 79d340fdb6 Fixes #5104 - AbstractProxyServlet include incorrect protocol version in Via header when accessed over H2. 
* Introduced HttpFields.computeField() to put/append header values.
* Reworked AbstractProxyServlet.addViaHeader().

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-08-13 00:08:52 +02:00
Travis Spencer b2ab05c44a Issue #5104 - Fix protocol version in Via header to work with H2 and other protocols 
Signed-off-by: Travis Spencer <travis@curity.io>
 2020-08-12 16:55:34 +02:00
olivier lamy f6d960b41a fix merge 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-08-12 10:49:39 +08:00
olivier lamy 26b2433b3f Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-08-12 09:50:32 +08:00
Simone Bordet 16cd552995 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-08-11 21:00:43 +02:00
olivier lamy e26126264a Updating to version 11.0.0-SNAPSHOT 2020-08-11 16:48:06 +08:00
olivier lamy 6b2b429ba5 Updating to version 11.0.0.beta1 2020-08-11 16:48:06 +08:00
olivier lamy c198d26e6b Updating to version 10.0.0-SNAPSHOT 2020-08-11 16:47:55 +08:00
olivier lamy 429b091578 Updating to version 10.0.0.beta1 2020-08-11 16:47:54 +08:00
Simone Bordet 867621af89 Fixes #5079 - :authority header for IPv6 address not having square brackets. 
Fixed Jenkins failures by disabling tests that require IPv6 if it is not available.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-08-10 14:52:57 +02:00
Simone Bordet d53d9d8a1d Fixes #5079 - :authority header for IPv6 address not having square brackets. 
On the client:
* Origin.Address.host is passed through HostPort.normalizeHost(),
so that if it is IPv6 is bracketed.
Now the ipv6 address passed to an `HttClient` request is bracketed.
* HttpRequest was de-bracketing the host, but now it does not anymore.

On the server:
* Request.getLocalAddr(), getLocalName(), getRemoteAddr(),
getRemoteHost(), getServerName(), when dealing with an IPv6 address,
return it bracketed.
The reason to return bracketed IPv6 also from *Addr() methods is that
if it is used with InetAddress/InetSocketAddress it still works, but
often it is interpreted as a URI host so brackets are necessary.
* DoSFilter was blindly bracketing - now it does not.

Added a number of test cases, and fixed those that expected
non-bracketed IPv6.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-08-07 15:53:19 +02:00
Lachlan Roberts f681e3e52b Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-08-05 09:30:26 +10:00
Lachlan Roberts a5f98fbdda Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-08-05 09:29:40 +10:00
Lachlan Roberts 8f545998a8 Issue #3974 - re-enable AsyncMiddleManServletTest 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-08-04 23:08:24 +10:00
Joakim Erdfelt fe9deae849 Updating to version 9.4.32-SNAPSHOT 2020-07-23 13:53:47 -05:00
Joakim Erdfelt 450ba27947 Updating to version 9.4.31.v20200723 2020-07-23 12:46:54 -05:00