luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

language: s/behaviour/behavior/g

Browse Source 
We currently use both spellings the british "behaviour" and the american
"behavior". However "behavior" is more used in the project so I think
it's worth dropping the british name.

Closes #6395
This commit is contained in:
Emil Engler 2020-12-31 10:11:49 +01:00 committed by Daniel Stenberg
parent aa71750687
commit 725ec470e2
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
28 changed files with 51 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
acinclude.m4
View File

@ -5,7 +5,7 @@
# | (__| |_| | _ <| |___ # | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____| # \___|\___/|_| \_\_____|
# #
# Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. # Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
# #
# This software is licensed as described in the file COPYING, which # This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms # you should have received as part of this distribution. The terms
@ -143,7 +143,7 @@ int main (void)
dnl CURL_CHECK_AIX_ALL_SOURCE dnl CURL_CHECK_AIX_ALL_SOURCE
dnl ------------------------------------------------- dnl -------------------------------------------------
dnl Provides a replacement of traditional AC_AIX with dnl Provides a replacement of traditional AC_AIX with
dnl an uniform behaviour across all autoconf versions, dnl an uniform behavior across all autoconf versions,
dnl and with our own placement rules. dnl and with our own placement rules.
AC_DEFUN([CURL_CHECK_AIX_ALL_SOURCE], [ AC_DEFUN([CURL_CHECK_AIX_ALL_SOURCE], [

2
docs/INTERNALS.md
View File

@ -145,7 +145,7 @@ Windows vs Unix
That's taken care of by the `curl_global_init()` call, but if other libs That's taken care of by the `curl_global_init()` call, but if other libs
also do it etc there might be reasons for applications to alter that also do it etc there might be reasons for applications to alter that
behaviour. behavior.
We require WinSock version 2.2 and load this version during global init. We require WinSock version 2.2 and load this version during global init.

2
docs/cmdline-opts/post301.d
View File

@ -6,7 +6,7 @@ Added: 7.17.1
Category: http post Category: http post
--- ---
Tells curl to respect RFC 7231/6.4.2 and not convert POST requests into GET Tells curl to respect RFC 7231/6.4.2 and not convert POST requests into GET
requests when following a 301 redirection. The non-RFC behaviour is ubiquitous requests when following a 301 redirection. The non-RFC behavior is ubiquitous
in web browsers, so curl does the conversion by default to maintain in web browsers, so curl does the conversion by default to maintain
consistency. However, a server may require a POST to remain a POST after such consistency. However, a server may require a POST to remain a POST after such
a redirection. This option is meaningful only when using --location. a redirection. This option is meaningful only when using --location.

2
docs/cmdline-opts/post302.d
View File

@ -6,7 +6,7 @@ Added: 7.19.1
Category: http post Category: http post
--- ---
Tells curl to respect RFC 7231/6.4.3 and not convert POST requests into GET Tells curl to respect RFC 7231/6.4.3 and not convert POST requests into GET
requests when following a 302 redirection. The non-RFC behaviour is ubiquitous requests when following a 302 redirection. The non-RFC behavior is ubiquitous
in web browsers, so curl does the conversion by default to maintain in web browsers, so curl does the conversion by default to maintain
consistency. However, a server may require a POST to remain a POST after such consistency. However, a server may require a POST to remain a POST after such
a redirection. This option is meaningful only when using --location. a redirection. This option is meaningful only when using --location.

4
docs/libcurl/curl_easy_init.3
View File

@ -5,7 +5,7 @@
.\" * | (__| |_| | _ <| |___ .\" * | (__| |_| | _ <| |___
.\" * \___|\___/|_| \_\_____| .\" * \___|\___/|_| \_\_____|
.\" * .\" *
.\" * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. .\" * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
.\" * .\" *
.\" * This software is licensed as described in the file COPYING, which .\" * This software is licensed as described in the file COPYING, which
.\" * you should have received as part of this distribution. The terms .\" * you should have received as part of this distribution. The terms
@ -37,7 +37,7 @@ does it automatically. This may be lethal in multi-threaded cases, since
\fIcurl_global_init(3)\fP is not thread-safe, and it may result in resource \fIcurl_global_init(3)\fP is not thread-safe, and it may result in resource
problems because there is no corresponding cleanup. problems because there is no corresponding cleanup.
You are strongly advised to not allow this automatic behaviour, by calling You are strongly advised to not allow this automatic behavior, by calling
\fIcurl_global_init(3)\fP yourself properly. See the description in \fIcurl_global_init(3)\fP yourself properly. See the description in
\fBlibcurl\fP(3) of global environment requirements for details of how to use \fBlibcurl\fP(3) of global environment requirements for details of how to use
this function. this function.

4
docs/libcurl/curl_getenv.3
View File

@ -5,7 +5,7 @@
.\" * | (__| |_| | _ <| |___ .\" * | (__| |_| | _ <| |___
.\" * \___|\___/|_| \_\_____| .\" * \___|\___/|_| \_\_____|
.\" * .\" *
.\" * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. .\" * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
.\" * .\" *
.\" * This software is licensed as described in the file COPYING, which .\" * This software is licensed as described in the file COPYING, which
.\" * you should have received as part of this distribution. The terms .\" * you should have received as part of this distribution. The terms
@ -29,7 +29,7 @@ curl_getenv - return value for environment name
.ad .ad
.SH DESCRIPTION .SH DESCRIPTION
curl_getenv() is a portable wrapper for the getenv() function, meant to curl_getenv() is a portable wrapper for the getenv() function, meant to
emulate its behaviour and provide an identical interface for all operating emulate its behavior and provide an identical interface for all operating
systems libcurl builds on (including win32). systems libcurl builds on (including win32).
You must \fIcurl_free(3)\fP the returned string when you're done with it. You must \fIcurl_free(3)\fP the returned string when you're done with it.

4
docs/libcurl/curl_multi_setopt.3
View File

@ -5,7 +5,7 @@
.\" * | (__| |_| | _ <| |___ .\" * | (__| |_| | _ <| |___
.\" * \___|\___/|_| \_\_____| .\" * \___|\___/|_| \_\_____|
.\" * .\" *
.\" * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. .\" * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
.\" * .\" *
.\" * This software is licensed as described in the file COPYING, which .\" * This software is licensed as described in the file COPYING, which
.\" * you should have received as part of this distribution. The terms .\" * you should have received as part of this distribution. The terms
@ -29,7 +29,7 @@ CURLMcode curl_multi_setopt(CURLM * multi_handle, CURLMoption option, param);
.SH DESCRIPTION .SH DESCRIPTION
\fIcurl_multi_setopt(3)\fP is used to tell a libcurl multi handle how to \fIcurl_multi_setopt(3)\fP is used to tell a libcurl multi handle how to
behave. By using the appropriate options to \fIcurl_multi_setopt(3)\fP, you behave. By using the appropriate options to \fIcurl_multi_setopt(3)\fP, you
can change libcurl's behaviour when using that multi handle. All options are can change libcurl's behavior when using that multi handle. All options are
set with the \fIoption\fP followed by the parameter \fIparam\fP. That set with the \fIoption\fP followed by the parameter \fIparam\fP. That
parameter can be a \fBlong\fP, a \fBfunction pointer\fP, an \fBobject parameter can be a \fBlong\fP, a \fBfunction pointer\fP, an \fBobject
pointer\fP or a \fBcurl_off_t\fP type, depending on what the specific option pointer\fP or a \fBcurl_off_t\fP type, depending on what the specific option

2
docs/libcurl/opts/CURLOPT_DIRLISTONLY.3
View File

@ -33,7 +33,7 @@ names of files in a directory, rather than performing a full directory listing
that would normally include file sizes, dates etc. that would normally include file sizes, dates etc.
For POP3 a parameter of 1 tells the library to list the email message or For POP3 a parameter of 1 tells the library to list the email message or
messages on the POP3 server. This can be used to change the default behaviour messages on the POP3 server. This can be used to change the default behavior
of libcurl, when combined with a URL that contains a message ID, to perform a of libcurl, when combined with a URL that contains a message ID, to perform a
"scan listing" which can then be used to determine the size of an email. "scan listing" which can then be used to determine the size of an email.

2
docs/libcurl/opts/CURLOPT_MAXCONNECTS.3
View File

@ -32,7 +32,7 @@ Pass a long. The set \fIamount\fP will be the maximum number of simultaneously
open persistent connections that libcurl may cache in the pool associated with open persistent connections that libcurl may cache in the pool associated with
this handle. The default is 5, and there isn't much point in changing this this handle. The default is 5, and there isn't much point in changing this
value unless you are perfectly aware of how this works and changes libcurl's value unless you are perfectly aware of how this works and changes libcurl's
behaviour. This concerns connections using any of the protocols that support behavior. This concerns connections using any of the protocols that support
persistent connections. persistent connections.
When reaching the maximum limit, curl closes the oldest one in the cache to When reaching the maximum limit, curl closes the oldest one in the cache to

2
docs/libcurl/opts/CURLOPT_POSTFIELDS.3
View File

@ -35,7 +35,7 @@ way. For example, the web server may assume that this data is url-encoded.
The data pointed to is NOT copied by the library: as a consequence, it must be The data pointed to is NOT copied by the library: as a consequence, it must be
preserved by the calling application until the associated transfer finishes. preserved by the calling application until the associated transfer finishes.
This behaviour can be changed (so libcurl does copy the data) by setting the This behavior can be changed (so libcurl does copy the data) by setting the
\fICURLOPT_COPYPOSTFIELDS(3)\fP option. \fICURLOPT_COPYPOSTFIELDS(3)\fP option.
This POST is a normal application/x-www-form-urlencoded kind (and libcurl will This POST is a normal application/x-www-form-urlencoded kind (and libcurl will

2
docs/libcurl/opts/CURLOPT_POSTREDIR.3
View File

@ -40,7 +40,7 @@ libcurl maintain the request method after a 302 redirect whilst setting bit 2
after a 303 redirect. The value \fBCURL_REDIR_POST_ALL\fP is a convenience after a 303 redirect. The value \fBCURL_REDIR_POST_ALL\fP is a convenience
define that sets all three bits. define that sets all three bits.
The non-RFC behaviour is ubiquitous in web browsers, so the library does the The non-RFC behavior is ubiquitous in web browsers, so the library does the
conversion by default to maintain consistency. However, a server may require a conversion by default to maintain consistency. However, a server may require a
POST to remain a POST after such a redirection. This option is meaningful only POST to remain a POST after such a redirection. This option is meaningful only
when setting \fICURLOPT_FOLLOWLOCATION(3)\fP. when setting \fICURLOPT_FOLLOWLOCATION(3)\fP.

4
include/curl/curl.h
View File

@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -1615,7 +1615,7 @@ typedef enum {
CURLOPT(CURLOPT_NEW_FILE_PERMS, CURLOPTTYPE_LONG, 159), CURLOPT(CURLOPT_NEW_FILE_PERMS, CURLOPTTYPE_LONG, 159),
CURLOPT(CURLOPT_NEW_DIRECTORY_PERMS, CURLOPTTYPE_LONG, 160), CURLOPT(CURLOPT_NEW_DIRECTORY_PERMS, CURLOPTTYPE_LONG, 160),
/* Set the behaviour of POST when redirecting. Values must be set to one /* Set the behavior of POST when redirecting. Values must be set to one
of CURL_REDIR* defines below. This used to be called CURLOPT_POST301 */ of CURL_REDIR* defines below. This used to be called CURLOPT_POST301 */
CURLOPT(CURLOPT_POSTREDIR, CURLOPTTYPE_VALUES, 161), CURLOPT(CURLOPT_POSTREDIR, CURLOPTTYPE_VALUES, 161),

4
lib/doh.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 2018 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 2018 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -468,7 +468,7 @@ static unsigned int get32bit(const unsigned char *doh, int index)
the pointer first. */ the pointer first. */
doh += index; doh += index;
/* avoid undefined behaviour by casting to unsigned before shifting /* avoid undefined behavior by casting to unsigned before shifting
24 bits, possibly into the sign bit. codegen is same, but 24 bits, possibly into the sign bit. codegen is same, but
ub sanitizer won't be upset */ ub sanitizer won't be upset */
return ( (unsigned)doh[0] << 24) | (doh[1] << 16) |(doh[2] << 8) | doh[3]; return ( (unsigned)doh[0] << 24) | (doh[1] << 16) |(doh[2] << 8) | doh[3];

4
lib/hostip.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -728,7 +728,7 @@ enum resolve_t Curl_resolv_timeout(struct connectdata *conn,
keep_copysig = TRUE; /* yes, we have a copy */ keep_copysig = TRUE; /* yes, we have a copy */
sigact.sa_handler = alarmfunc; sigact.sa_handler = alarmfunc;
#ifdef SA_RESTART #ifdef SA_RESTART
/* HPUX doesn't have SA_RESTART but defaults to that behaviour! */ /* HPUX doesn't have SA_RESTART but defaults to that behavior! */
sigact.sa_flags &= ~SA_RESTART; sigact.sa_flags &= ~SA_RESTART;
#endif #endif
/* now set the new struct */ /* now set the new struct */

4
lib/setopt.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -602,7 +602,7 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option, va_list param)
case CURLOPT_POSTREDIR: case CURLOPT_POSTREDIR:
/* /*
* Set the behaviour of POST when redirecting * Set the behavior of POST when redirecting
* CURL_REDIR_GET_ALL - POST is changed to GET after 301 and 302 * CURL_REDIR_GET_ALL - POST is changed to GET after 301 and 302
* CURL_REDIR_POST_301 - POST is kept as POST after 301 * CURL_REDIR_POST_301 - POST is kept as POST after 301
* CURL_REDIR_POST_302 - POST is kept as POST after 302 * CURL_REDIR_POST_302 - POST is kept as POST after 302

4
lib/telnet.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -214,7 +214,7 @@ CURLcode init_telnet(struct connectdata *conn)
tn->him_preferred[CURL_TELOPT_SGA] = CURL_YES; tn->him_preferred[CURL_TELOPT_SGA] = CURL_YES;
/* To be compliant with previous releases of libcurl /* To be compliant with previous releases of libcurl
we enable this option by default. This behaviour we enable this option by default. This behavior
can be changed thanks to the "BINARY" option in can be changed thanks to the "BINARY" option in
CURLOPT_TELNETOPTIONS CURLOPT_TELNETOPTIONS
*/ */

6
lib/transfer.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -1650,7 +1650,7 @@ CURLcode Curl_follow(struct Curl_easy *data,
* request with an error page. To be sure that libcurl gets the page that * request with an error page. To be sure that libcurl gets the page that
* most user agents would get, libcurl has to force GET. * most user agents would get, libcurl has to force GET.
* *
* This behaviour is forbidden by RFC1945 and the obsolete RFC2616, and * This behavior is forbidden by RFC1945 and the obsolete RFC2616, and
* can be overridden with CURLOPT_POSTREDIR. * can be overridden with CURLOPT_POSTREDIR.
*/ */
if((data->state.httpreq == HTTPREQ_POST if((data->state.httpreq == HTTPREQ_POST
@ -1675,7 +1675,7 @@ CURLcode Curl_follow(struct Curl_easy *data,
* request with an error page. To be sure that libcurl gets the page that * request with an error page. To be sure that libcurl gets the page that
* most user agents would get, libcurl has to force GET. * most user agents would get, libcurl has to force GET.
* *
* This behaviour is forbidden by RFC1945 and the obsolete RFC2616, and * This behavior is forbidden by RFC1945 and the obsolete RFC2616, and
* can be overridden with CURLOPT_POSTREDIR. * can be overridden with CURLOPT_POSTREDIR.
*/ */
if((data->state.httpreq == HTTPREQ_POST if((data->state.httpreq == HTTPREQ_POST

4
lib/url.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -2171,7 +2171,7 @@ static bool check_noproxy(const char *name, const char *no_proxy)
/* Look for the end of the token. */ /* Look for the end of the token. */
; ;
/* To match previous behaviour, where it was necessary to specify /* To match previous behavior, where it was necessary to specify
* ".local.com" to prevent matching "notlocal.com", we will leave * ".local.com" to prevent matching "notlocal.com", we will leave
* the '.' off. * the '.' off.
*/ */

4
lib/vssh/libssh.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 2017 - 2020 Red Hat, Inc. * Copyright (C) 2017 - 2021 Red Hat, Inc.
* *
* Authors: Nikos Mavrogiannopoulos, Tomas Mraz, Stanislav Zidek, * Authors: Nikos Mavrogiannopoulos, Tomas Mraz, Stanislav Zidek,
* Robert Kolcun, Andreas Schneider * Robert Kolcun, Andreas Schneider
@ -1228,7 +1228,7 @@ static CURLcode myssh_statemach_act(struct connectdata *conn, bool *block)
/* If we have restart position then open for append */ /* If we have restart position then open for append */
flags = O_WRONLY|O_APPEND; flags = O_WRONLY|O_APPEND;
else else
/* Clear file before writing (normal behaviour) */ /* Clear file before writing (normal behavior) */
flags = O_WRONLY|O_CREAT|O_TRUNC; flags = O_WRONLY|O_CREAT|O_TRUNC;
if(sshc->sftp_file) if(sshc->sftp_file)

4
lib/vssh/libssh2.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -1894,7 +1894,7 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
/* If we have restart position then open for append */ /* If we have restart position then open for append */
flags = LIBSSH2_FXF_WRITE|LIBSSH2_FXF_APPEND; flags = LIBSSH2_FXF_WRITE|LIBSSH2_FXF_APPEND;
else else
/* Clear file before writing (normal behaviour) */ /* Clear file before writing (normal behavior) */
flags = LIBSSH2_FXF_WRITE|LIBSSH2_FXF_CREAT|LIBSSH2_FXF_TRUNC; flags = LIBSSH2_FXF_WRITE|LIBSSH2_FXF_CREAT|LIBSSH2_FXF_TRUNC;
sshc->sftp_handle = sshc->sftp_handle =

4
lib/vssh/wolfssh.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 2019 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 2019 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -583,7 +583,7 @@ static CURLcode wssh_statemach_act(struct connectdata *conn, bool *block)
/* If we have restart position then open for append */ /* If we have restart position then open for append */
flags = WOLFSSH_FXF_WRITE|WOLFSSH_FXF_APPEND; flags = WOLFSSH_FXF_WRITE|WOLFSSH_FXF_APPEND;
else else
/* Clear file before writing (normal behaviour) */ /* Clear file before writing (normal behavior) */
flags = WOLFSSH_FXF_WRITE|WOLFSSH_FXF_CREAT|WOLFSSH_FXF_TRUNC; flags = WOLFSSH_FXF_WRITE|WOLFSSH_FXF_CREAT|WOLFSSH_FXF_TRUNC;
memset(&createattrs, 0, sizeof(createattrs)); memset(&createattrs, 0, sizeof(createattrs));

9
scripts/copyright.pl
View File

@ -6,7 +6,7 @@
# | (__| |_| | _ <| |___ # | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____| # \___|\___/|_| \_\_____|
# #
# Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. # Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
# #
# This software is licensed as described in the file COPYING, which # This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms # you should have received as part of this distribution. The terms
@ -118,7 +118,7 @@ sub checkfile {
my $found = scanfile($file); my $found = scanfile($file);
if(!$found) { if(!$found) {
print "$file: missing copyright range\n"; print "$file:1: missing copyright range\n";
return 2; return 2;
} }
@ -140,8 +140,9 @@ sub checkfile {
if(defined($commityear) && scalar(@copyright) && if(defined($commityear) && scalar(@copyright) &&
$copyright[0]{year} != $commityear) { $copyright[0]{year} != $commityear) {
print "$file: copyright year out of date, should be $commityear, " . printf "$file:%d: copyright year out of date, should be $commityear, " .
"is $copyright[0]{year}\n"; "is $copyright[0]{year}\n",
$copyright[0]{line};
} }
else { else {
$fine = 1; $fine = 1;

4
src/tool_getparam.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -1990,7 +1990,7 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
/* This makes the FTP sessions use PORT instead of PASV */ /* This makes the FTP sessions use PORT instead of PASV */
/* use <eth0> or <192.168.10.10> style addresses. Anything except /* use <eth0> or <192.168.10.10> style addresses. Anything except
this will make us try to get the "default" address. this will make us try to get the "default" address.
NOTE: this is a changed behaviour since the released 4.1! NOTE: this is a changed behavior since the released 4.1!
*/ */
GetStr(&config->ftpport, nextarg); GetStr(&config->ftpport, nextarg);
break; break;

4
src/tool_operate.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -1276,7 +1276,7 @@ static CURLcode single_transfer(struct GlobalConfig *global,
* lib/telnet.c will Curl_poll() on the input file descriptor * lib/telnet.c will Curl_poll() on the input file descriptor
* rather then calling the READFUNCTION at regular intervals. * rather then calling the READFUNCTION at regular intervals.
* The circumstances in which it is preferable to enable this * The circumstances in which it is preferable to enable this
* behaviour, by omitting to set the READFUNCTION & READDATA options, * behavior, by omitting to set the READFUNCTION & READDATA options,
* have not been determined. * have not been determined.
*/ */
my_setopt(curl, CURLOPT_READDATA, input); my_setopt(curl, CURLOPT_READDATA, input);

2
tests/FILEFORMAT.md
View File

@ -200,7 +200,7 @@ part number and will then increase the part number with one. This is useful
for auth tests and similar. for auth tests and similar.
`sendzero=yes` means that the (FTP) server will "send" the data even if the `sendzero=yes` means that the (FTP) server will "send" the data even if the
size is zero bytes. Used to verify curl's behaviour on zero bytes transfers. size is zero bytes. Used to verify curl's behavior on zero bytes transfers.
`base64=yes` means that the data provided in the test-file is a chunk of data `base64=yes` means that the data provided in the test-file is a chunk of data
encoded with base64. It is the only way a test case can contain binary encoded with base64. It is the only way a test case can contain binary

2
tests/README.md
View File

@ -109,7 +109,7 @@
output text messages or escape sequences on user login. When these shell output text messages or escape sequences on user login. When these shell
startup messages or escape sequences are output they might corrupt the startup messages or escape sequences are output they might corrupt the
expected stream of data which flows to the sftp-server or from the ssh expected stream of data which flows to the sftp-server or from the ssh
client which can result in bad test behaviour or even prevent the test client which can result in bad test behavior or even prevent the test
server from running. server from running.
If the test suite ssh or sftp server fails to start up and logs the message If the test suite ssh or sftp server fails to start up and logs the message

4
tests/libtest/first.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -146,7 +146,7 @@ int main(int argc, char **argv)
/* /*
* Setup proper locale from environment. This is needed to enable locale- * Setup proper locale from environment. This is needed to enable locale-
* specific behaviour by the C library in order to test for undesired side * specific behavior by the C library in order to test for undesired side
* effects that could cause in libcurl. * effects that could cause in libcurl.
*/ */
#ifdef HAVE_SETLOCALE #ifdef HAVE_SETLOCALE

4
tests/runtests.pl
View File

@ -6,7 +6,7 @@
# | (__| |_| | _ <| |___ # | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____| # \___|\___/|_| \_\_____|
# #
# Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. # Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
# #
# This software is licensed as described in the file COPYING, which # This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms # you should have received as part of this distribution. The terms
@ -407,7 +407,7 @@ foreach $protocol (('ftp', 'http', 'ftps', 'https', 'no', 'all')) {
} }
# make sure we don't get affected by other variables that control our # make sure we don't get affected by other variables that control our
# behaviour # behavior
delete $ENV{'SSL_CERT_DIR'} if($ENV{'SSL_CERT_DIR'}); delete $ENV{'SSL_CERT_DIR'} if($ENV{'SSL_CERT_DIR'});
delete $ENV{'SSL_CERT_PATH'} if($ENV{'SSL_CERT_PATH'}); delete $ENV{'SSL_CERT_PATH'} if($ENV{'SSL_CERT_PATH'});