Skip to content

Commit 8fc23b5

Browse files
devkdasdevkdas
authored
Merge pull request #10 from devkdas/resolve-conflicts
Resolve conflicts
2 parents bb33cec + cbca3a3 commit 8fc23b5

66 files changed

Lines changed: 714 additions & 579 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.editorconfig‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
2+
#
3+
# SPDX-License-Identifier: curl
4+
5+
root = true
6+
7+
[*]
8+
charset = utf-8
9+
insert_final_newline = true
10+
indent_style = space
11+
trim_trailing_whitespace = true
12+
13+
[*.{c,h}]
14+
indent_size = 2
15+
max_line_length = 79
16+
17+
[*.{pl,pm}]
18+
indent_size = 4

‎.github/workflows/distcheck.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ jobs:
262262
matrix:
263263
image: [ubuntu-latest, macos-latest, windows-2022]
264264
steps:
265-
- uses: msys2/setup-msys2@40677d36a502eb2cf0fb808cc9dec31bf6152638 # v2
265+
- uses: msys2/setup-msys2@fb197b72ce45fb24f17bf3f807a388985654d1f2 # v2
266266
if: ${{ contains(matrix.image, 'windows') }}
267267
with:
268268
msystem: mingw64

‎.github/workflows/http3-linux.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ env:
5454
# renovate: datasource=github-tags depName=ngtcp2/nghttp3 versioning=semver registryUrl=https://github.com
5555
NGHTTP3_VERSION: 1.11.0
5656
# renovate: datasource=github-tags depName=ngtcp2/ngtcp2 versioning=semver registryUrl=https://github.com
57-
NGTCP2_VERSION: 1.15.0
57+
NGTCP2_VERSION: 1.15.1
5858
# renovate: datasource=github-tags depName=nghttp2/nghttp2 versioning=semver registryUrl=https://github.com
5959
NGHTTP2_VERSION: 1.66.0
6060
# renovate: datasource=github-tags depName=cloudflare/quiche versioning=semver registryUrl=https://github.com

‎.github/workflows/windows.yml‎

Lines changed: 57 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -53,21 +53,24 @@ jobs:
5353
matrix:
5454
image: [windows-2022, windows-11-arm]
5555
steps:
56+
- name: 'install build prereqs'
57+
if: ${{ steps.cache-perl-win32-pkgs.outputs.cache-hit != 'true' }}
58+
uses: msys2/setup-msys2@fb197b72ce45fb24f17bf3f807a388985654d1f2 # v2
59+
with:
60+
msystem: msys
61+
install: gcc make
62+
63+
- name: 'perl version'
64+
run: perl --version | tee "$GITHUB_WORKSPACE"/perlversion
65+
5666
- name: 'cache perl packages'
5767
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4
5868
id: cache-perl-win32-pkgs
5969
env:
6070
cache-name: cache-perl-win32-pkgs
6171
with:
6272
path: C:\perl-win32-pkgs
63-
key: ${{ runner.os }}-${{ runner.arch }}-build-${{ env.cache-name }}
64-
65-
- name: 'install build prereqs'
66-
if: ${{ steps.cache-perl-win32-pkgs.outputs.cache-hit != 'true' }}
67-
uses: msys2/setup-msys2@40677d36a502eb2cf0fb808cc9dec31bf6152638 # v2
68-
with:
69-
msystem: msys
70-
install: gcc make
73+
key: ${{ runner.os }}-${{ runner.arch }}-build-${{ env.cache-name }}-${{ hashFiles('perlversion') }}
7174

7275
- name: 'build perl packages'
7376
if: ${{ steps.cache-perl-win32-pkgs.outputs.cache-hit != 'true' }}
@@ -281,7 +284,7 @@ jobs:
281284
- run: git config --global core.autocrlf input
282285
shell: pwsh
283286

