master
peer: use the given proxy port, fall back to the documented default···
Since bc40e09f63 the proxy port is read with CURLU_NO_DEFAULT_PORT, which drops an explicit port when it matches the default port of the proxy URL's scheme. A proxy string without a scheme is guessed as http, so "--socks5 host:80" ended up connecting to port 1080, and an explicit port lost against CURLOPT_PROXYPORT when it happened to be the scheme default.
The fallback also became the scheme's default port, so a plain HTTP proxy without a port used 80 instead of the documented 1080.
Use the port as given, otherwise CURLOPT_PROXYPORT, or 443 for https default, or 1080 for all others as default, like before.
Extend unit test 2413 to verify.
Follow-up to bc40e09f63.
Fixes https://github.com/curl/curl/issues/23681 Closes https://github.com/curl/curl/pull/23682
- ..
- cmdline-opts4716019
- examples098dd1c
- internals7512e76
- libcurl4e1eb7f
- tests6b2e81f
- .gitignore31ca765
- ALTSVC.md24b961a
- BINDINGS.md6c9aba6
- BUG-BOUNTY.md765cf49
- BUGS.md5f37047
- CIPHERS-TLS12.mdd67c62b
- CIPHERS.md0c1c3db
- CMakeLists.txt9c02530
- CODE_OF_CONDUCT.mdf42fd49
- CODE_REVIEW.mda80d2ee
- CONTRIBUTE.mdf9b473c
- CURL-DISABLE.mdf3ba9cc
- CURLDOWN.mdc804eae
- DEPENDENCIES.md9452a6e
- DEPRECATE.mdc11d148
- DISTROS.md3a43344
- EARLY-RELEASE.md833a785
- ECH.md8a01532
- EXPERIMENTAL.md5140774
- FAQ.mdb23edbc
- FEATURES.mddc04e1f
- GOVERNANCE.mdbae0600
- HELP-US.mde676dcf
- HISTORY.mda883236
- HSTS.mdc6d8720
- HTTP-COOKIES.md2a32aae
- HTTP3.mdc913aeb
- HTTPSRR.mde046e51
- INFRASTRUCTURE.mdddcd128
- INSTALLff260b1
- INSTALL-CMAKE.md5a940c5
- INSTALL.md5ae376d
- IPFS.md612507e
- KNOWN_BUGS.mdd2eb817
- KNOWN_RISKS.md15f6c33
- MAIL-ETIQUETTE.md9c2527d
- MANUAL.mdc6082dd
- Makefile.amd99dffe
- README.md22d96ea
- RELEASE-PROCEDURE.md38ee29d
- ROADMAP.mdabf306b
- RUSTLS.md4899a10
- SECURITY-ADVISORY.mdfbfafa3
- SPONSORS.mddc9d26f
- SSL-PROBLEMS.md62f30b4
- SSLCERTS.mdd5110e1
- THANKS0fb3522
- THANKS-filtera8ac7e7
- TODO.mddb1322a
- TheArtOfHttpScripting.md7e5f2d4
- URL-SYNTAX.md6e6fed4
- VERIFY.mdc18b65a
- VERSIONS.mdee8dba1
- VULN-DISCLOSURE-POLICY.mdb393c06
- curl-config.md12ad245
- mk-ca-bundle.mdb93286a
- options-in-versions595cb05
- runtests.md7678bcf
- testcurl.md090401a
- wcurl.md59f4267
- peer: use the given proxy port, fall back to the documented default
- GHA: update dependency reuse to v6.3.0
- tests: exclude 2088, 2089, 2095 (mTLS), 17_01_sslinfo_plain for LibreSSL 4.4.0 due to upstream limit
- openssl: stop I/O after fatal shutdown errors
- tests/data: add missing `nghttpx` feature tags, and one minor tidy-up
- cmake: verify OpenSSL 3+ version early
- cmake: detect, display and verify LibreSSL version
- docs/cmdline-opts/retry.md: mention duplicate data with redirected output
- GHA/macos: disable MD5 SSH tests with Homebrew libssh2
- scripts: don't insist on all executable bits on scripts
Diagnostics3 git calls · 21 ms
discover200152 B3 ms
git.upload-pack discover http.response.status_code=200 git.upstream.cf_ray=- git.upstream.phase=ls-refs git.upstream.dur_ms=3 git.response.bytes=152 git.server.agent=gitty/1.0 git.server.object_format=sha1 git.server.caps=agent ls-refs fetch object-format git.server.fetch=shallow filter sideband-all git.protocol.version=2 git.pkt.frames=8 git.pkt.data=6 git.pkt.flush=2 git.pkt.delim=0 git.pkt.bytes=152 git.pkt.payload.max=34
ls-refs200149 B · hit3 ms
git.upload-pack ls-refs http.response.status_code=200 git.upstream.cf_ray=- git.upstream.phase=ls-refs git.upstream.dur_ms=3 git.response.bytes=149 git.response.cache=HIT git.response.duration_ms=3 git.protocol.version=2 git.pkt.frames=3 git.pkt.data=2 git.pkt.flush=1 git.pkt.delim=0 git.pkt.bytes=149 git.pkt.payload.max=78 git.ls_refs.count=2 git.ls_refs.head=refs/heads/master
fetchblob:none · deepen 10200287 KiB · hit18 ms
git.upload-pack fetch http.response.status_code=200 git.upstream.cf_ray=- git.upstream.phase=fetch git.upstream.dur_ms=3 git.response.bytes=293470 git.response.cache=HIT git.response.duration_ms=18 git.fetch.filter=blob:none git.fetch.filter.requested=tree:0 git.fetch.filter.fallback=blob:none git.fetch.filter.learned=false git.fetch.wants=31c911efe5652725e930f4d2e60c9060e5f6646d git.fetch.haves.count=0 git.fetch.deepen=10 git.fetch.thin_pack=false git.fetch.ofs_delta=true git.protocol.version=2 git.pkt.frames=10 git.pkt.data=8 git.pkt.flush=1 git.pkt.delim=1 git.pkt.bytes=293470 git.pkt.payload.max=65516 git.sideband.band1.bytes=293354 git.sideband.band2.bytes=0 git.sideband.band3.bytes=0 git.pack.objects=87 git.pack.bytes=293354 git.pack.ofs_delta=0 git.pack.ref_delta=1 git.pack.chain.max=1 git.pack.trailer=6a646bcda6740bab42e321b51998b52ea15146c0 git.pack.full=86Open pack map
Each row is one HTTP round trip ply made to the git server for this page, on one timeline. discover asks what the server speaks, ls-refs lists branch tips, fetch brings objects by id. A hit was served by Workers Cache. Tap a row for its wire details.
- Remote
- https://5ad2236b39de4c8bd8f6270ea63f3ea9.artifacts.cloudflare.net/git/public-v0/curl.git
- Ref
- refs/heads/master
- Commit
- 31c911efe5652725e930f4d2e60c9060e5f6646d
- cf-ray
- a5e10c814bd9910d
- Request
- 36b2f6c6…
- Protocol
- v2 · sha1
- Agent
- gitty/1.0
- Filter
- advertised
- Fetch
- shallow filter sideband-all
- Capabilities
- agent ls-refs fetch object-format