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
- ..
- .gitignorebae3c1a
- CMakeLists.txt3c24940
- Makefile.am3a71a3c
- Makefile.inc49c1f19
- README.mdcfae095
- unit1300.cbd7be15
- unit1302.c8a0902e
- unit1303.cacc31c3
- unit1304.c6f9526b
- unit1305.cf6bf67e
- unit1307.cafd479c
- unit1309.c95034d6
- unit1323.c86eb4e2
- unit1330.c79df0e5
- unit1395.c58945b5
- unit1397.c18a1a44
- unit1399.c159ce17
- unit1601.c9ac7279
- unit1602.ccc1ccf9
- unit1603.c121654f
- unit1606.cfb94f14
- unit1607.c1d1fedc
- unit1608.cbc977e2
- unit1610.c450b5cf
- unit1612.c531c0e3
- unit1614.c656e0a9
- unit1615.c705ef39
- unit1620.c3fd4f4b
- unit1625.c21e3737
- unit1626.c81ce3b2
- unit1627.c6f96c0a
- unit1636.cec72b8a
- unit1650.c2a97269
- unit1651.c927c6d2
- unit1652.c312fe8a
- unit1653.c64445c4
- unit1654.c524b1b1
- unit1655.c12ea149
- unit1656.c4dea282
- unit1657.cf506fdb
- unit1658.cfa7e7cc
- unit1660.c2e62b31
- unit1661.ca12b72d
- unit1663.cc460705
- unit1664.c66bf66e
- unit1666.c28e53c0
- unit1667.c5e7325c
- unit1668.c2c467b3
- unit1669.c625e004
- unit1674.c5187089
- unit1675.c632b0b3
- unit1676.ce1d2d92
- unit1693.cf8bbb81
- unit1694.c03ea756
- unit1961.cade7134
- unit1979.c76e65fb
- unit1980.cc15e11c
- unit2413.cfba6aa6
- unit2600.cc77c3a4
- unit2601.c21cdb13
- unit2602.c22f158d
- unit2603.c0780567
- unit2604.c770aec1
- unit2605.ce3962a2
- unit2606.c2c9d83a
- unit2607.c51a2841
- unit2640.cf8506a4
- unit2641.c62b518e
- unit3200.c23e5d56
- unit3205.c234d8ae
- unit3211.c4519e5e
- unit3212.ca30830b
- unit3213.c8543751
- unit3214.c64f0429
- unit3216.c286fdb5
- unit3219.c2d3be5d
- unit3227.c42d068e
- unit3230.c065a65b
- unit3271.cabab4cc
- unit3300.c6df7909
- unit3301.c4ed9e81
- unit3302.c6c0abed
- unit3303.ca5ef568
- unit3304.c29ea23a
- unit3306.c85b587d
- unit3307.c6e8203c
- unit3400.c539f16f
- unit4781.c962352b
- unit4782.cfe0afc4
- 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 · 6 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 · hit4 ms
git.upload-pack ls-refs http.response.status_code=200 git.upstream.cf_ray=- git.upstream.phase=ls-refs git.upstream.dur_ms=4 git.response.bytes=149 git.response.cache=HIT git.response.duration_ms=4 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 · hit2 ms
git.upload-pack fetch http.response.status_code=200 git.upstream.cf_ray=- git.upstream.phase=fetch git.upstream.dur_ms=2 git.response.bytes=293470 git.response.cache=HIT git.response.duration_ms=2 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
- a5e1eba58f1b452a
- Request
- 56c40907…
- Protocol
- v2 · sha1
- Agent
- gitty/1.0
- Filter
- advertised
- Fetch
- shallow filter sideband-all
- Capabilities
- agent ls-refs fetch object-format