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
- ..
- .gitignorec78bdfd
- CMakeLists.txt7991a11
- Makefile.am6740abd
- Makefile.inc112056a
- cli_ev_download.c5aa99be
- cli_ftp_upload.c7e05807
- cli_h2_pausing.c3663d84
- cli_h2_serverpush.c4c78323
- cli_h2_upgrade_extreme.c9df8640
- cli_hx_download.c6afa539
- cli_hx_upload.c64c3bbb
- cli_tls_session_reuse.cba97485
- cli_upload_pausing.c2283043
- cli_ws_data.c41d962c
- cli_ws_pause.cb423314
- cli_ws_pingpong.c32961da
- cli_ws_write_err.c7018224
- first.c440bd07
- first.hd5a3ec4
- lib1156.c6b13374
- lib1301.cd476aed
- lib1308.c4ef26e5
- lib1396.c1eae1a8
- lib1398.c6fd9ceb
- lib1451.c240fda5
- lib1485.c46b9851
- lib1500.c02c3047
- lib1501.c5a6eacd
- lib1502.c4b52a80
- lib1506.c2caa8f8
- lib1507.cc63be0d
- lib1508.cf3ae79c
- lib1509.c95258d6
- lib1510.c0d7a155
- lib1511.cd6897cc
- lib1512.c10cf67e
- lib1513.cd514851
- lib1514.c528468e
- lib1515.cf9bacf5
- lib1517.ca88705e
- lib1518.c09b8514
- lib1520.c886a2b0
- lib1522.c9f6dc33
- lib1523.c53ed580
- lib1525.c7465eb5
- lib1526.c56b1b74
- lib1527.c1caa37d
- lib1528.cf8db672
- lib1529.cccf0032
- lib1530.cecce168
- lib1531.c20ac363
- lib1532.c25c5ab4
- lib1533.cc0ad8e4
- lib1534.c9c4491b
- lib1535.c68ec25f
- lib1536.cf6632c7
- lib1537.c7fd91f9
- lib1538.c6433e57
- lib1540.cb4fc49e
- lib1541.cd6888db
- lib1542.c2ea59a5
- lib1545.c979bec8
- lib1549.c0451052
- lib1550.c8de7b84
- lib1551.cb8e4607
- lib1552.cbf70452
- lib1553.c8aa2b1a
- lib1554.cc553095
- lib1555.cc6c8064
- lib1556.c201ea4b
- lib1557.ce949419
- lib1558.c0832f8b
- lib1559.c951b5db
- lib1560.c781843a
- lib1564.c573ec91
- lib1565.c825d88e
- lib1567.c7d4d623
- lib1568.c68c1734
- lib1569.c52dc364
- lib1571.c2cf218b
- lib1576.ca052519
- lib1582.c81f8664
- lib1587.c9368b53
- lib1588.c896a08a
- lib1589.ce8d0290
- lib1591.c427f966
- lib1592.c497659b
- lib1593.c1ba6351
- lib1594.c1a6f163
- lib1597.c11da472
- lib1598.c106a339
- lib1599.c62731be
- lib1605.cda8109c
- lib1616.c328869b
- lib1647.c8060e1b
- lib1648.c91afbce
- lib1649.c2dd66c0
- lib1662.c365e28e
- lib1678.cd754f32
- lib1686.cb781746
- lib1742.c318478f
- lib1744.cf644aa6
- lib1745.c7126ab5
- lib1791.c6c95b18
- lib1900.c599085e
- lib1901.cdae52a7
- lib1902.c4af6249
- lib1903.cb638086
- lib1905.cd1fdba4
- lib1906.ce649263
- lib1907.cc6045bf
- lib1908.c9d6a7a1
- lib1910.cd8b9f7a
- lib1911.c662093a
- lib1912.c65de8b3
- lib1913.c8f3c397
- lib1915.ceebf7ba
- lib1916.c575080d
- lib1918.c4932c1c
- lib1919.cf970b0a
- lib1920.c84a747e
- lib1921.c8799c2d
- lib1922.c17b9cb8
- lib1933.cabe4361
- lib1934.c1ddb8be
- lib1935.c26d17c6
- lib1936.cdba9f1c
- lib1937.ca249375
- lib1938.c300a092
- lib1939.c4b78a2f
- lib1940.c400d044
- lib1945.c4ca3d16
- lib1947.c342d2f6
- lib1948.c95152aa
- lib1955.cff640c2
- lib1956.c5d569c7
- lib1957.cb422e48
- lib1958.cdc4ac1c
- lib1959.c4df8bd7
- lib1960.c1cda440
- lib1964.c17199ba
- lib1965.c683e5a7
- lib1967.ce271df2
- lib1970.c8fd69f6
- lib1971.c81d5956
- lib1972.c4315798
- lib1973.c778b7af
- lib1974.c84bd430
- lib1975.c05d6e7c
- lib1977.ca5db342
- lib1978.c0f51cc4
- lib1985.c256e57c
- lib1989.cef331b5
- lib1990.c96e18d4
- lib2023.cb0072b6
- lib2082.c8a404f2
- lib2095.ce157511
- lib2118.c052ade0
- lib2270.c17ec606
- lib2301.c0af5792
- lib2302.c759ea5e
- lib2304.ce405531
- lib2306.cfbfdc63
- lib2308.cd582c71
- lib2309.c212d82a
- lib2380.ce3d0580
- lib2397.ce30fa23
- lib2402.c93b2e38
- lib2404.c9999f96
- lib2405.c6d98183
- lib2412.c79d49a2
- lib2414.ce04dff3
- lib2453.cace5f03
- lib2502.c1838243
- lib2504.c3b7b61f
- lib2505.c5d43eec
- lib2506.c8779f6c
- lib2700.c6d5a7ff
- lib2805.c7e2c8bb
- lib2924.c81ba469
- lib3010.c7552b02
- lib3025.cc7b38e4
- lib3026.cf072dee
- lib3027.c013c13f
- lib3033.cf43c169
- lib3034.c0dbfee8
- lib3100.c121d0a8
- lib3101.c2e2b453
- lib3102.c5346b26
- lib3103.ccedb21d
- lib3104.c96ca512
- lib3105.cb269e6f
- lib3107.c6ae3f3e
- lib3207.cf28085c
- lib3208.c70ecfd9
- lib3231.c6fb4fc9
- lib3233.cb411e60
- lib3234.c2d9fb9f
- lib3595.c1f343f5
- lib3596.c61b8f65
- lib464.c0bb5d39
- lib500.c786d836
- lib5000.c511b26c
- lib5004.c08ab3b6
- lib501.c73bf010
- lib502.cebdc837
- lib503.c384dfc8
- lib504.cecf0ee0
- lib505.cbf1310f
- lib506.c8d36c32
- lib507.cfec4fba
- lib508.c20aa1ff
- lib509.c38da364
- lib510.ca4acbdd
- lib511.c7907f50
- lib512.cb9121c3
- lib513.c9ed3f1d
- lib514.cfb4b7e2
- lib515.c825cbe5
- lib516.c6109073
- lib517.caa15af6
- lib518.cc751574
- lib519.c30aee83
- lib520.c9da55e0
- lib521.c1469d6d
- lib523.cecc3e0c
- lib524.c66ada8b
- lib525.ccaedbde
- lib526.c23fbe72
- lib530.ca5d953e
- lib533.c188732f
- lib536.cd634754
- lib537.cab19316
- lib539.cb6719ea
- lib540.cec9d3da
- lib541.c35e9d5a
- lib542.cfe3eb9c
- lib543.cf112b89
- lib544.c42fa8dd
- lib549.cfb71898
- lib551.ceed8af4
- lib552.c69222d2
- lib553.cdc812aa
- lib554.cce4348a
- lib556.cd03396d
- lib557.c24cb1bf
- lib558.c6a14719
- lib559.c27a8cb9
- lib560.cef36049
- lib562.c5cec3f7
- lib564.c41c3bc8
- lib566.c9042894
- lib567.c1421dfb
- lib568.c3273885
- lib569.c8f79eeb
- lib570.c998dd68
- lib571.cdbd8749
- lib572.c1ed2927
- lib573.c158a35b
- lib574.c6b5e415
- lib575.c6e7831f
- lib576.c889969d
- lib578.c4341785
- lib579.c7ad1331
- lib582.c50d6833
- lib583.c934c54b
- lib586.c29eab18
- lib589.c1f4b6cf
- lib591.c455b4ff
- lib597.c0c1fc47
- lib598.cc6025c5
- lib599.cba8ebca
- lib643.cc2aed4f
- lib650.c04b2887
- lib651.c1c8fca2
- lib652.cbf22534
- lib653.c4cce921
- lib654.ca10dc94
- lib655.c5e1f099
- lib658.c8ed4657
- lib659.cc2fb30d
- lib661.c80d46e8
- lib666.c43ea1eb
- lib667.c38158dc
- lib668.cfd59a0c
- lib670.c2daeb06
- lib674.c761ee3e
- lib676.ce08f2d4
- lib677.c3b90cc4
- lib678.cef04609
- lib695.cde8986d
- lib751.c55f62d8
- lib753.ccf83f96
- lib757.c378c78c
- lib758.c379cc87
- lib766.cb3bf62e
- memptr.c361d9a5
- mk-lib1521.plexeceae379a
- testtrace.c2433c84
- testtrace.he066595
- testutil.c7336a73
- testutil.h9799752
- unitcheck.hbc616d1
- 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 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
- a5e29d12e8bec465
- Request
- fa2f3937…
- Protocol
- v2 · sha1
- Agent
- gitty/1.0
- Filter
- advertised
- Fetch
- shallow filter sideband-all
- Capabilities
- agent ls-refs fetch object-format