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
- ..
- certs48883a8
- cmake3f58c3d
- dataa393797
- httpcd4d0df
- libtest9225fe8
- perfa3e04ce
- server684df04
- tunitacc0c6a
- unitbac43a4
- .gitignoreef4dea5
- CMakeLists.txtc6dd729
- Makefile.am0ed14ba
- allversions.pmedd4ec1
- appveyor.pmdcd5fe0
- azure.pm7bb7946
- config.inf5aa986
- configurehelp.pm.in626df2c
- devtest.plexec322b690
- dictserver.pyexecbff6e80
- directories.pm7df2291
- ech_combos.pyexec90db92c
- ech_tests.shexec72a2d45
- ftpserver.plexecc1aeeb5
- getpart.pm7bdf981
- globalconfig.pm038381f
- http-server.plexece94c33c
- http2-server.plexecbab36b2
- http3-server.plexec9083cf4
- memanalyze.plexecc198850
- memanalyzer.pm925a2c6
- negtelnetserver.pyexec4d7b496
- nghttpx.conf71aa7bc
- pathhelp.pm500e43f
- processhelp.pmfa3b28e
- rtspserver.plexecaf534ab
- runner.pmf8ac7e0
- runtests.plexec98ac6f4
- secureserver.plexec17fc148
- serverhelp.pm427626b
- servers.pmb16ec65
- sshhelp.pm84c9a85
- sshserver.plexecfacd757
- test-linter.plexecc64962c
- test1013.plexecf72d7a7
- test1022.plexeca74a180
- test1119.plexecf8303b8
- test1135.plexecceb313c
- test1139.plexecac09d4f
- test1140.plexec320f9f9
- test1165.plexec259e13c
- test1167.plexecdb4fa1c
- test1173.plexec18351f0
- test1175.plexec06db7c7
- test1177.plexec928d541
- test1222.plexec0d6a5ff
- test1275.plexecd46fd62
- test1276.plexecda818b6
- test1477.plexeca561cb8
- test1486.plexec93b5dbb
- test1488.plexec5df385b
- test1544.plexec2703ac1
- test1707.plexecd13de40
- test1792.plexec82f9baa
- test307.plexecddfa67b
- test3500.plexecd95f54c
- test3990.plexec06c02d4
- test610.plexecc6fe53c
- test613.plexeca2886c4
- test745.plexec2e46dd9
- test971.plexec221f78b
- testcurl.plexecd3a1b0d
- testutil.pm199a441
- tftpserver.plexec63cf940
- util.pyexec7c0ad4b
- valgrind.pm1d0a629
- valgrind.supp4aef3f9
- 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 B4 ms
git.upload-pack discover http.response.status_code=200 git.upstream.cf_ray=- git.upstream.phase=ls-refs git.upstream.dur_ms=4 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 B4 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=UPDATING 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
- a5e1b1d73b6ff54b
- Request
- c698231e…
- Protocol
- v2 · sha1
- Agent
- gitty/1.0
- Filter
- advertised
- Fetch
- shallow filter sideband-all
- Capabilities
- agent ls-refs fetch object-format