284-
- uses: msys2/setup-msys2@40677d36a502eb2cf0fb808cc9dec31bf6152638 # v2
287+
- uses: msys2/setup-msys2@fb197b72ce45fb24f17bf3f807a388985654d1f2 # v2
285288
if: ${{ matrix.sys == 'msys' }}
286289
with:
287290
msystem: ${{ matrix.sys }}
@@ -297,7 +300,7 @@ jobs:
297300
libpsl-devel
298301
${{ matrix.install }}
299302
300-
- uses: msys2/setup-msys2@40677d36a502eb2cf0fb808cc9dec31bf6152638 # v2
303+
- uses: msys2/setup-msys2@fb197b72ce45fb24f17bf3f807a388985654d1f2 # v2
301304
if: ${{ matrix.sys != 'msys' }}
302305
with:
303306
msystem: ${{ matrix.sys }}
@@ -422,6 +425,14 @@ jobs:
422425
mv bld/tests/unit/.libs/*.exe bld/tests/unit || true
423426
fi
424427
428+
- name: 'install test prereqs'
429+
if: ${{ matrix.tflags != 'skipall' && matrix.tflags != 'skiprun' }}
430+
timeout-minutes: 5
431+
run: |
432+
/usr/bin/pacman --noconfirm --noprogressbar --sync --needed openssh
433+
/c/ProgramData/chocolatey/choco.exe install --yes --no-progress --limit-output --timeout 180 --force stunnel || true
434+
perl --version | tee "$GITHUB_WORKSPACE"/perlversion
435+
425436
- name: 'cache perl packages'
426437
if: ${{ matrix.tflags != 'skipall' && matrix.tflags != 'skiprun' && matrix.sys != 'msys' }}
427438
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4
@@ -430,33 +441,28 @@ jobs:
430441
cache-name: cache-perl-win32-pkgs
431442
with:
432443
path: C:\perl-win32-pkgs
433-
key: ${{ runner.os }}-${{ runner.arch }}-build-${{ env.cache-name }}
444+
key: ${{ runner.os }}-${{ runner.arch }}-build-${{ env.cache-name }}-${{ hashFiles('perlversion') }}
434445

435446
- name: 'install test prereqs perl'
436447
if: ${{ matrix.tflags != 'skipall' && matrix.tflags != 'skiprun' }}
437448
timeout-minutes: 5
438449
run: &perl-win32-pkgs-install |
450+
perl --version
439451
if [ -d /c/perl-win32-pkgs ]; then
440-
cd /c/perl-win32-pkgs
441-
cd Win32-Process-0.17
452+
pushd /c/perl-win32-pkgs
453+
pushd Win32-Process-0.17
442454
install -D blib/arch/auto/Win32/Process/Process.dll /usr/lib/perl5/site_perl/auto/Win32/Process/Process.dll
443455
install -D blib/lib/Win32/Process.pm /usr/lib/perl5/site_perl/Win32/Process.pm
444-
cd ..
445-
cd Win32-Process-List-0.09
456+
popd
457+
pushd Win32-Process-List-0.09
446458
install -D blib/arch/auto/Win32/Process/List/List.dll /usr/lib/perl5/site_perl/auto/Win32/Process/List/List.dll
447459
install -D blib/lib/auto/Win32/Process/List/autosplit.ix /usr/lib/perl5/site_perl/auto/Win32/Process/List/autosplit.ix
448460
install -D blib/lib/Win32/Process/List.pm /usr/lib/perl5/site_perl/Win32/Process/List.pm
449461
install -D blib/lib/Win32/Process/processes.pl /usr/lib/perl5/site_perl/Win32/Process/processes.pl
450-
cd ..
451-
cd ..
462+
popd
463+
popd
452464
fi
453-
454-
- name: 'install test prereqs'
455-
if: ${{ matrix.tflags != 'skipall' && matrix.tflags != 'skiprun' }}
456-
timeout-minutes: 5
457-
run: |
458-
/usr/bin/pacman --noconfirm --noprogressbar --sync --needed openssh
459-
/c/ProgramData/chocolatey/choco.exe install --yes --no-progress --limit-output --timeout 180 --force stunnel || true
465+
perl -MWin32::Process -MWin32::Process::List -e 1 && echo '! Modules loading OK.' || echo '! Failed to load modules.'
460466

461467
- name: 'run tests'
462468
if: ${{ matrix.tflags != 'skipall' && matrix.tflags != 'skiprun' }}
@@ -554,7 +560,7 @@ jobs:
554560
tflags: 'skipall'
555561
fail-fast: false
556562
steps:
557-
- uses: msys2/setup-msys2@40677d36a502eb2cf0fb808cc9dec31bf6152638 # v2
563+
- uses: msys2/setup-msys2@fb197b72ce45fb24f17bf3f807a388985654d1f2 # v2
558564
with:
559565
msystem: ${{ matrix.dir }}
560566
release: false
@@ -649,6 +655,14 @@ jobs:
649655
PATH="/d/my-cache/${MATRIX_DIR}/bin:$PATH"
650656
cmake --build bld --target testdeps
651657
658+
- name: 'install test prereqs'
659+
if: ${{ matrix.tflags != 'skipall' && matrix.tflags != 'skiprun' }}
660+
timeout-minutes: 5
661+
run: |
662+
/c/ProgramData/chocolatey/choco.exe install --yes --no-progress --limit-output --timeout 180 --force stunnel || true
663+
python3 -m pip --disable-pip-version-check --no-input --no-cache-dir install --progress-bar off --prefer-binary impacket
664+
perl --version | tee "$GITHUB_WORKSPACE"/perlversion
665+
652666
- name: 'cache perl packages'
653667
if: ${{ matrix.tflags != 'skipall' && matrix.tflags != 'skiprun' }}
654668
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4
@@ -657,20 +671,13 @@ jobs:
657671
cache-name: cache-perl-win32-pkgs
658672
with:
659673
path: C:\perl-win32-pkgs
660-
key: ${{ runner.os }}-${{ runner.arch }}-build-${{ env.cache-name }}
674+
key: ${{ runner.os }}-${{ runner.arch }}-build-${{ env.cache-name }}-${{ hashFiles('perlversion') }}
661675

662676
- name: 'install test prereqs perl'
663677
if: ${{ matrix.tflags != 'skipall' && matrix.tflags != 'skiprun' }}
664678
timeout-minutes: 5
665679
run: *perl-win32-pkgs-install
666680

667-
- name: 'install test prereqs'
668-
if: ${{ matrix.tflags != 'skipall' && matrix.tflags != 'skiprun' }}
669-
timeout-minutes: 5
670-
run: |
671-
/c/ProgramData/chocolatey/choco.exe install --yes --no-progress --limit-output --timeout 180 --force stunnel || true
672-
python3 -m pip --disable-pip-version-check --no-input --no-cache-dir install --progress-bar off --prefer-binary impacket
673-
674681
- name: 'run tests'
675682
if: ${{ matrix.tflags != 'skipall' && matrix.tflags != 'skiprun' }}
676683
timeout-minutes: 10
@@ -889,7 +896,7 @@ jobs:
889896
890897
fail-fast: false
891898
steps:
892-
- uses: msys2/setup-msys2@40677d36a502eb2cf0fb808cc9dec31bf6152638 # v2
899+
- uses: msys2/setup-msys2@fb197b72ce45fb24f17bf3f807a388985654d1f2 # v2
893900
with:
894901
msystem: ${{ matrix.arch == 'arm64' && 'clangarm64' || 'ucrt64' }}
895902
release: ${{ contains(matrix.image, 'arm') }}
@@ -1028,21 +1035,6 @@ jobs:
10281035
timeout-minutes: 10
10291036
run: cmake --build bld --config "${MATRIX_TYPE}" --parallel 5 --target testdeps
10301037

1031-
- name: 'cache perl packages'
1032-
if: ${{ matrix.tflags != 'skipall' && matrix.tflags != 'skiprun' }}
1033-
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4
1034-
id: cache-perl-win32-pkgs
1035-
env:
1036-
cache-name: cache-perl-win32-pkgs
1037-
with:
1038-
path: C:\perl-win32-pkgs
1039-
key: ${{ runner.os }}-${{ runner.arch }}-build-${{ env.cache-name }}
1040-
1041-
- name: 'install test prereqs perl'
1042-
if: ${{ matrix.tflags != 'skipall' && matrix.tflags != 'skiprun' }}
1043-
timeout-minutes: 5
1044-
run: *perl-win32-pkgs-install
1045-
10461038
- name: 'install test prereqs'
10471039
if: ${{ matrix.tflags != 'skipall' && matrix.tflags != 'skiprun' }}
10481040
timeout-minutes: 5
@@ -1066,6 +1058,22 @@ jobs:
10661058
if [ "${MATRIX_IMAGE}" != 'windows-11-arm' ]; then # save 30-60 seconds, to counteract the slower test run step
10671059
python3 -m pip --disable-pip-version-check --no-input --no-cache-dir install --progress-bar off --prefer-binary impacket
10681060
fi
1061+
perl --version | tee "$GITHUB_WORKSPACE"/perlversion
1062+
1063+
- name: 'cache perl packages'
1064+
if: ${{ matrix.tflags != 'skipall' && matrix.tflags != 'skiprun' }}
1065+
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4
1066+
id: cache-perl-win32-pkgs
1067+
env:
1068+
cache-name: cache-perl-win32-pkgs
1069+
with:
1070+
path: C:\perl-win32-pkgs
1071+
key: ${{ runner.os }}-${{ runner.arch }}-build-${{ env.cache-name }}-${{ hashFiles('perlversion') }}
1072+
1073+
- name: 'install test prereqs perl'
1074+
if: ${{ matrix.tflags != 'skipall' && matrix.tflags != 'skiprun' }}
1075+
timeout-minutes: 5
1076+
run: *perl-win32-pkgs-install
10691077

10701078
- name: 'run tests'
10711079
if: ${{ matrix.tflags != 'skipall' && matrix.tflags != 'skiprun' }}

‎Makefile.am‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ PLAN9_DIST = plan9/include/mkfile \
7979
plan9/src/mkfile.inc \
8080
plan9/src/mkfile
8181

82-
EXTRA_DIST = CHANGES.md COPYING RELEASE-NOTES Dockerfile \
82+
EXTRA_DIST = CHANGES.md COPYING RELEASE-NOTES Dockerfile .editorconfig \
8383
$(CMAKE_DIST) $(VC_DIST) $(WINBUILD_DIST) $(PLAN9_DIST)
8484

8585
DISTCLEANFILES = buildinfo.txt

‎configure.ac‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5536,9 +5536,9 @@ AC_CONFIG_FILES([\
55365536
tests/http/Makefile \
55375537
packages/Makefile \
55385538
packages/vms/Makefile \
5539-
curl-config \
55405539
libcurl.pc
55415540
])
5541+
AC_CONFIG_FILES([curl-config], [chmod +x curl-config])
55425542
AC_OUTPUT
55435543

55445544
SUPPORT_PROTOCOLS_LOWER=`echo "$SUPPORT_PROTOCOLS" | tr A-Z a-z`

‎docs/libcurl/opts/CURLINFO_FILETIME.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ int main(void)
5858
if(CURLE_OK == res) {
5959
long filetime = 0;
6060
res = curl_easy_getinfo(curl, CURLINFO_FILETIME, &filetime);
61-
if((CURLE_OK == res) && (filetime >= 0)) {
61+
if((CURLE_OK == res) && (filetime != -1)) {
6262
time_t file_time = (time_t)filetime;
6363
printf("filetime: %s", ctime(&file_time));
6464
}

‎docs/libcurl/opts/CURLINFO_FILETIME_T.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ int main(void)
5959
if(CURLE_OK == res) {
6060
curl_off_t filetime;
6161
res = curl_easy_getinfo(curl, CURLINFO_FILETIME_T, &filetime);
62-
if((CURLE_OK == res) && (filetime >= 0)) {
62+
if((CURLE_OK == res) && (filetime != -1)) {
6363
time_t file_time = (time_t)filetime;
6464
printf("filetime: %s", ctime(&file_time));
6565
}

‎lib/altsvc.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,13 +187,13 @@ static CURLcode altsvc_add(struct altsvcinfo *asi, const char *line)
187187
else {
188188
struct altsvc *as;
189189
char dbuf[MAX_ALTSVC_DATELEN + 1];
190-
time_t expires;
190+
time_t expires = 0;
191191

192192
/* The date parser works on a null-terminated string. The maximum length
193193
is upheld by curlx_str_quotedword(). */
194194
memcpy(dbuf, curlx_str(&date), curlx_strlen(&date));
195195
dbuf[curlx_strlen(&date)] = 0;
196-
expires = Curl_getdate_capped(dbuf);
196+
Curl_getdate_capped(dbuf, &expires);
197197
as = altsvc_create(&srchost, &dsthost, &srcalpn, &dstalpn,
198198
(size_t)srcport, (size_t)dstport);
199199
if(as) {

‎lib/cf-h2-proxy.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@ static CURLcode proxy_h2_progress_ingress(struct Curl_cfilter *cf,
474474
Curl_bufq_len(&ctx->inbufq), result, nread);
475475
if(result) {
476476
if(result != CURLE_AGAIN) {
477-
failf(data, "Failed receiving HTTP2 data");
477+
failf(data, "Failed receiving HTTP2 proxy data");
478478
return result;
479479
}
480480
break;
@@ -541,7 +541,7 @@ static ssize_t on_session_send(nghttp2_session *h2,
541541
if(!nwritten)
542542
return NGHTTP2_ERR_WOULDBLOCK;
543543

544-
return (nwritten > SSIZE_T_MAX) ?
544+
return (nwritten > SSIZE_MAX) ?
545545
NGHTTP2_ERR_CALLBACK_FAILURE : (ssize_t)nwritten;
546546
}
547547

@@ -817,7 +817,7 @@ static ssize_t tunnel_send_callback(nghttp2_session *session,
817817

818818
CURL_TRC_CF(data, cf, "[%d] tunnel_send_callback -> %zd",
819819
ts->stream_id, nread);
820-
return (nread > SSIZE_T_MAX) ?
820+
return (nread > SSIZE_MAX) ?
821821
NGHTTP2_ERR_CALLBACK_FAILURE : (ssize_t)nread;
822822
}
823823

0 commit comments

Comments
 (0)