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
- ..
- .checksrced98c44
- .gitignorec96ad91
- 10-at-a-time.c34572e4
- CMakeLists.txtdc3313d
- Makefile.am0885b92
- Makefile.example4031aa2
- Makefile.inc78f5a16
- README.md06d07be
- adddocsref.plexec2f99c85
- address-scope.c0cb9e01
- altsvc.c35fbc39
- anyauthput.ca28ee2c
- aws-sigv4.c69b04f3
- block_ip.c69ffb25
- cacertinmem.c841f444
- cainfo-blob.c2f57bef
- certinfo.c4f07dba
- chkspeed.c7010acc
- clientcert-blob.c916120b
- conditional.c0d93017
- connect-to.c706e988
- cookie.c413a499
- cookie_interface.c698044d
- cookiejar.c836062e
- crawler.c46f4ebb
- debug.c449cd11
- default-scheme.c198c9c8
- doh.ca968200
- ephiperfifo.cde86690
- evhiperfifo.c32f92f9
- externalsocket.cb07f48b
- fileupload.c0c2b3a5
- ftp-delete.cc05f2f7
- ftp-listonly.cc407bb4
- ftp-wildcard.cd7627aa
- ftpget.ceec6c86
- ftpgetinfo.cd35cc47
- ftpgetresp.c8f888b4
- ftpsget.c44d8665
- ftpupload.c07546f3
- ftpuploadfrommem.c59834ca
- ftpuploadresume.ce79bc79
- getinfo.c43a4eeb
- getinmemory.c85b8c9c
- getredirect.ce144e62
- getreferrer.cb222084
- ghiper.c79516cc
- headerapi.cfed3af5
- hiperfifo.ccc27799
- hsts-preload.c877e8eb
- htmltidy.c8a510f4
- htmltitle.cppc1130ce
- http-options.c1633844
- http-post.c04a755e
- http2-download.cd46c4ca
- http2-pushinmemory.cba3db5b
- http2-serverpush.c0d97c1e
- http2-upload.c9acd719
- http3-present.c5de7d87
- http3.c7b52e43
- httpcustomheader.c1d500b2
- httpput-postfields.cd34f387
- httpput.c0c13490
- https.c5fefb5e
- httpsig.c6d9ebb3
- imap-append.cc530bbb
- imap-authzid.c0130d4c
- imap-copy.ce19d4b4
- imap-create.c0572171
- imap-delete.c16b7d53
- imap-examine.c9190319
- imap-fetch.cc3d6af7
- imap-list.c1c1074f
- imap-lsub.c123d9d3
- imap-multi.c192ba15
- imap-noop.c5d8153e
- imap-search.cae944bb
- imap-ssl.c77a0880
- imap-store.cc1e9de9
- imap-tls.c486bc8c
- interface.c870f940
- ipv6.c607d9d4
- keepalive.cf6aa692
- limit-rate.cb0a7285
- localport.c1027c43
- log_failed_transfers.c19e2a23
- maxconnects.cb52f1fc
- multi-app.c5650973
- multi-debugcallback.c0885486
- multi-double.c4809abb
- multi-event.cd10c93d
- multi-formadd.c8816d69
- multi-legacy.cbd23866
- multi-post.cb5d557c
- multi-single.c6329dd4
- multi-uv.c4089cee
- nagle.c71ad00b
- netrc.cd862210
- parseurl.cf70df19
- path-as-is.c112c8e0
- persistent.c852f923
- pop3-authzid.c3f40e78
- pop3-dele.c69ee1de
- pop3-list.c9a2693d
- pop3-multi.c4e69172
- pop3-noop.cc8352df
- pop3-retr.cc0c9e92
- pop3-ssl.c221a0ab
- pop3-stat.c6c2d364
- pop3-tls.cce38d04
- pop3-top.cbb23eb9
- pop3-uidl.cfb21109
- post-callback.caaed0aa
- postinmemory.c698e901
- postit2-formadd.cc760bcb
- postit2.c0bc1e6a
- progressfunc.c4138a6b
- protofeats.c73cbf1c
- range.c857ee92
- resolve.c9c87bc0
- rtsp-options.cc780046
- sendrecv.ca3539ad
- sepheaders.c011eae1
- sessioninfo.cb9150e7
- sftpget.ca3da2d6
- sftpuploadresume.ce5d14a8
- shared-connection-cache.c00ebc3b
- simple.cb7b48d7
- simplepost.cfb85677
- simplessl.c45db65a
- smooth-gtk-thread.ccca3be7
- smtp-authzid.c0260452
- smtp-expn.c25b560f
- smtp-mail.c618123a
- smtp-mime.c4d54532
- smtp-multi.c9d76a57
- smtp-ssl.c172f66b
- smtp-tls.cc3c9927
- smtp-vrfy.c65783d6
- sslbackend.cbbb1ea4
- synctime.c8e9adf1
- threaded.cb858c1a
- trailer.c8ee870c
- unixsocket.c4a8c342
- url2file.c1216575
- urlapi.c50175da
- usercertinmem.cd9e8e40
- version-check.plexec680bbb3
- websocket-cb.ce73cc27
- websocket-updown.c495c4b7
- websocket.cad6fc9e
- xmlstream.c2ad132f
- 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 · 5 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 · 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
- a5e15e8afa53cf6a
- Request
- 3bcf9bb1…
- Protocol
- v2 · sha1
- Agent
- gitty/1.0
- Filter
- advertised
- Fetch
- shallow filter sideband-all
- Capabilities
- agent ls-refs fetch object-format