romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-06-02 02:14:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

tidy-up: miscellaneous

Browse source 
- drop more uses of the word "just". (not enforced here)
- drop some uses of the "will" word.
- "then" -> "than".
- tests/http/testenv/curl.py: fix copy-paste typo in error message.
- pytest: replace `shutdownh` with `shutdown` in test names.
  Spotted by GitHub Code Quality.
- comment typos.
- whitespace and newlines fixes.

Closes #21830
This commit is contained in:
Viktor Szakats 2026-05-28 23:50:52 +02:00
parent 032b15c434
commit d229055549
No known key found for this signature in database
116 changed files with 184 additions and 185 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/stale.yml vendored
View file

@ -15,7 +15,7 @@ staleLabel: stale
# Comment to post when marking an issue as stale. Set to `false` to disable
markComment: >
This issue has been automatically marked as stale because it has not had
recent activity. It will be closed if no further activity occurs. Thank you
recent activity. It is closed if no further activity occurs. Thank you
for your contributions.
# Comment to post when closing a stale issue. Set to `false` to disable
closeComment: false

2
.github/workflows/macos.yml vendored
View file

@ -658,7 +658,7 @@ jobs:
# Reduce build combinations, by dropping less interesting ones
- { image: macos-26, compiler: 'gcc-13' }
- { compiler: 'gcc-14' , build: cmake }
# Reduce autotools to just one job that is also build with cmake
# Reduce autotools to only one job that is also build with cmake
- { compiler: 'gcc-13' , build: autotools }
- { compiler: 'gcc-14' , build: autotools }
- { compiler: 'gcc-15' , build: autotools }

4
CMake/FindGSS.cmake
View file

@ -121,7 +121,7 @@ if(NOT _gss_FOUND) # Not found by pkg-config. Let us take more traditional appr
RESULT_VARIABLE _gss_configure_failed
OUTPUT_STRIP_TRAILING_WHITESPACE)
# Older versions may not have the "--version" parameter. In this case we just do not care.
# Older versions may not have the "--version" parameter. In this case we do not care.
if(_gss_configure_failed)
set(_gss_version 0)
else()
@ -134,7 +134,7 @@ if(NOT _gss_FOUND) # Not found by pkg-config. Let us take more traditional appr
RESULT_VARIABLE _gss_configure_failed
OUTPUT_STRIP_TRAILING_WHITESPACE)
# Older versions may not have the "--vendor" parameter. In this case we just do not care.
# Older versions may not have the "--vendor" parameter. In this case we do not care.
if(NOT _gss_configure_failed AND NOT _gss_vendor MATCHES "Heimdal|heimdal")
set(_gss_flavour "MIT") # assume a default, should not really matter
endif()

4
CMake/PickyWarnings.cmake
View file

@ -407,7 +407,7 @@ if(PICKY_COMPILER)
list(APPEND _picky "-wd4746")
list(APPEND _picky "-wd4820") # 'A': 'N' bytes padding added after data member 'B'
if(MSVC_VERSION GREATER_EQUAL 1900)
list(APPEND _picky "-wd5045") # Compiler will insert Spectre mitigation for memory load if /Qspectre switch specified
list(APPEND _picky "-wd5045") # Compiler inserts Spectre mitigation for memory load if /Qspectre switch specified
endif()
endif()
endif()
@ -437,7 +437,7 @@ if(CMAKE_C_STANDARD STREQUAL 90)
endif()
if((CMAKE_C_COMPILER_ID STREQUAL "Clang" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 3.9) OR
(CMAKE_C_COMPILER_ID STREQUAL "AppleClang" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 8.1))
list(APPEND _picky "-Wno-comma") # Just silly
list(APPEND _picky "-Wno-comma") # Silly
endif()
endif()

2
CMakeLists.txt
View file

@ -2180,7 +2180,7 @@ if(NOT CURL_DISABLE_INSTALL)
set(_explicit_libs "")
get_target_property(_imported "${_lib}" IMPORTED)
if(NOT _imported)
# Reading the LOCATION property on non-imported target does error out.
# Reading the LOCATION property on non-imported target errors out.
# Assume the user does not need this information in the .pc file.
continue()
endif()

4
REUSE.toml
View file

@ -2,8 +2,8 @@
# SPDX-FileCopyrightText: Daniel Stenberg, <daniel@haxx.se>, et al.
# This file describes the licensing and copyright situation for files that
# cannot be annotated directly, for example because of being
# uncommentable. Unless this is the case, a file should be annotated directly.
# cannot be annotated directly, for example because of being uncommentable.
# Unless this is the case, a file should be annotated directly.
#
# This follows the REUSE specification: https://reuse.software/spec-3.2/#reusetoml

2
acinclude.m4
View file

@ -1040,7 +1040,7 @@ AC_DEFUN([CURL_VERIFY_RUNTIMELIBS], [
dnl this test is of course not sensible if we are cross-compiling!
if test "$cross_compiling" != "yes"; then
dnl just run a program to verify that the libs checked for previous to this
dnl run a program to verify that the libs checked for previous to this
dnl point also is available runtime!
AC_MSG_CHECKING([runtime libs availability])
CURL_RUN_IFELSE([

12
configure.ac
View file

@ -227,7 +227,7 @@ exec $CC "$@"
EOF
dnl **********************************************************************
dnl See which TLS backend(s) that are requested. Just do all the
dnl See which TLS backend(s) that are requested. Do all the
dnl TLS AC_ARG_WITH() invokes here and do the checks later
dnl **********************************************************************
OPT_SCHANNEL=no
@ -1610,7 +1610,7 @@ if test "x$OPT_BROTLI" != "xno"; then
DIR_BROTLI=`echo $LD_BROTLI | $SED -e 's/^-L//'`
;;
off)
dnl no --with-brotli option given, just check default places
dnl no --with-brotli option given, check default places
;;
*)
dnl use the given --with-brotli spot
@ -1700,7 +1700,7 @@ if test "x$OPT_ZSTD" != "xno"; then
;;
off)
dnl no --with-zstd option given, just check default places
dnl no --with-zstd option given, check default places
;;
*)
dnl use the given --with-zstd spot
@ -1846,7 +1846,7 @@ int main(int argc, char **argv)
{
#ifdef _WIN32
/* on Windows, writing to the argv does not hide the argument in
process lists so it can just be skipped */
process lists so it can be skipped */
(void)argc;
(void)argv;
return 1;
@ -2437,7 +2437,7 @@ if test "x$OPT_LIBSSH2" != "xno"; then
;;
off)
dnl no --with-libssh2 option given, just check default places
dnl no --with-libssh2 option given, check default places
;;
*)
dnl use the given --with-libssh2 spot
@ -2514,7 +2514,7 @@ elif test "x$OPT_LIBSSH" != "xno"; then
;;
off)
dnl no --with-libssh option given, just check default places
dnl no --with-libssh option given, check default places
;;
*)
dnl use the given --with-libssh spot

2
lib/cf-h3-proxy.c
View file

@ -1404,7 +1404,7 @@ static void cb_ngtcp2_rand(uint8_t *dest, size_t destlen,
result = Curl_rand(NULL, dest, destlen);
if(result) {
/* cb_rand is only used for non-cryptographic context. If Curl_rand
failed, just fill 0 and call it *random*. */
failed, fill 0 and call it *random*. */
memset(dest, 0, destlen);
}
}

2
lib/config-os400.h
View file

@ -238,7 +238,7 @@
/* Size of time_t in number of bytes */
#define SIZEOF_TIME_T 4
/* Define to 1 if all of the C89 standard headers exist (not just the ones
/* Define to 1 if all of the C89 standard headers exist (not only the ones
required in a freestanding environment). This macro is provided for
backward compatibility; new code need not use it. */
#define STDC_HEADERS 1

2
lib/request.c
View file

