mirror of
https://github.com/curl/curl.git
synced 2026-08-25 20:43:32 +03:00
h3-proxy: fixes around H3 proxy
code: - less exception handling in existing code - true ip happy eyeballing - enable certificate verification - cf-h2-proxy: abort connection when server closed connection tests: - remove all --insecure and --proxy-insecure args - make session reuse test_60_12 a working one - resolve port conflicts between h2o and nghttpx - use proxy args better - make test_60_06 run shorter - kill h2o at the end of tests, normal stop takes too long Ref:59213f8248#21789 Follow-up toe78b1b3ecc#21153 Closes #21798
This commit is contained in:
parent
59213f8248
commit
e4139a73c8
25 changed files with 442 additions and 365 deletions
|
|
@ -824,15 +824,16 @@ class Env:
|
|||
|
||||
@property
|
||||
def h3proxys_port(self) -> int:
|
||||
return self.CONFIG.ports["h3proxys"]
|
||||
return self.CONFIG.ports["h2o_h3proxys"]
|
||||
|
||||
def pts_port(self, proto: str = "http/1.1") -> int:
|
||||
def pts_port(self, proto: str = "http/1.1", use_h2o: bool = False) -> int:
|
||||
# proxy tunnel port
|
||||
prefix = 'h2o_' if use_h2o else ''
|
||||
if proto == "h3":
|
||||
return self.CONFIG.ports["h3proxys"]
|
||||
return self.CONFIG.ports.get("h2o_h3proxys", 0)
|
||||
if proto == "h2":
|
||||
return self.CONFIG.ports["h2proxys"]
|
||||
return self.CONFIG.ports["proxys"]
|
||||
return self.CONFIG.ports.get(f"{prefix}h2proxys", 0)
|
||||
return self.CONFIG.ports[f"{prefix}proxys"]
|
||||
|
||||
@property
|
||||
def caddy(self) -> str:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue