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
- ..
- toolxe2e4f0e
- .checksrcbc97c06
- .gitignore67410d9
- CMakeLists.txt1f76839
- Makefile.am69554ee
- Makefile.inc45ee6a3
- config2setopts.ca92dcf3
- config2setopts.h3cf51b0
- curl.rc3c5c870
- curlinfo.caf04673
- mk-file-embed.plexecdd4f09a
- mkhelp.plexec013ddc5
- slist_wc.c3eb476f
- slist_wc.ha4a63ba
- terminal.c2e28d92
- terminal.hdbd4abe
- tool_cb_dbg.cea2ec96
- tool_cb_dbg.h8df54a2
- tool_cb_hdr.ca3dce16
- tool_cb_hdr.h9f749ff
- tool_cb_prg.c6070942
- tool_cb_prg.h5939d15
- tool_cb_rea.cbf9bd15
- tool_cb_rea.hc44ceaa
- tool_cb_see.c50e630d
- tool_cb_see.h1cac0ac
- tool_cb_soc.cddc11ac
- tool_cb_soc.hd45d72a
- tool_cb_wrt.c2a17df0
- tool_cb_wrt.hc99bd7c
- tool_cfgable.c26b44f8
- tool_cfgable.h7a587f6
- tool_dirhie.cd4b8947
- tool_dirhie.h60b9470
- tool_doswin.cdc36281
- tool_doswin.hc0a979b
- tool_easysrc.c1c2a336
- tool_easysrc.h642ea33
- tool_filetime.c0b6cd7b
- tool_filetime.hd282420
- tool_findfile.c146a273
- tool_findfile.h63d2519
- tool_formparse.c0366080
- tool_formparse.h9df5cb7
- tool_getparam.c9cbc21d
- tool_getparam.h92495a4
- tool_getpass.cae81355
- tool_getpass.hf04fefb
- tool_help.caaf6928
- tool_help.hd856225
- tool_helpers.c1b998d2
- tool_helpers.hcbfa168
- tool_hugehelp.h89df96c
- tool_ipfs.ca3f55a9
- tool_ipfs.hcaa959b
- tool_libinfo.cdfb2391
- tool_libinfo.h4ca507a
- tool_listhelp.cb6d3ddf
- tool_main.c5e2b965
- tool_main.h7578616
- tool_msgs.c50a2fa0
- tool_msgs.heb20192
- tool_operate.cdfd03f8
- tool_operate.hd5ee481
- tool_operhlp.c91c116f
- tool_operhlp.he8a27d9
- tool_paramhlp.c0056d18
- tool_paramhlp.haf40f10
- tool_parsecfg.c976581a
- tool_parsecfg.h9abb701
- tool_progress.cf70129f
- tool_progress.h01e50a5
- tool_sdecls.hc70dbd3
- tool_setopt.ccd41d8d
- tool_setopt.h6414c14
- tool_setup.h7556e6c
- tool_ssls.c8e575f1
- tool_ssls.h42d10d2
- tool_stderr.cb4dbdd6
- tool_stderr.h47fc7ca
- tool_urlglob.cddc65b7
- tool_urlglob.h020f8d9
- tool_util.c25aa636
- tool_util.h12206ce
- tool_version.h5db625c
- tool_vms.cced0efe
- tool_vms.hb459a25
- tool_writeout.cfc34635
- tool_writeout.h7bc54ae
- tool_writeout_json.c6e22e31
- tool_writeout_json.h7318367
- tool_xattr.c7bf487a
- tool_xattr.h0795ba8
- var.c702157e
- var.hbb191ce
- 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 · 26 ms
discover200152 B2 ms
git.upload-pack discover http.response.status_code=200 git.upstream.cf_ray=- git.upstream.phase=ls-refs git.upstream.dur_ms=2 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 · hit23 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=23 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
- a5e10b0a2bfc910d
- Request
- 435c4ae1…
- Protocol
- v2 · sha1
- Agent
- gitty/1.0
- Filter
- advertised
- Fetch
- shallow filter sideband-all
- Capabilities
- agent ls-refs fetch object-format