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
- ..
- .gitignore4af021b
- CMakeLists.txt8394996
- MANPAGE.md972fc9a
- Makefile.am7c2604b
- Makefile.incc6ffc06
- _AUTHORS.md0c9bfb9
- _BUGS.md45630d4
- _DESCRIPTION.mdec94e1c
- _ENVIRONMENT.mda3c13ae
- _EXITCODES.md333e198
- _FILES.md8c5d3fa
- _GLOBBING.mdb801adb
- _NAME.mdb0d8916
- _OPTIONS.md9155d85
- _OUTPUT.md32a5457
- _PROGRESS.mda506d04
- _PROTOCOLS.mdb380c2d
- _PROXYPREFIX.md0c10630
- _SEEALSO.mdaa1b259
- _SYNOPSIS.md3815877
- _URL.mda68b005
- _VARIABLES.md834fc5e
- _VERSION.mde0228fe
- _WWW.md8656e9e
- abstract-unix-socket.md40ecce5
- alt-svc.mdfe2e873
- anyauth.md2afde38
- append.md3d0030d
- aws-sigv4.md517cc1c
- basic.md4285e88
- ca-native.md67fdf8c
- cacert.mdae9be38
- capath.md68bc86f
- cert-status.md8b6e57b
- cert-type.mda96587f
- cert.md2bc3d8f
- ciphers.md14f0425
- compressed-ssh.md2c1fda9
- compressed.md712f93d
- config.md637918d
- connect-timeout.mddc5f927
- connect-to.mdc737831
- continue-at.md3a9771a
- cookie-jar.mdde09fd5
- cookie.md95b0a8c
- create-dirs.md89d24f7
- create-file-mode.mdc6467d1
- crlf.mdc368841
- crlfile.mda762af0
- curves.md9473aea
- data-ascii.mdc1d9d75
- data-binary.md4c5e4da
- data-raw.md1033678
- data-urlencode.md36fdf3d
- data.md6faaad6
- delegation.mdc874a2b
- digest.mdc67d789
- disable-eprt.md768b689
- disable-epsv.mdd13e076
- disable.md1370b91
- disallow-username-in-url.md0507f53
- dns-interface.mdaee7400
- dns-ipv4-addr.md4a43cb1
- dns-ipv6-addr.md7112311
- dns-servers.mdbf6ba3f
- doh-cert-status.md445eb3d
- doh-insecure.mdee1602a
- doh-url.md3d146a7
- dump-ca-embed.md2ad1230
- dump-header.mdbdb0e87
- ech.md3d8f387
- egd-file.mdef16b99
- engine.mdcde6949
- etag-compare.md64ab80c
- etag-save.md137a4d5
- expect100-timeout.md80cf4eb
- fail-early.md67edbf9
- fail-with-body.md670959b
- fail.md0c8db13
- false-start.md7c8c976
- follow.mdb34e30c
- form-escape.mdd9f4ad4
- form-string.mde58ad62
- form.md87b0196
- ftp-account.mde275349
- ftp-alternative-to-user.md9bd3686
- ftp-create-dirs.md3e851cc
- ftp-method.mdd2bff21
- ftp-pasv.md02deee3
- ftp-port.md28cc34b
- ftp-pret.md48c48e3
- ftp-skip-pasv-ip.md37905e6
- ftp-ssl-ccc-mode.md3e9eb72
- ftp-ssl-ccc.md4066664
- ftp-ssl-control.mdfa85de2
- get.mdac0560a
- globoff.md5ef4b2a
- happy-eyeballs-timeout-ms.mdf1abb37
- haproxy-clientip.md4bbf26e
- haproxy-protocol.md26456c8
- head.md7e005c7
- header.md9e1f202
- help.md122c55c
- hostpubmd5.md5d480a5
- hostpubsha256.mda92dbe5
- hsts.md88e8e67
- http0.9.md65be144
- http1.0.md0252f05
- http1.1.md3d241e5
- http2-prior-knowledge.md6351e06
- http2.mdf5180be
- http3-only.md400ac19
- http3.mde4dfeef
- httpsig-algo.mdc978147
- httpsig-headers.md7b590c9
- httpsig-key.md7cd1779
- httpsig-keyid.md2dc305f
- ignore-content-length.md01ff43b
- insecure.md6b7009f
- interface.md1609cc3
- ip-tos.mdf5ef589
- ipfs-gateway.md16e197f
- ipv4.mdd7d571d
- ipv6.mdc2f1398
- json.md3f1a9a1
- junk-session-cookies.md668dfce
- keepalive-cnt.mde56c976
- keepalive-time.md4b10ff6
- key-type.md4128bfe
- key.mdc0d6f80
- knownhosts.mdcb99fb9
- krb.md6d47a76
- libcurl.md7f1b64a
- limit-rate.md88f6270
- list-only.md36d6321
- local-port.mdb8c0d3f
- location-trusted.md7d98108
- location.md4ea115a
- login-options.mdfc8292a
- mail-auth.mddeabb38
- mail-from.md96b0625
- mail-rcpt-allowfails.mda82948b
- mail-rcpt.mdbd787c2
- mainpage.idx8496ee4
- manual.mdbf44f3b
- max-filesize.mda3adcde
- max-redirs.md02bdfaa
- max-time.md2475dd1
- metalink.mdd3d3e25
- mptcp.md4a1bb65
- negotiate.mdb7982d7
- netrc-file.md3df72ce
- netrc-optional.md9b9c068
- netrc.md03a7ed6
- next.mdcb67e90
- no-alpn.md4752948
- no-buffer.md442beb0
- no-clobber.md9225e24
- no-keepalive.md99dd032
- no-npn.mddbb69e9
- no-progress-meter.md72ec993
- no-sessionid.md08ba990
- noproxy.md10b74ec
- ntlm-wb.md3a1d35c
- ntlm.md801064a
- oauth2-bearer.mdcf260e1
- out-null.mdcca193e
- output-dir.md4e63035
- output.mdb2d196d
- parallel-immediate.md4d7a3ad
- parallel-max-host.mda21c9ac
- parallel-max.mda487f4c
- parallel.md907ab8c
- pass.md39b60eb
- path-as-is.mdf3a60cf
- pinnedpubkey.mdff7c42b
- post301.md3bcded8
- post302.mdbcb35fc
- post303.md63dc0d7
- preproxy.mda108d9f
- progress-bar.md6f08d7f
- proto-default.md903fac7
- proto-redir.md1f75bfd
- proto.md85d814a
- proxy-anyauth.mdbb59b21
- proxy-basic.md732ea1f
- proxy-ca-native.md0252e99
- proxy-cacert.md0b2405d
- proxy-capath.md344756a
- proxy-cert-type.md3dcd201
- proxy-cert.md929791e
- proxy-ciphers.md4cb85e1
- proxy-crlfile.md9f7d330
- proxy-digest.md08984dc
- proxy-header.md3cc1796
- proxy-http2.mda38da9e
- proxy-http3.md6533b98
- proxy-insecure.md0c2d8b9
- proxy-key-type.mde455140
- proxy-key.md8ee78c4
- proxy-negotiate.md0285155
- proxy-ntlm.md6c239f7
- proxy-pass.md1005d95
- proxy-pinnedpubkey.mddf0b0bb
- proxy-service-name.mdb3d665d
- proxy-ssl-allow-beast.md909a7f0
- proxy-ssl-auto-client-cert.mde041b81
- proxy-tls13-ciphers.md6fcf6d7
- proxy-tlsauthtype.md24fa449
- proxy-tlspassword.md5acc5e3
- proxy-tlsuser.md549ab39
- proxy-tlsv1.md20643fd
- proxy-user.md2c6c2bd
- proxy.md881f62d
- proxy1.0.md4d3203a
- proxytunnel.mdfcec874
- pubkey.md373d113
- quote.md1ac2076
- random-file.mde2c8624
- range.mdab1b126
- rate.mdd389da5
- raw.mdca63dc3
- referer.md1fec248
- remote-header-name.md5faddaa
- remote-name-all.md92d348e
- remote-name.mde39dd51
- remote-time.md3f8c702
- remove-on-error.mdec7b888
- request-target.mdc76b6b3
- request.md2c9d777
- resolve.md18733df
- retry-all-errors.mdcb337f3
- retry-connrefused.mdc7f96a8
- retry-delay.mdd89ee9f
- retry-max-time.md45c141f
- retry.md75bab1c
- sasl-authzid.md4b13388
- sasl-ir.md49f21c1
- service-name.mdf98409a
- show-error.mdaaf865b
- show-headers.md7e18124
- sigalgs.md537b34f
- silent.mdac7dc5a
- skip-existing.mddbef2fa
- socks4.md9d1c567
- socks4a.md695e44c
- socks5-basic.mddc2a553
- socks5-gssapi-nec.md9cd91b9
- socks5-gssapi-service.mdd847e65
- socks5-gssapi.mdb8520b2
- socks5-hostname.mdf8ee9fe
- socks5.mdb70e88f
- speed-limit.mdb95d6e7
- speed-time.mdf27702b
- ssl-allow-beast.mdf9933b7
- ssl-auto-client-cert.md4f0be5b
- ssl-no-revoke.md16981f1
- ssl-reqd.mdc482096
- ssl-revoke-best-effort.md0257e05
- ssl-sessions.md8a0cc7d
- ssl.md9461cda
- sslv2.mdea92a2c
- sslv3.mdf022124
- stderr.md7030e55
- styled-output.md8193896
- suppress-connect-headers.md91d9977
- tcp-fastopen.md7a954d0
- tcp-nodelay.md6056671
- telnet-option.mdca82a4c
- tftp-blksize.md21d8476
- tftp-no-options.md27bbe55
- time-cond.mdd902dd4
- tls-earlydata.md22a7abd
- tls-max.mde3a7460
- tls13-ciphers.mdcae224e
- tlsauthtype.mdce8acd5
- tlspassword.md1fd4628
- tlsuser.md568f3f4
- tlsv1.0.md59eaae2
- tlsv1.1.md5f5e7c7
- tlsv1.2.mdbf38762
- tlsv1.3.md6f14ecc
- tlsv1.mdc6fc9e9
- tr-encoding.mdc364c07
- trace-ascii.mdf46f0a6
- trace-config.md2f09540
- trace-ids.md302631d
- trace-time.mdbaa7b88
- trace.md875e756
- unix-socket.mdd448ad0
- upload-file.md030fe96
- upload-flags.mdc432188
- url-query.md3953eda
- url.mde569dad
- use-ascii.md4dba446
- user-agent.mdd81b65d
- user.mddc9faad
- variable.md95affb2
- verbose.mdb5d6b57
- version.mde7e5445
- vlan-priority.mdc49c659
- write-out.md5cf9d91
- xattr.md893394c
- 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 · 25 ms
discover200152 B22 ms
git.upload-pack discover http.response.status_code=200 git.upstream.cf_ray=- git.upstream.phase=fetch 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 B22 ms
git.upload-pack ls-refs http.response.status_code=200 git.upstream.cf_ray=- git.upstream.phase=ls-refs git.upstream.dur_ms=22 git.response.bytes=149 git.response.cache=UPDATING git.response.duration_ms=22 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 · hit3 ms
git.upload-pack fetch http.response.status_code=200 git.response.bytes=293470 git.response.cache=HIT git.response.duration_ms=3 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
- a5e1829d7e963014
- Request
- d05ca9da…
- Protocol
- v2 · sha1
- Agent
- gitty/1.0
- Filter
- advertised
- Fetch
- shallow filter sideband-all
- Capabilities
- agent ls-refs fetch object-format