@ -392,7 +392,7 @@ CURLcode Curl_req_send(struct Curl_easy *data, struct dynbuf *req,
blen = curlx_dyn_len(req);
/* if the sendbuf is empty and the request without body and
* the length to send fits info a sendbuf chunk, we send it directly.
* If `blen` is larger then `chunk_size`, we can not. Because we
* If `blen` is larger than `chunk_size`, we can not. Because we
* might have to retry a blocked send later from sendbuf and that
* would result in retry sends with a shrunken length. That is trouble. */
if(Curl_bufq_is_empty(&data->req.sendbuf) &&

2
lib/sendf.h
View file

@ -377,7 +377,7 @@ curl_off_t Curl_creader_client_length(struct Curl_easy *data);
* values will be ignored.
* @return CURLE_OK if offset could be set
* CURLE_READ_ERROR if not supported by reader or seek/read failed
* of offset larger then total length
* of offset larger than total length
* CURLE_PARTIAL_FILE if offset led to 0 total length
*/
CURLcode Curl_creader_resume_from(struct Curl_easy *data, curl_off_t offset);

2
lib/setopt.c
View file

@ -2774,7 +2774,7 @@ static CURLcode setopt_offt(struct Curl_easy *data, CURLoption option,
break;
case CURLOPT_MAX_SEND_SPEED_LARGE:
/*
* When transfer uploads are faster then CURLOPT_MAX_SEND_SPEED_LARGE
* When transfer uploads are faster than CURLOPT_MAX_SEND_SPEED_LARGE
* bytes per second the transfer is throttled..
*/
if(offt < 0)

2
lib/url.c
View file

@ -980,7 +980,7 @@ static bool url_match_destination(struct connectdata *conn,
return FALSE;
}
}
/* Scheme mismatch is acceptable, just compare hostname/port */
/* Scheme mismatch is acceptable, compare hostname/port */
return Curl_peer_same_destination(m->needle->origin, conn->origin);
}

2
lib/urlapi.c
View file

@ -480,7 +480,7 @@ static CURLUcode hostname_check(struct Curl_URL *u, char *hostname,
/* more than one trailing dot is not allowed */
return CURLUE_BAD_HOSTNAME;
else if((hlen == 1) && (hostname[0] == '.'))
/* just a single dot is not allowed */
/* a single dot alone is not allowed */
return CURLUE_BAD_HOSTNAME;
}
return CURLUE_OK;

2
lib/vquic/curl_ngtcp2.c
View file

@ -1697,7 +1697,7 @@ static CURLcode h3_stream_open(struct Curl_cfilter *cf,
stream->upload_left = -1; /* unknown */
break;
default:
/* there is not request body */
/* there is no request body */
stream->upload_left = 0; /* no request body */
break;
}

4
m4/curl-compilers.m4
View file

@ -174,7 +174,7 @@ dnl -------------------------------------------------
dnl Verify if compiler being used is GNU C
dnl
dnl $compiler_num is set to MAJOR * 100 + MINOR for gcc less than version
dnl 7 and just $MAJOR * 100 for gcc version 7 and later.
dnl 7 and $MAJOR * 100 for gcc version 7 and later.
dnl
dnl Examples:
dnl Version 1.2.3 => 102
@ -966,7 +966,7 @@ AC_DEFUN([CURL_SET_COMPILER_WARNING_OPTS], [
tmp_CFLAGS="$tmp_CFLAGS -Wno-c99-extensions" # Avoid: warning: '_Bool' is a C99 extension
fi
if test "$compiler_num" -ge "309"; then
tmp_CFLAGS="$tmp_CFLAGS -Wno-comma" # Just silly
tmp_CFLAGS="$tmp_CFLAGS -Wno-comma" # Silly
fi
;;
esac

2
m4/curl-gnutls.m4
View file

@ -72,7 +72,7 @@ if test "x$OPT_GNUTLS" != "xno"; then
addlib=-lgnutls
addld=-L$OPT_GNUTLS/lib$libsuff
addcflags=-I$OPT_GNUTLS/include
dnl we just do not know
dnl we do not know
version=""
gtlslib=$OPT_GNUTLS/lib$libsuff
fi

2
projects/OS400/.checksrc
View file

@ -2,7 +2,7 @@
#
# SPDX-License-Identifier: curl
# Possibly not what we want, but cannot test, just silence the warnings
# Possibly not what we want, but cannot test, thus silence the warnings
allowfunc calloc
allowfunc free
allowfunc malloc

2
projects/vms/build_gnv_curl_pcsi_desc.com
View file

@ -425,7 +425,7 @@ $ destname = "[gnv.beta" + destname - "[gnv.usr"
$ endif
$ endif
$!
$! It should be just a directory then.
$! It should be a directory then.
$!-------------------------------------
$ filedir = f$edit(f$parse(filename,,,"DIRECTORY"), "lowercase")
$! If this is not a directory then start processing files.

2
projects/vms/build_vms.com
View file

@ -723,7 +723,7 @@ $ endif
$ 'vo_c' " SSLLIB = ''ssllib'"
$!
$! TODO: Why are we translating the logical name?
$! The logical aname used to find the shared image should just be used
$! The logical aname used to find the shared image should be used
$! as translating it could result in the wrong location at run time.
$ if (openssl .eq. 1)
$ then

2
projects/vms/config_h.com
View file

@ -10,7 +10,7 @@ $! The CONFIGURE shell script will be examined for hints and a few symbols
$! but most of the tests will not produce valid results on OpenVMS. Some
$! will produce false positives and some will produce false negatives.
$!
$! It is easier to just read the config.h_in file and make up tests based
$! It is easier to read the config.h_in file and make up tests based
$! on what is in it!
$!
$! This file will create an empty config_vms.h file if one does not exist.

2
projects/vms/curl_gnv_build_steps.txt
View file

@ -268,7 +268,7 @@ branding the PCSI kit based on who is making the kit.
This compares the VMS specific source with the backup
staging directory for it and updates with any changes.
Leave off "UPDATE" to just check without doing any changes.
Leave off "UPDATE" to check without doing any changes.
If you are not using NFS mounted disks and do not want to have a
separate directory for staging the sources for backup make sure

2
projects/vms/curl_release_note_start.txt
View file

@ -36,7 +36,7 @@ the GNV$LIBCURL shared image and create logical names GNV$LIBCURL to reference
it. It will create the GNV$CURL_INCLUDE logical name for build procedures
to access the header files.
Normally to use curl from DCL, just create a foreign command as:
Normally to use curl from DCL, create a foreign command as:
curl :== $gnv$gnu:[usr.bin]gnv$curl.exe
If you need to work around having the older HP SSL kit installed, then

2
projects/vms/make_gnv_curl_install.sh
View file

@ -37,7 +37,7 @@ export GNV_CC_MAIN_POSIX_EXIT=1
make
cd ../..
# adjust the libcurl.pc file, GNV currently ignores the Lib: line.
# but is noisy about it, so we just remove it.
# but is noisy about it, so we remove it.
sed -e 's/^Libs:/#Libs:/g' libcurl.pc > libcurl.pc_new
rm libcurl.pc
mv libcurl.pc_new libcurl.pc

2
projects/vms/make_pcsi_curl_kit_name.com
View file

@ -67,7 +67,7 @@ $ write sys$output "*****"
$!
$!
$! Base is one of 'VMS', 'AXPVMS', 'I64VMS', 'VAXVMS' and indicates what
$! binaries are in the kit. A kit with just 'VMS' can be installed on all
$! binaries are in the kit. A kit with only 'VMS' can be installed on all
$! architectures.
$!
$ base = "VMS"

2
projects/vms/stage_curl_install.com
View file

@ -96,7 +96,7 @@ $ this_dir = f$element(i, ",", dest_dirs)
$ i = i + 1
$ if this_dir .eqs. "" then goto curl_dir_loop
$ if this_dir .eqs. "," then goto curl_dir_loop_end
$! Just create the directories, do not delete them.
$! Create the directories, do not delete them.
$! --------------------------------------------------
$ if remove_files .eq. 0
$ then

2
scripts/cd2nroff
View file

@ -426,7 +426,7 @@ sub single {
print STDERR "$f:$line:1:ERROR: un-escaped < or > used\n";
$errors++;
}
# convert backslash-'<' or '> to just the second character
# convert backslash-'<' or '> to the second character
$d =~ s/\\([<>])/$1/g;
# mentions of curl symbols with man pages use italics by default

2
scripts/checksrc.pl
View file

@ -879,7 +879,7 @@ sub scanfile {
}
}
# check for "return" with parentheses around just a value/name
# check for "return" with parentheses around a value/name
if($l =~ /^(.*\W)return \(\w*\);/) {
checkwarn("RETURNPAREN", $line, length($1)+7, $file, $l,
"return with paren");

4
scripts/managen
View file

@ -494,7 +494,7 @@ sub render {
}
}
# convert backslash-'<' or '> to just the second character
# convert backslash-'<' or '> to the second character
$d =~ s/\\([><])/$1/g;
# convert single backslash to double-backslash
$d =~ s/\\/\\\\/g if($manpage);
@ -916,7 +916,7 @@ sub single {
push @ex, "[0q]Example$s:\n";
#
# long ASCII examples are wrapped. Preferably at the last space
# before the margin. Or at a colon. Otherwise it just cuts at the
# before the margin. Or at a colon. Otherwise it cuts at the
# exact boundary.
#
foreach my $e (@examples) {

2
scripts/mdlinkcheck
View file

@ -108,7 +108,7 @@ sub storelink {
#print "-- whitelisted: $link\n";
$whitelist{$link}++;
}
# example.com is just example
# example.com is used as example
elsif($link =~ /^https:\/\/(.*)example.(com|org|net)/) {
#print "-- example: $link\n";
}

4
scripts/mk-ca-bundle.pl
View file

@ -421,7 +421,7 @@ print CRT <<EOT;
## It contains the certificates in ${format}PEM format and therefore
## can be directly used with curl / libcurl / php_curl, or with
## an Apache+mod_ssl webserver for SSL client authentication.
## Just configure this file as the SSLCACertificateFile.
## Configure this file as the SSLCACertificateFile.
##
## Conversion done with mk-ca-bundle.pl version $version.
## SHA256: $newhash
@ -493,7 +493,7 @@ while(<TXT>) {
#
# The latter is for certificates that have already been removed and are not
# included. Not all explicitly distrusted certificates are ignored at this
# point, just those without an actual certificate.
# point, only those without an actual certificate.
elsif(!$main_block && !$trust_block) {
next;
}

6
scripts/nroff2cd
View file

@ -30,7 +30,7 @@ This script converts an nroff file to curldown
Example: cd2nroff [options] <file.md> > <file.3>
Note: when converting .nf sections, this tool does not know if the
section is code or just regular quotes. It then assumes and uses ~~~c
section is code or regular quotes. It then assumes and uses ~~~c
for code.
=end comment
@ -116,7 +116,7 @@ HEAD
# if there are enclosing quotes, remove them first
$word =~ s/[\"\'](.*)[\"\']\z/$1/;
if($word eq "SEE ALSO") {
# we just slurp up this section
# we slurp up this section
next;
}
push @desc, "\n# $word\n\n";
@ -131,7 +131,7 @@ HEAD
push @desc, "\n## $word\n\n";
}
elsif($d =~ /^\.IP/) {
# .IP with no text we just skip
# .IP with no text we skip
}
elsif($d =~ /^\.BR (.*)/) {
# only used for SEE ALSO

4
scripts/wcurl
View file

@ -67,7 +67,7 @@ Options:
--no-decode-filename: Do not percent-decode the output filename, even if the percent-encoding in
the URL was done by wcurl, e.g.: The URL contained whitespace.
--dry-run: Do not actually execute curl, just print what would be invoked.
--dry-run: Do not actually execute curl, only print what would be invoked.
-V, --version: Print version information.
@ -197,7 +197,7 @@ get_url_filename()
# sed to also replace ':' with the percent_encoded %3A
*/*) percent_decode "$(printf %s "${hostname_and_path}" | sed -e 's,^.*/,,' -e 's,:,%3A,g')" ;;
esac
# No slash means there was just a hostname and no path; return empty string.
# No slash means there was only a hostname and no path; return empty string.
}
# Execute curl with the list of URLs provided by the user.

14
src/tool_getparam.c
View file

@ -539,11 +539,11 @@ struct sizeunit {
static const struct sizeunit *getunit(char unit)
{
static const struct sizeunit list[] = {
{'p', (curl_off_t)1125899906842624, 16 }, /* Peta */
{'t', (curl_off_t)1099511627776, 13 }, /* Tera */
{'g', 1073741824, 10 }, /* Giga */
{'m', 1048576, 7 }, /* Mega */
{'k', 1024, 4 }, /* Kilo */
{ 'p', (curl_off_t)1125899906842624, 16 }, /* Peta */
{ 't', (curl_off_t)1099511627776, 13 }, /* Tera */
{ 'g', 1073741824, 10 }, /* Giga */
{ 'm', 1048576, 7 }, /* Mega */
{ 'k', 1024, 4 }, /* Kilo */
};
size_t i;
@ -1627,12 +1627,12 @@ static ParameterError parse_time_cond(struct OperationConfig *config,
config->timecond = CURL_TIMECOND_IFMODSINCE;
break;
case '-':
/* If-Unmodified-Since: (section 14.24 in RFC2068) */
/* If-Unmodified-Since: (section 14.24 in RFC2068) */
config->timecond = CURL_TIMECOND_IFUNMODSINCE;
nextarg++;
break;
case '=':
/* Last-Modified: (section 14.29 in RFC2068) */
/* Last-Modified: (section 14.29 in RFC2068) */
config->timecond = CURL_TIMECOND_LASTMOD;
nextarg++;
break;

1
src/tool_operate.c
View file

@ -722,6 +722,7 @@ static CURLcode post_close_output(struct per_transfer *per,
}
return result;
}
/*
* Call this after a transfer has completed.
*/

2
tests/certs/Makefile.am
View file

@ -35,7 +35,7 @@ all-am: test-ca.cacert
# Rebuild the certificates
# Generate all certs in a single shot, but declare just a single target file
# Generate all certs in a single shot, but declare only a single target file
# to support GNU Make <4.3 without the "grouped explicit targets" feature.
test-ca.cacert: $(CERTCONFIG_CA) $(CERTCONFIGS) genserv.pl
@PERL@ $(srcdir)/genserv.pl test $(CERTCONFIGS)

4
tests/data/DISABLED
View file

@ -23,7 +23,7 @@
###########################################################################
#
# This file can be used to specify test cases that should not run when all
# test cases are run by runtests.pl. Just add the plain test case numbers, one
# test cases are run by runtests.pl. Add the plain test case numbers, one
# per line.
# Lines starting with '#' letters are treated as comments.
#
@ -43,7 +43,7 @@
1184
1209
1211
# fnmatch differences are just too common to make testing them sensible
# fnmatch differences are too common to make testing them sensible
1307
1316
1512

2
tests/data/test1075
View file

@ -13,7 +13,7 @@ HTTP Basic auth
<reply>
# The test server provides no way to respond differently to a subsequent
# Basic authenticated request (we really want to respond with 200 for
# the second), so just respond with 401 for both and let curl deal with it.
# the second), so respond with 401 for both and let curl deal with it.
<data crlf="headers">
HTTP/1.1 401 Authorization Required
Server: testcurl

2
tests/data/test1144
View file

@ -11,7 +11,7 @@ HTTP/0.9
# Server-side
<reply>
<data>
No headers at all, just data swsclose
No headers at all, only data swsclose
Let's get

2
tests/data/test1152
View file

@ -9,7 +9,7 @@ FAILURE
# Server-side
<reply>
<servercmd>
REPLY PWD 257 "just one
REPLY PWD 257 "Only one
</servercmd>
</reply>

2
tests/data/test1400
View file

@ -51,7 +51,7 @@ Accept: */*
<stripfile>
# CURLOPT_SSL_VERIFYPEER, SSH_KNOWNHOSTS and HTTP_VERSION vary with
# CURLOPT_INTERLEAVEDATA requires RTSP protocol
# configurations - just ignore them
# configurations - ignore them
$_ = '' if /CURLOPT_SSL_VERIFYPEER/
$_ = '' if /CURLOPT_SSH_KNOWNHOSTS/
$_ = '' if /CURLOPT_HTTP_VERSION/

2
tests/data/test1401
View file

@ -62,7 +62,7 @@ X-Men: cyclops, iceman
</protocol>
<stripfile>
# CURLOPT_SSL_VERIFYPEER, SSH_KNOWNHOSTS and HTTP_VERSION vary with
# configurations - just ignore them
# configurations - ignore them
$_ = '' if /CURLOPT_SSL_VERIFYPEER/
$_ = '' if /CURLOPT_SSH_KNOWNHOSTS/
$_ = '' if /CURLOPT_HTTP_VERSION/

2
tests/data/test1402
View file

@ -54,7 +54,7 @@ foo=bar%AMPbaz=quux
</protocol>
<stripfile>
# CURLOPT_SSL_VERIFYPEER, SSH_KNOWNHOSTS and HTTP_VERSION vary with
# configurations - just ignore them
# configurations - ignore them
$_ = '' if /CURLOPT_SSL_VERIFYPEER/
$_ = '' if /CURLOPT_SSH_KNOWNHOSTS/
$_ = '' if /CURLOPT_HTTP_VERSION/

2
tests/data/test1403
View file

@ -51,7 +51,7 @@ Accept: */*
</protocol>
<stripfile>
# CURLOPT_SSL_VERIFYPEER, SSH_KNOWNHOSTS and HTTP_VERSION vary with
# configurations - just ignore them
# configurations - ignore them
$_ = '' if /CURLOPT_SSL_VERIFYPEER/
$_ = '' if /CURLOPT_SSH_KNOWNHOSTS/
$_ = '' if /CURLOPT_HTTP_VERSION/

2
tests/data/test1404
View file

@ -96,7 +96,7 @@ dummy data
</protocol>
<stripfile>
# CURLOPT_SSL_VERIFYPEER, SSH_KNOWNHOSTS and HTTP_VERSION vary with
# configurations - just ignore them
# configurations - ignore them
$_ = '' if /CURLOPT_SSL_VERIFYPEER/
$_ = '' if /CURLOPT_SSH_KNOWNHOSTS/
$_ = '' if /CURLOPT_HTTP_VERSION/

4
tests/data/test1405
View file

@ -65,11 +65,11 @@ QUIT
<stripfile>
# CURLOPT_USERAGENT and CURLOPT_MAXREDIRS requires HTTP protocol
# CURLOPT_INTERLEAVEDATA requires RTSP (HTTP) protocol
# support, IOW depends on configuration - just ignore these.
# support, IOW depends on configuration - ignore these.
$_ = '' if /CURLOPT_USERAGENT/
$_ = '' if /CURLOPT_MAXREDIRS/
# CURLOPT_SSL_VERIFYPEER, SSH_KNOWNHOSTS and HTTP_VERSION vary with
# configurations - just ignore them
# configurations - ignore them
$_ = '' if /CURLOPT_SSL_VERIFYPEER/
$_ = '' if /CURLOPT_SSH_KNOWNHOSTS/
$_ = '' if /CURLOPT_HTTP_VERSION/

2
tests/data/test1406
View file

@ -61,7 +61,7 @@ body
.
</upload>
<stripfile>
# These options vary with configurations - just ignore them
# These options vary with configurations - ignore them
# CURLOPT_INTERLEAVEDATA requires RTSP (HTTP) protocol
$_ = '' if /CURLOPT_MAXREDIRS/
$_ = '' if /CURLOPT_SSL_VERIFYPEER/

2
tests/data/test1407
View file

@ -48,7 +48,7 @@ LIST %TESTNUMBER
QUIT
</protocol>
<stripfile>
# These options vary with configurations - just ignore them
# These options vary with configurations - ignore them
# CURLOPT_USERAGENT and CURLOPT_MAXREDIRS requires HTTP protocol
# CURLOPT_INTERLEAVEDATA requires RTSP (HTTP) protocol
$_ = '' if /CURLOPT_USERAGENT/

2
tests/data/test1420
View file

@ -54,7 +54,7 @@ A004 FETCH 1 BODY[]
A005 LOGOUT
</protocol>
<stripfile>
# These options vary with configurations - just ignore them
# These options vary with configurations - ignore them
# CURLOPT_INTERLEAVEDATA requires RTSP (HTTP) protocol
$_ = '' if /CURLOPT_MAXREDIRS/
$_ = '' if /CURLOPT_SSL_VERIFYPEER/

2
tests/data/test1465
View file

@ -58,7 +58,7 @@ Content-Type: application/x-www-form-urlencoded
</protocol>
<stripfile>
# CURLOPT_SSL_VERIFYPEER, SSH_KNOWNHOSTS and HTTP_VERSION vary with
# configurations - just ignore them
# configurations - ignore them
$_ = '' if /CURLOPT_SSL_VERIFYPEER/
$_ = '' if /CURLOPT_SSH_KNOWNHOSTS/
$_ = '' if /CURLOPT_HTTP_VERSION/

2
tests/data/test1481
View file

@ -54,7 +54,7 @@ Proxy-Connection: Keep-Alive
<stripfile>
# CURLOPT_SSL_VERIFYPEER, SSH_KNOWNHOSTS and HTTP_VERSION vary with
# CURLOPT_INTERLEAVEDATA requires RTSP protocol
# configurations - just ignore them
# configurations - ignore them
$_ = '' if /CURLOPT_SSL_VERIFYPEER/
$_ = '' if /CURLOPT_SSH_KNOWNHOSTS/
$_ = '' if /CURLOPT_HTTP_VERSION/

2
tests/data/test157
View file

@ -16,7 +16,7 @@ Server: Apache/1.3.27 (Darwin) PHP/4.1.2
Content-Type: text/html; charset=iso-8859-1
Connection: close
GET received and served just fine. Thank you very much
GET received and served fine. Thank you very much
</data>
</reply>

2
tests/data/test2027
View file

@ -16,7 +16,7 @@ Explanation for the duplicate 400 requests:
libcurl does not detect that a given Digest password is wrong already on the
first 401 response (as the data400 gives). libcurl will instead consider the
new response just as a duplicate and it sends another and detects the auth
new response as a duplicate and it sends another and detects the auth
problem on the second 401 response!
-->

2
tests/data/test2030
View file

@ -21,7 +21,7 @@ Explanation for the duplicate 400 requests:
libcurl does not detect that a given Digest password is wrong already on the
first 401 response (as the data400 gives). libcurl will instead consider the
new response just as a duplicate and it sends another and detects the auth
new response as a duplicate and it sends another and detects the auth
problem on the second 401 response!
-->

4
tests/data/test218
View file

@ -31,7 +31,7 @@ HTTP PUT from a file but enforce chunked transfer-encoding
-T %LOGDIR/file%TESTNUMBER -H "Transfer-Encoding: chunked" http://%HOSTIP:%HTTPPORT/%TESTNUMBER
</command>
<file name="%LOGDIR/file%TESTNUMBER">
just some tiny teeny contents
some tiny teeny test contents
</file>
</client>
@ -45,7 +45,7 @@ Accept: */*%CR
Transfer-Encoding: chunked%CR
%CR
1e%CR
just some tiny teeny contents
some tiny teeny test contents
%CR
0%CR
%CR

2
tests/data/test2304
View file

@ -62,7 +62,7 @@ Connection: Upgrade
</protocol>
# This test used to check that "connection closed" was output, but
# that is flaky since the outgoing PING just before might fail already
# that is flaky since the outgoing PING before might fail already
# and then the test exists before the output gets to be written
</verify>
</testcase>

2
tests/data/test306
View file

@ -10,7 +10,7 @@ HTTP GET
# Server-side
<reply>
<data>
No headers at all, just data swsclose
No headers at all, data swsclose
Let's get

2
tests/data/test341
View file

@ -35,7 +35,7 @@ chunky-trailer: header data
http
</server>
<name>
A non existing file with --etag-compare is just a blank
A non existing file with --etag-compare is a blank
</name>
<command>
http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-compare %LOGDIR/etag%TESTNUMBER

2
tests/data/test583
View file

@ -25,7 +25,7 @@ lib%TESTNUMBER
SFTP with multi interface, remove handle early
</name>
# The command here uses 'localhost' just to make sure that curl_multi_perform
# The command here uses 'localhost' to make sure that curl_multi_perform
# does not reach too far in the first invoke. When using c-ares at least, the
# name resolve causes it to return rather quickly and thus we could trigger
# the problem we are looking to verify.

2
tests/data/test750
View file

@ -32,7 +32,7 @@ http
proxy
</features>
<name>
HTTP CONNECT with proxy returning just HTML and closing
HTTP CONNECT with proxy returning HTML and closing
</name>
<command>
http://test.example --proxy http://%HOSTIP:%HTTPPORT --proxytunnel -sS

2
tests/data/test950
View file

@ -24,7 +24,7 @@ smtp
SMTP VRFY with custom request
</name>
# the custom request just does it lowercase to remain the same command
# the custom request does it lowercase to remain the same command
<command>
smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient --request "vrfy"
</command>

4
tests/ech_tests.sh
View file

@ -31,7 +31,7 @@
# TODO: Translate this into something that approximates a valid curl test:-)
# Should be useful though even before such translation and a pile less work
# to do this than that. The pile of work required would include making an
# ECH-enabled server and a DoH server. For now, this is just run manually.
# ECH-enabled server and a DoH server. For now, this is run manually.
#
# set -x
@ -1083,7 +1083,7 @@ else
echo "NOT all good, log in $logfile"
fi
# send a mail to root (will be forwarded) but just once every 24 hours
# send a mail to root (will be forwarded) but only once every 24 hours
# 'cause we only really need "new" news
itsnews="yes"
age_of_news=0

8
tests/ftpserver.pl
View file

@ -562,8 +562,8 @@ sub protocolsetup {
'LIST' => '150 here comes a directory',
'NLST' => '150 here comes a directory',
'CWD' => '250 CWD command successful.',
'SYST' => '215 UNIX Type: L8', # just fake something
'QUIT' => '221 bye bye baby', # just reply something
'SYST' => '215 UNIX Type: L8', # fake something
'QUIT' => '221 bye bye baby', # reply something
'MKD' => '257 Created your requested directory',
'REST' => '350 Yeah yeah we set it there for you',
'DELE' => '200 OK OK OK whatever you say',
@ -1143,7 +1143,7 @@ my $cmdid;
my $selected;
# Any IMAP parameter can come in escaped and in double quotes.
# This function is dumb (so far) and just removes the quotes if present.
# This function is dumb (so far) and removes the quotes if present.
sub fix_imap_params {
foreach (@_) {
$_ = $1 if /^"(.*)"$/;
@ -3289,7 +3289,7 @@ while(1) {
my $delay = $delayreply{$FTPCMD};
if($delay) {
# just go sleep this many seconds!
# go sleep this many seconds!
logmsg("Sleep for $delay seconds\n");
my $twentieths = $delay * 20;
while($twentieths--) {

2
tests/getpart.pm
View file

@ -195,7 +195,7 @@ sub partexists {
}
# The code currently never calls this more than once per part per file, so
# caching a result that is never used again just slows things down.
# caching a result that is never used again only slows things down.
# memoize('partexists', NORMALIZER => 'normalize_part'); # cache each result
sub loadtest {

2
tests/globalconfig.pm
View file

@ -124,7 +124,7 @@ our $CURLINFO=dirsepadd("../src/" . ($ENV{'CURL_DIRSUFFIX'} || '')) .
our $VCURL=$CURL; # what curl binary to use to verify the servers with
# VCURL is handy to set to the system one when the one you
# just built hangs or crashes and thus prevent verification
# built hangs or crashes and thus prevent verification
# the path to the script that analyzes the memory debug output file
our $memanalyze="$perl " . shell_quote("$srcdir/memanalyze.pl");
our $valgrind; # path to valgrind, or empty if disabled

2
tests/http-server.pl
View file

@ -40,7 +40,7 @@ use serverhelp qw(
);
my $verbose = 0; # set to 1 for debugging
my $port = 8990; # just a default
my $port = 8990; # a default
my $unix_socket; # location to place a listening Unix socket
my $ipvnum = 4; # default IP version of http server
my $idnum = 1; # default http server instance number

4
tests/http/test_02_download.py
View file

@ -145,7 +145,7 @@ class TestDownload:
])
r.check_response(http_status=200, count=count)
# should have used at most 2 connections only (test servers allow 100 req/conn)
# it may be just 1 on slow systems where request are answered faster than
# it may be 1 on slow systems where request are answered faster than
# curl can exhaust the capacity or if curl runs with address-sanitizer speed
assert r.total_connects <= 2, "h2 should use fewer connections here"
@ -417,7 +417,7 @@ class TestDownload:
assert r.exit_code == 0, f'{client.dump_logs()}'
# Special client that tests TLS session reuse in parallel transfers
# TODO: just uses a single connection for h2/h3. Not sure how to prevent that
# TODO: uses a single connection for h2/h3. Not sure how to prevent that
@pytest.mark.parametrize("proto", Env.http_protos())
def test_02_26_session_shared_reuse(self, env: Env, proto, httpd, nghttpx):
url = f'https://{env.authority_for(env.domain1, proto)}/data-100k'

2
tests/http/test_05_errors.py
View file

@ -100,7 +100,7 @@ class TestErrors:
assert r.stats[0]['http_version'] == '1.1', r.dump_logs()
# On the URL used here, Apache is doing an "unclean" TLS shutdown,
# meaning it sends no shutdown notice and just closes TCP.
# meaning it sends no shutdown notice and closes TCP.
# The HTTP response delivers a body without Content-Length. We expect:
# - http/1.0 to fail since it relies on a clean connection close to
# detect the end of the body

2
tests/http/test_14_auth.py
View file

@ -95,7 +95,7 @@ class TestAuth:
if proto == 'h3' and not env.curl_uses_lib('ngtcp2'):
# See <https://github.com/cloudflare/quiche/issues/1573>
pytest.skip("quiche has problems with large requests")
# just large enough that nghttp2 will submit
# large enough that nghttp2 will submit
password = 'x' * (47 * 1024)
fdata = os.path.join(env.gen_dir, 'data-10m')
curl = CurlClient(env=env)

4
tests/http/test_30_vsftpd.py
View file

@ -148,7 +148,7 @@ class TestVsFTPD:
@pytest.mark.skipif(condition=not Env.tcpdump(), reason="tcpdump not available")
@pytest.mark.skipif(condition=not Env.curl_is_debug(), reason="needs curl debug")
@pytest.mark.skipif(condition=not Env.curl_is_verbose(), reason="needs curl verbose strings")
def test_30_06_shutdownh_download(self, env: Env, vsftpd: VsFTPD):
def test_30_06_shutdown_download(self, env: Env, vsftpd: VsFTPD):
docname = 'data-1k'
curl = CurlClient(env=env)
count = 1
@ -166,7 +166,7 @@ class TestVsFTPD:
@pytest.mark.skipif(condition=not Env.tcpdump(), reason="tcpdump not available")
@pytest.mark.skipif(condition=not Env.curl_is_debug(), reason="needs curl debug")
@pytest.mark.skipif(condition=not Env.curl_is_verbose(), reason="needs curl verbose strings")
def test_30_07_shutdownh_upload(self, env: Env, vsftpd: VsFTPD):
def test_30_07_shutdown_upload(self, env: Env, vsftpd: VsFTPD):
docname = 'upload-1k'
curl = CurlClient(env=env)
srcfile = os.path.join(env.gen_dir, docname)

4
tests/http/test_31_vsftpds.py
View file

@ -153,7 +153,7 @@ class TestVsFTPD:
@pytest.mark.skipif(condition=not Env.tcpdump(), reason="tcpdump not available")
@pytest.mark.skipif(condition=not Env.curl_is_debug(), reason="needs curl debug")
@pytest.mark.skipif(condition=not Env.curl_is_verbose(), reason="needs curl verbose strings")
def test_31_06_shutdownh_download(self, env: Env, vsftpds: VsFTPD):
def test_31_06_shutdown_download(self, env: Env, vsftpds: VsFTPD):
docname = 'data-1k'
curl = CurlClient(env=env)
count = 1
@ -170,7 +170,7 @@ class TestVsFTPD:
@pytest.mark.skipif(condition=not Env.tcpdump(), reason="tcpdump not available")
@pytest.mark.skipif(condition=not Env.curl_is_debug(), reason="needs curl debug")
@pytest.mark.skipif(condition=not Env.curl_is_verbose(), reason="needs curl verbose strings")
def test_31_07_shutdownh_upload(self, env: Env, vsftpds: VsFTPD):
def test_31_07_shutdown_upload(self, env: Env, vsftpds: VsFTPD):
docname = 'upload-1k'
curl = CurlClient(env=env)
srcfile = os.path.join(env.gen_dir, docname)

4
tests/http/test_32_ftps_vsftpd.py
View file

@ -166,7 +166,7 @@ class TestFtpsVsFTPD:
@pytest.mark.skipif(condition=not Env.tcpdump(), reason="tcpdump not available")
@pytest.mark.skipif(condition=not Env.curl_is_debug(), reason="needs curl debug")
@pytest.mark.skipif(condition=not Env.curl_is_verbose(), reason="needs curl verbose strings")
def test_32_06_shutdownh_download(self, env: Env, vsftpds: VsFTPD):
def test_32_06_shutdown_download(self, env: Env, vsftpds: VsFTPD):
docname = 'data-1k'
curl = CurlClient(env=env)
count = 1
@ -183,7 +183,7 @@ class TestFtpsVsFTPD:
@pytest.mark.skipif(condition=not Env.tcpdump(), reason="tcpdump not available")
@pytest.mark.skipif(condition=not Env.curl_is_debug(), reason="needs curl debug")
@pytest.mark.skipif(condition=not Env.curl_is_verbose(), reason="needs curl verbose strings")
def test_32_07_shutdownh_upload(self, env: Env, vsftpds: VsFTPD):
def test_32_07_shutdown_upload(self, env: Env, vsftpds: VsFTPD):
docname = 'upload-1k'
curl = CurlClient(env=env)
srcfile = os.path.join(env.gen_dir, docname)

2
tests/http/test_60_h3_proxy.py
View file

@ -285,7 +285,7 @@ class TestH3Proxy:
)
# An HTTP/3 target auto-triggers CONNECT-UDP even without --proxytunnel,
# just as HTTPS targets auto-trigger CONNECT. nghttpx does not support
# as HTTPS targets auto-trigger CONNECT. nghttpx does not support
# CONNECT-UDP so this fails, which confirms auto-CONNECT-UDP is active.
assert r.exit_code != 0, (
"expected failure: h3 target auto-triggers CONNECT-UDP "

2
tests/http/testenv/curl.py
View file

@ -1239,7 +1239,7 @@ class CurlClient:
def _perf_collapse(self, perf: PerfProfile, file_err):
if not os.path.exists(perf.file):
raise Exception(f'dtrace output file does not exist: {perf.file}')
raise Exception(f'perf output file does not exist: {perf.file}')
fg_collapse = os.path.join(self._fg_dir, 'stackcollapse-perf.pl')
if not os.path.exists(fg_collapse):
raise Exception(f'FlameGraph script not found: {fg_collapse}')

8
tests/http/testenv/mod_curltest/mod_curltest.c
View file

@ -339,7 +339,7 @@ static int curltest_tweak_handler(request_rec *r)
}
}
else if(!strcmp("id", arg)) {
/* just an id for repeated requests with curl's URL globbing */
/* an id for repeated requests with curl's URL globbing */
request_id = val;
continue;
}
@ -551,7 +551,7 @@ static int curltest_put_handler(request_rec *r)
*s = '\0';
val = s + 1;
if(!strcmp("id", arg)) {
/* just an id for repeated requests with curl's URL globbing */
/* an id for repeated requests with curl's URL globbing */
request_id = val;
continue;
}
@ -748,7 +748,7 @@ static int curltest_sslinfo_handler(request_rec *r)
*s = '\0';
val = s + 1;
if(!strcmp("id", arg)) {
/* just an id for repeated requests with curl's URL globbing */
/* an id for repeated requests with curl's URL globbing */
request_id = val;
continue;
}
@ -862,7 +862,7 @@ static int curltest_limit_handler(request_rec *r)
*s = '\0';
val = s + 1;
if(!strcmp("id", arg)) {
/* just an id for repeated requests with curl's URL globbing */
/* an id for repeated requests with curl's URL globbing */
request_id = val;
continue;
}

2
tests/libtest/first.c
View file

@ -201,7 +201,7 @@ CURLcode ws_recv_pong(CURL *curl, const char *expected_payload)
return CURLE_RECV_ERROR;
}
/* just close the connection */
/* close the connection */
void ws_close(CURL *curl)
{
size_t sent;

4
tests/libtest/first.h
View file

@ -54,7 +54,7 @@ extern int unitfail; /* for unittests */
#include "curlx/wait.h" /* for curlx_wait_ms() */
#ifdef HAVE_SYS_SELECT_H
/* since so many tests use select(), we can just as well include it here */
/* since so many tests use select(), we can as well include it here */
#include <sys/select.h>
#endif
@ -99,7 +99,7 @@ extern char *hexdump(const unsigned char *buf, size_t len);
#ifndef CURL_DISABLE_WEBSOCKETS
CURLcode ws_send_ping(CURL *curl, const char *send_payload);
CURLcode ws_recv_pong(CURL *curl, const char *expected_payload);
void ws_close(CURL *curl); /* just close the connection */
void ws_close(CURL *curl); /* close the connection */
#endif
/*

2
tests/libtest/lib1518.c
View file

@ -64,7 +64,7 @@ static CURLcode test_lib1518(const char *URL)
}
else {
test_setopt(curl, CURLOPT_URL, URL);
/* just to make it explicit and visible in this test: */
/* to make it explicit and visible in this test: */
test_setopt(curl, CURLOPT_FOLLOWLOCATION, 0L);
}

2
tests/libtest/lib1537.c
View file

@ -77,7 +77,7 @@ static CURLcode test_lib1537(const char *URL)
curl_mprintf("escape -1 length: %s\n", ptr);
/* weird input length */
outlen = 2017; /* just a value */
outlen = 2017; /* an arbitrary value */
ptr = curl_easy_unescape(NULL, "moahahaha", -1, &outlen);
curl_mprintf("unescape -1 length: %s %d\n", ptr, outlen);

6
tests/libtest/lib1592.c
View file

@ -61,20 +61,20 @@ static CURLcode test_lib1592(const char *URL)
/* Since we could set the DNS server, presume we are working with a
resolver that can be cancelled (i.e. c-ares). Thus,
curl_multi_remove_handle() should not block even when the resolver
request is outstanding. So, set a request timeout _longer_ than the
request is outstanding. Thus, set a request timeout _longer_ than the
test hang timeout so we will fail if the handle removal call incorrectly
blocks. */
timeout = TEST_HANG_TIMEOUT * 2;
else {
/* If we cannot set the DNS server, presume that we are configured to use
a resolver that cannot be cancelled (i.e. the threaded resolver or the
non-threaded blocking resolver). So, we just test that the
non-threaded blocking resolver). Thus, we test that the
curl_multi_remove_handle() call does finish well within our test
timeout.
But, it is unlikely that the resolver request will take any time at
all because we have not been able to configure the resolver to use an
non-responsive DNS server. At least we exercise the flow.
non-responsive DNS server. At least we exercise the flow.
*/
curl_mfprintf(stderr,
"CURLOPT_DNS_SERVERS not supported; "

2
tests/libtest/lib1908.c
View file

@ -52,7 +52,7 @@ static CURLcode test_lib1908(const char *URL)
curl_easy_reset(curl);
/* using the same filename for the alt-svc cache, this clobbers the
content just written from the 'curldupe' handle */
content written from the 'curldupe' handle */
curl_easy_cleanup(curl);
}
curl_global_cleanup();

2
tests/libtest/lib1911.c
View file

@ -43,7 +43,7 @@ static CURLcode test_lib1911(const char *URL)
return TEST_ERR_EASY_INIT;
}
/* make it a null-terminated C string with just As */
/* make it a null-terminated C string with only As */
memset(testbuf, 'A', MAX_INPUT_LENGTH + 1);
testbuf[MAX_INPUT_LENGTH + 1] = 0;

2
tests/libtest/lib1939.c
View file

@ -51,7 +51,7 @@ static CURLcode test_lib1939(const char *URL)
mresult = curl_multi_add_handle(multi, curl);
if(!mresult)
/* Run the multi handle once, just enough to start establishing an
/* Run the multi handle once, enough to start establishing an
HTTPS connection. */
mresult = curl_multi_perform(multi, &running_handles);

2
tests/libtest/lib1977.c
View file

@ -34,7 +34,7 @@ static CURLcode test_lib1977(const char *URL)
global_init(CURL_GLOBAL_ALL);
easy_init(curl);
/* first transfer: set just the URL in the first CURLU handle */
/* first transfer: set the URL in the first CURLU handle */
curl_url_set(curlu, CURLUPART_URL, URL, CURLU_DEFAULT_SCHEME);
easy_setopt(curl, CURLOPT_CURLU, curlu);

2
tests/libtest/lib3027.c
View file

@ -41,7 +41,7 @@ static CURLcode test_lib3027(const char *URL)
result = curl_easy_getinfo(curl, CURLINFO_FILETIME, &filetime);
/* MTDM fails with 550, so filetime should be -1 */
if((result == CURLE_OK) && (filetime != -1)) {
/* we just need to return something which is not CURLE_OK */
/* we need to return something which is not CURLE_OK */
result = CURLE_UNSUPPORTED_PROTOCOL;
}
}

2
tests/libtest/lib501.c
View file

@ -44,7 +44,7 @@ static CURLcode test_lib501(const char *URL)
test_setopt(curl, CURLOPT_HEADER, 1L);
/* just verify that setting this to -1 is fine */
/* verify that setting this to -1 is fine */
test_setopt(curl, CURLOPT_MAXREDIRS, -1L);
result = curl_easy_perform(curl);

2
tests/libtest/lib505.c
View file

@ -24,7 +24,7 @@
#include "first.h"
/*
* This example shows an FTP upload, with a rename of the file just after
* This example shows an FTP upload, with a rename of the file right after
* a successful upload.
*
* Example based on source code provided by Erick Nuwendam. Thanks!

4
tests/libtest/lib518.c
View file

@ -136,7 +136,7 @@ static int t518_test_rlimit(int keep_open)
curl_mfprintf(stderr, "raising soft limit up to OPEN_MAX\n");
rl.rlim_cur = OPEN_MAX;
if(setrlimit(RLIMIT_NOFILE, &rl) != 0) {
/* on failure do not abort just issue a warning */
/* on failure do not abort, only issue a warning */
t518_store_errmsg("setrlimit() failed", errno);
curl_mfprintf(stderr, "%s\n", t518_msgbuff);
t518_msgbuff[0] = '\0';
@ -147,7 +147,7 @@ static int t518_test_rlimit(int keep_open)
curl_mfprintf(stderr, "raising soft limit up to hard limit\n");
rl.rlim_cur = rl.rlim_max;
if(setrlimit(RLIMIT_NOFILE, &rl) != 0) {
/* on failure do not abort just issue a warning */
/* on failure do not abort, only issue a warning */
t518_store_errmsg("setrlimit() failed", errno);
curl_mfprintf(stderr, "%s\n", t518_msgbuff);
t518_msgbuff[0] = '\0';

4
tests/libtest/lib537.c
View file

@ -137,7 +137,7 @@ static int t537_test_rlimit(int keep_open)
curl_mfprintf(stderr, "raising soft limit up to OPEN_MAX\n");
rl.rlim_cur = OPEN_MAX;
if(setrlimit(RLIMIT_NOFILE, &rl) != 0) {
/* on failure do not abort just issue a warning */
/* on failure do not abort, only issue a warning */
t537_store_errmsg("setrlimit() failed", errno);
curl_mfprintf(stderr, "%s\n", t537_msgbuff);
t537_msgbuff[0] = '\0';
@ -148,7 +148,7 @@ static int t537_test_rlimit(int keep_open)
curl_mfprintf(stderr, "raising soft limit up to hard limit\n");
rl.rlim_cur = rl.rlim_max;
if(setrlimit(RLIMIT_NOFILE, &rl) != 0) {
/* on failure do not abort just issue a warning */
/* on failure do not abort, only issue a warning */
t537_store_errmsg("setrlimit() failed", errno);
curl_mfprintf(stderr, "%s\n", t537_msgbuff);
t537_msgbuff[0] = '\0';

2
tests/libtest/test613.pl
View file

@ -140,7 +140,7 @@ elsif($ARGV[0] eq "postprocess") {
my $line = sprintf("%s%s???????%5d U U %15d %s %s\n", $1,$2,$5,$6,$7,$8);
push @canondir, $line;
} else {
# Unexpected format; just pass it through and let the test fail
# Unexpected format; pass it through and let the test fail
push @canondir, $_;
}
}

2
tests/negtelnetserver.py
View file

@ -167,7 +167,7 @@ class Negotiator:
log.debug("Starting negotiation (IAC)")
self.state = self.START_NEG
else:
# Just append the incoming byte to the buffer
# Append the incoming byte to the buffer
buffer.append(byte_int)
def start_neg(self, byte_int):

2
tests/rtspserver.pl
View file

@ -38,7 +38,7 @@ use serverhelp qw(
);
my $verbose = 0; # set to 1 for debugging
my $port = 8990; # just a default
my $port = 8990; # a default
my $ipvnum = 4; # default IP version of rtsp server
my $idnum = 1; # default rtsp server instance number
my $proto = 'rtsp'; # protocol the rtsp server speaks

9
tests/runtests.pl
View file

@ -1724,8 +1724,7 @@ sub singletest_check {
my @sout = sort @out;
if($hostname) {
# when a hostname is set, we filter out requests to just this
# pattern
# when a hostname is set, we filter out requests to this pattern
@sout = grep {/$hostname/} @sout;
}
@ -2675,7 +2674,7 @@ if($valgrind) {
# since valgrind 2.1.x, '--tool' option is mandatory
# use it, if it is supported by the version installed on the system
# (this happened in 2003, so we could probably do not need to care about
# that old version any longer and just delete this check)
# that old version any longer and delete this check)
runclient("valgrind --help 2>&1 | grep -- --tool >$dev_null 2>&1");
if(($? >> 8)) {
$valgrind_tool="";
@ -2690,7 +2689,7 @@ if($valgrind) {
# valgrind 3 renamed the --logfile option to --log-file!!!
# (this happened in 2005, so we could probably do not need to care about
# that old version any longer and just delete this check)
# that old version any longer and delete this check)
my $ver=join(' ', runclientoutput("valgrind --version"));
# cut off all but digits and dots
$ver =~ s/[^0-9.]//g;
@ -3212,7 +3211,7 @@ while(1) {
$endwaitcnt += $runnerwait;
if($endwaitcnt >= 10) {
# Once all tests have been scheduled on a runner at the end of a test
# run, we just wait for their results to come in. If we are still
# run, we wait for their results to come in. If we are still
# waiting after a couple of minutes ($endwaitcnt multiplied by
# $runnerwait, plus $jobs because that number will not time out), display
# the same test runner status as we give with a SIGUSR1. This will

6
tests/secureserver.pl
View file

@ -24,7 +24,7 @@
#***************************************************************************
# This is the HTTPS, FTPS, POP3S, IMAPS, SMTPS, server used for curl test
# harness. Actually just a layer that runs stunnel properly using the
# harness. Actually a layer that runs stunnel properly using the
# non-secure test harness servers.
use strict;
@ -50,7 +50,7 @@ my $stunnel = "stunnel";
my $verbose=0; # set to 1 for debugging
my $accept_port = 8991; # just our default, weird enough
my $accept_port = 8991; # our default, weird enough
my $target_port = 8999; # default test http-server port
my $stuncert;
@ -370,7 +370,7 @@ if($tstunnel_windows) {
# new process to the parent waiting perl.exe and sh.exe processes.
# exec() should never return back here to this process. We protect
# ourselves by calling die() just in case something goes really bad.
# ourselves by calling die() in case something goes really bad.
die "error: exec() has returned";
}

4
tests/server/getpart.c
View file

@ -202,7 +202,7 @@ static int decodedata(char **buf, /* dest buffer */
/*
* currently there is no way to tell apart an OOM condition in
* curlx_base64_decode() from zero length decoded data. For now,
* let's just assume it is an OOM condition, currently we have
* let's assume it is an OOM condition, currently we have
* no input for this function that decodes to zero length data.
*/
free(buf64);
@ -231,7 +231,7 @@ static int decodedata(char **buf, /* dest buffer */
* and the size of the data is stored at the addresses that caller specifies.
*
* If the returned data is a string the returned size will be the length of
* the string excluding null-termination. Otherwise it will just be the size
* the string excluding null-termination. Otherwise it will be the size
* of the returned binary data.
*
* Calling function is responsible to free returned buffer.

4
tests/server/rtspd.c
View file

@ -97,7 +97,7 @@ struct rtspd_httprequest {
#define CMD_AUTH_REQUIRED "auth_required"
/* 'idle' means that it will accept the request fine but never respond
any data. Just keep the connection alive. */
any data. Keep the connection alive. */
#define CMD_IDLE "idle"
/* 'stream' means to send a never-ending stream of data */
@ -890,7 +890,7 @@ static int rtspd_send_doc(curl_socket_t sock, struct rtspd_httprequest *req)
responsesize = count;
do {
/* Ok, we send no more than 200 bytes at a time, just to make sure that
/* Ok, we send no more than 200 bytes at a time, to make sure that
larger chunks are split up so that the client will need to do multiple
recv() calls to get it and thus we exercise that code better */
size_t num = count;

17
tests/server/sockfilt.c
View file

@ -68,14 +68,13 @@
* 'exit_signal_handler' for both signals.
*
* The 'exit_signal_handler' upon the first SIGINT or SIGTERM received signal
* will just set to one the global var 'got_exit_signal' storing in global var
* sets to one the global var 'got_exit_signal' storing in global var
* 'exit_signal' the signal that triggered this change.
*
* Nothing fancy that could introduce problems is used, the program at certain
* points in its normal flow checks if var 'got_exit_signal' is set and in
* case this is true it just makes its way out of loops and functions in
* structured and well behaved manner to achieve proper program cleanup and
* termination.
* case this is true it makes its way out of loops and functions in structured
* and well behaved manner to achieve proper program cleanup and termination.
*
* Even with the above mechanism implemented it is worthwhile to note that
* other signals might still be received, or that there might be systems on
@ -172,7 +171,7 @@ static ssize_t write_wincon(int fd, const void *buf, size_t count)
#endif
/* On Windows, we sometimes get this for a broken pipe, seemingly
* when the client just closed stdin? */
* when the client closed stdin? */
#define CURL_WIN32_EPIPE 109
/*
@ -897,7 +896,7 @@ static bool disc_handshake(void)
return FALSE;
}
else if(!memcmp("QUIT", buffer, 4)) {
/* just die */
/* die */
logmsg("quits");
return FALSE;
}
@ -945,7 +944,7 @@ static bool juggle(curl_socket_t *sockfdp,
}
#ifdef HAVE_GETPPID
/* As a last resort, quit if sockfilt process becomes orphan. Just in case
/* As a last resort, quit if sockfilt process becomes orphan. In case
parent ftpserver process has died without killing its sockfilt children */
if(getppid() <= 1) {
logmsg("process becomes orphan, exiting");
@ -1055,7 +1054,7 @@ static bool juggle(curl_socket_t *sockfdp,
buffer[0], buffer[1], buffer[2], buffer[3]);
if(!memcmp("PING", buffer, 4)) {
/* send reply on stdout, just proving we are alive */
/* send reply on stdout, proving we are alive */
if(!write_stdout("PONG\n", 5))
return FALSE;
}
@ -1073,7 +1072,7 @@ static bool juggle(curl_socket_t *sockfdp,
return FALSE;
}
else if(!memcmp("QUIT", buffer, 4)) {
/* just die */
/* die */
logmsg("quits");
return FALSE;
}

6
tests/server/sws.c
View file

@ -113,7 +113,7 @@ static const char *cmdfile = "log/server.cmd";
#define CMD_AUTH_REQUIRED "auth_required"
/* 'idle' means that it will accept the request fine but never respond
any data. Just keep the connection alive. */
any data. Keep the connection alive. */
#define CMD_IDLE "idle"
/* 'stream' means to send a never-ending stream of data */
@ -304,7 +304,7 @@ static int sws_parse_servercmd(struct sws_httprequest *req)
else {
logmsg("Unknown <servercmd> instruction found: %s", cmd);
}
/* try to deal with CRLF or just LF */
/* try to deal with CRLF or LF */
check = strchr(cmd, '\r');
if(!check)
check = strchr(cmd, '\n');
@ -966,7 +966,7 @@ static int sws_send_doc(curl_socket_t sock, struct sws_httprequest *req)
responsesize = count;
do {
/* Ok, we send no more than N bytes at a time, just to make sure that
/* Ok, we send no more than N bytes at a time, to make sure that
larger chunks are split up so that the client will need to do multiple
recv() calls to get it and thus we exercise that code better */
size_t num = count;

12
tests/server/tftpd.c
View file

@ -413,7 +413,7 @@ static ssize_t write_behind(struct testcase *test, int convert)
b = &bfs[nextone];
if(b->counter < -1) /* anything to flush? */
return 0; /* just nop if nothing to do */
return 0; /* nop if nothing to do */
if(!test->ofile) {
char outfile[256];
@ -453,11 +453,11 @@ static ssize_t write_behind(struct testcase *test, int convert)
while(ct--) { /* loop over the buffer */
c = (unsigned char)*p++; /* pick up a character */
if(prevchar == '\r') { /* if prev char was cr */
if(c == '\n') /* if have cr,lf then just */
if(c == '\n') /* if have cr,lf then */
curl_lseek(test->ofile, -1, SEEK_CUR); /* smash lf on top of the cr */
else if(c == '\0') /* if have cr,nul then */
goto skipit; /* just skip over the putc */
/* else just fall through and allow it */
goto skipit; /* skip over the putc */
/* else fall through and allow it */
}
/* formerly
putc(c, file); */
@ -570,7 +570,7 @@ static int tftpd_parse_servercmd(struct testcase *req)
else {
logmsg("Unknown <servercmd> instruction found: %s", cmd);
}
/* try to deal with CRLF or just LF */
/* try to deal with CRLF or LF */
check = strchr(cmd, '\r');
if(!check)
check = strchr(cmd, '\n');
@ -858,7 +858,7 @@ send_ack:
rap->th_block = htons(recvblock);
(void)swrite(peer, &ackbuf.storage[0], 4);
#if defined(HAVE_ALARM) && defined(SIGALRM)
mysignal(SIGALRM, justtimeout); /* just abort read on timeout */
mysignal(SIGALRM, justtimeout); /* abort read on timeout */
alarm(rexmtval);
#endif
/* normally times out and quits */

Some files were not shown because too many files have changed in this diff Show more