diff options
92 files changed, 165 insertions, 165 deletions
diff --git a/CMake/FindGSS.cmake b/CMake/FindGSS.cmake index dfaeaf307..60dcb73c9 100644 --- a/CMake/FindGSS.cmake +++ b/CMake/FindGSS.cmake @@ -12,7 +12,7 @@ # GSS_LINKER_FLAGS - Additional linker flags # GSS_COMPILER_FLAGS - Additional compiler flags # GSS_VERSION - This is set to version advertised by pkg-config or read from manifest. -# In case the library is found but no version info availabe it'll be set to "unknown" +# In case the library is found but no version info available it'll be set to "unknown" set(_MIT_MODNAME mit-krb5-gssapi) set(_HEIMDAL_MODNAME heimdal-gssapi) diff --git a/Makefile.am b/Makefile.am index fcc5606b0..44a793188 100644 --- a/Makefile.am +++ b/Makefile.am @@ -253,7 +253,7 @@ rpm: # pkgadd -d ./HAXXcurl-* # -# gak - libtool requires an absoulte directory, hence the pwd below... +# gak - libtool requires an absolute directory, hence the pwd below... pkgadd: umask 022 ; \ make install DESTDIR=`/bin/pwd`/packages/Solaris/root ; \ diff --git a/docs/examples/Makefile.netware b/docs/examples/Makefile.netware index 9fe9db453..e75d143d5 100644 --- a/docs/examples/Makefile.netware +++ b/docs/examples/Makefile.netware @@ -64,7 +64,7 @@ DESCR = curl ($(LIBARCH)) MTSAFE = YES STACK = 8192 SCREEN = Example Program -# Comment the line below if you dont want to load protected automatically. +# Comment the line below if you don't want to load protected automatically. # LDRING = 3 # Uncomment the next line to enable linking with POSIX semantics. @@ -136,7 +136,7 @@ endif CFLAGS += -align 4 else # PRELUDE = $(NDK_CLIB)/imports/clibpre.o - # to avoid the __init_* / __deinit_* whoes dont use prelude from NDK + # to avoid the __init_* / __deinit_* whoes don't use prelude from NDK PRELUDE = "$(MWCW_PATH)/libraries/runtime/prelude.obj" # CFLAGS += -include "$(MWCW_PATH)/headers/nlm_clib_prefix.h" CFLAGS += -align 1 @@ -159,7 +159,7 @@ else endif else # PRELUDE = $(NDK_CLIB)/imports/clibpre.gcc.o - # to avoid the __init_* / __deinit_* whoes dont use prelude from NDK + # to avoid the __init_* / __deinit_* whoes don't use prelude from NDK # http://www.gknw.net/development/mk_nlm/gcc_pre.zip PRELUDE = $(NDK_ROOT)/pre/prelude.o CFLAGS += -include $(NDKBASE)/nlmconv/genlm.h diff --git a/docs/examples/cacertinmem.c b/docs/examples/cacertinmem.c index ace58e48e..e3c49e02c 100644 --- a/docs/examples/cacertinmem.c +++ b/docs/examples/cacertinmem.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -133,7 +133,7 @@ int main(void) printf("*** transfer failed ***\n"); /* second try: retrieve page using cacerts' certificate -> will succeed - * load the certificate by installing a function doing the nescessary + * load the certificate by installing a function doing the necessary * "modifications" to the SSL CONTEXT just before link init */ rv=curl_easy_setopt(ch, CURLOPT_SSL_CTX_FUNCTION, *sslctx_function); diff --git a/docs/examples/curlx.c b/docs/examples/curlx.c index cd1677af3..db0ed24d9 100644 --- a/docs/examples/curlx.c +++ b/docs/examples/curlx.c @@ -101,7 +101,7 @@ static const char *curlx_usage[]={ "usage: curlx args\n", " -p12 arg - tia file ", - " -envpass arg - environement variable which content the tia private" + " -envpass arg - environment variable which content the tia private" " key password", " -out arg - output file (response)- default stdout", " -in arg - input file (request)- default stdin", diff --git a/docs/examples/externalsocket.c b/docs/examples/externalsocket.c index 918f08218..80e6598fa 100644 --- a/docs/examples/externalsocket.c +++ b/docs/examples/externalsocket.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -38,7 +38,7 @@ #include <sys/types.h> /* socket types */ #include <sys/socket.h> /* socket definitions */ #include <netinet/in.h> -#include <arpa/inet.h> /* inet (3) funtions */ +#include <arpa/inet.h> /* inet (3) functions */ #include <unistd.h> /* misc. Unix functions */ #endif diff --git a/docs/examples/fopen.c b/docs/examples/fopen.c index 7435264a7..1822b3a09 100644 --- a/docs/examples/fopen.c +++ b/docs/examples/fopen.c @@ -10,7 +10,7 @@ * instead of (only) local files. Local files (ie those that can be directly * fopened) will drop back to using the underlying clib implementations * - * See the main() function at the bottom that shows an app that retrives from a + * See the main() function at the bottom that shows an app that retrieves from a * specified url using fgets() and fread() and saves as two output files. * * Copyright (c) 2003 Simtec Electronics @@ -345,7 +345,7 @@ size_t url_fread(void *ptr, size_t size, size_t nmemb, URL_FILE *file) fill_buffer(file, want); - /* check if theres data in the buffer - if not fill_buffer() + /* check if there's data in the buffer - if not fill_buffer() * either errored or EOF */ if(!file->buffer_pos) return 0; @@ -384,7 +384,7 @@ char *url_fgets(char *ptr, size_t size, URL_FILE *file) case CFTYPE_CURL: fill_buffer(file, want); - /* check if theres data in the buffer - if not fill either errored or + /* check if there's data in the buffer - if not fill either errored or * EOF */ if(!file->buffer_pos) return NULL; @@ -404,7 +404,7 @@ char *url_fgets(char *ptr, size_t size, URL_FILE *file) /* xfer data to caller */ memcpy(ptr, file->buffer, want); - ptr[want]=0;/* allways null terminate */ + ptr[want]=0;/* always null terminate */ use_buffer(file, want); @@ -450,7 +450,7 @@ void url_rewind(URL_FILE *file) #define FREADFILE "fread.test" #define REWINDFILE "rewind.test" -/* Small main program to retrive from a url using fgets and fread saving the +/* Small main program to retrieve from a url using fgets and fread saving the * output to two test files (note the fgets method will corrupt binary files if * they contain 0 chars */ int main(int argc, char *argv[]) diff --git a/docs/examples/imap-copy.c b/docs/examples/imap-copy.c index 4c3b640b9..1ef43f893 100644 --- a/docs/examples/imap-copy.c +++ b/docs/examples/imap-copy.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -48,7 +48,7 @@ int main(void) /* This is source mailbox folder to select */ curl_easy_setopt(curl, CURLOPT_URL, "imap://imap.example.com/INBOX"); - /* Set the COPY command specifing the message ID and destination folder */ + /* Set the COPY command specifying the message ID and destination folder */ curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "COPY 1 FOLDER"); /* Note that to perform a move operation you will need to perform the copy, diff --git a/docs/examples/imap-create.c b/docs/examples/imap-create.c index 8f72cb8fe..6f04453b2 100644 --- a/docs/examples/imap-create.c +++ b/docs/examples/imap-create.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -48,7 +48,7 @@ int main(void) /* This is just the server URL */ curl_easy_setopt(curl, CURLOPT_URL, "imap://imap.example.com"); - /* Set the CREATE command specifing the new folder name */ + /* Set the CREATE command specifying the new folder name */ curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "CREATE FOLDER"); /* Perform the custom request */ diff --git a/docs/examples/imap-delete.c b/docs/examples/imap-delete.c index bd9d1a490..cf1ae0bbf 100644 --- a/docs/examples/imap-delete.c +++ b/docs/examples/imap-delete.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -48,7 +48,7 @@ int main(void) /* This is just the server URL */ curl_easy_setopt(curl, CURLOPT_URL, "imap://imap.example.com"); - /* Set the DELETE command specifing the existing folder */ + /* Set the DELETE command specifying the existing folder */ curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "DELETE FOLDER"); /* Perform the custom request */ diff --git a/docs/examples/imap-examine.c b/docs/examples/imap-examine.c index 4287f8a10..b89e9dc6d 100644 --- a/docs/examples/imap-examine.c +++ b/docs/examples/imap-examine.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -48,7 +48,7 @@ int main(void) /* This is just the server URL */ curl_easy_setopt(curl, CURLOPT_URL, "imap://imap.example.com"); - /* Set the EXAMINE command specifing the mailbox folder */ + /* Set the EXAMINE command specifying the mailbox folder */ curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "EXAMINE OUTBOX"); /* Perform the custom request */ diff --git a/docs/examples/imap-search.c b/docs/examples/imap-search.c index f1261e1ec..427dcc905 100644 --- a/docs/examples/imap-search.c +++ b/docs/examples/imap-search.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -48,7 +48,7 @@ int main(void) /* This is mailbox folder to select */ curl_easy_setopt(curl, CURLOPT_URL, "imap://imap.example.com/INBOX"); - /* Set the SEARCH command specifing what we want to search for. Note that + /* Set the SEARCH command specifying what we want to search for. Note that * this can contain a message sequence set and a number of search criteria * keywords including flags such as ANSWERED, DELETED, DRAFT, FLAGGED, NEW, * RECENT and SEEN. For more information about the search criteria please diff --git a/docs/examples/pop3-top.c b/docs/examples/pop3-top.c index f452b4127..4f5937fd4 100644 --- a/docs/examples/pop3-top.c +++ b/docs/examples/pop3-top.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -21,7 +21,7 @@ ***************************************************************************/ /* <DESC> - * POP3 example showing how to retreive only the headers of an e-mail + * POP3 example showing how to retrieve only the headers of an e-mail * </DESC> */ diff --git a/docs/libcurl/opts/CURLOPT_SSL_CTX_FUNCTION.3 b/docs/libcurl/opts/CURLOPT_SSL_CTX_FUNCTION.3 index 2f71495b7..6a6c57f35 100644 --- a/docs/libcurl/opts/CURLOPT_SSL_CTX_FUNCTION.3 +++ b/docs/libcurl/opts/CURLOPT_SSL_CTX_FUNCTION.3 @@ -5,7 +5,7 @@ .\" * | (__| |_| | _ <| |___ .\" * \___|\___/|_| \_\_____| .\" * -.\" * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. +.\" * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. .\" * .\" * This software is licensed as described in the file COPYING, which .\" * you should have received as part of this distribution. The terms @@ -120,7 +120,7 @@ int main(void) rv=curl_easy_setopt(ch, CURLOPT_URL, "https://www.example.com/"); /* Retrieve page using cacerts' certificate -> will succeed - * load the certificate by installing a function doing the nescessary + * load the certificate by installing a function doing the necessary * "modifications" to the SSL CONTEXT just before link init */ rv=curl_easy_setopt(ch, CURLOPT_SSL_CTX_FUNCTION, *sslctx_function); diff --git a/include/curl/curl.h b/include/curl/curl.h index 7c7d28d6a..421152259 100644 --- a/include/curl/curl.h +++ b/include/curl/curl.h @@ -1600,7 +1600,7 @@ typedef enum { CINIT(DNS_SERVERS, STRINGPOINT, 211), /* Time-out accept operations (currently for FTP only) after this amount - of miliseconds. */ + of milliseconds. */ CINIT(ACCEPTTIMEOUT_MS, LONG, 212), /* Set TCP keepalive */ @@ -2461,7 +2461,7 @@ typedef struct { #define CURL_VERSION_CURLDEBUG (1<<13) /* Debug memory tracking supported */ #define CURL_VERSION_TLSAUTH_SRP (1<<14) /* TLS-SRP auth is supported */ #define CURL_VERSION_NTLM_WB (1<<15) /* NTLM delegation to winbind helper - is suported */ + is supported */ #define CURL_VERSION_HTTP2 (1<<16) /* HTTP2 support built-in */ #define CURL_VERSION_GSSAPI (1<<17) /* Built against a GSS-API library */ #define CURL_VERSION_KERBEROS5 (1<<18) /* Kerberos V5 auth is supported */ diff --git a/include/curl/multi.h b/include/curl/multi.h index d1e00cc5d..f93e511be 100644 --- a/include/curl/multi.h +++ b/include/curl/multi.h @@ -218,7 +218,7 @@ CURL_EXTERN CURLMcode curl_multi_cleanup(CURLM *multi_handle); * curl_multi_cleanup(). * * The 'CURLMsg' struct is meant to be very simple and only contain - * very basic informations. If more involved information is wanted, + * very basic information. If more involved information is wanted, * we will provide the particular "transfer handle" in that struct * and that should/could/would be used in subsequent * curl_easy_getinfo() calls (or similar). The point being that we diff --git a/lib/Makefile.b32 b/lib/Makefile.b32 index 481386157..5b5b5fa9f 100644 --- a/lib/Makefile.b32 +++ b/lib/Makefile.b32 @@ -109,7 +109,7 @@ LINKLIB = $(LINKLIB) $(OPENSSL_PATH)\out32\ssleay32.lib $(OPENSSL_PATH)\out32\l !include Makefile.inc # Borland's command line librarian program TLIB version 4.5 is not capable -# of building a library when any of its objects contains an hypen in its +# of building a library when any of its objects contains an hyphen in its # name, due to a command line parsing bug. In order to workaround this, we # build source files with hyphens in their name as objects with underscores # using explicit compilation build rules instead of implicit ones. diff --git a/lib/Makefile.netware b/lib/Makefile.netware index f689a36f8..672035c52 100644 --- a/lib/Makefile.netware +++ b/lib/Makefile.netware @@ -166,7 +166,7 @@ endif CFLAGS += -align 4 else # PRELUDE = $(NDK_CLIB)/imports/clibpre.o - # to avoid the __init_* / __deinit_* whoes dont use prelude from NDK + # to avoid the __init_* / __deinit_* whoes don't use prelude from NDK PRELUDE = "$(MWCW_PATH)/libraries/runtime/prelude.obj" # CFLAGS += -include "$(MWCW_PATH)/headers/nlm_clib_prefix.h" CFLAGS += -align 1 @@ -192,7 +192,7 @@ else endif else PRELUDE = $(NDK_CLIB)/imports/clibpre.gcc.o - # to avoid the __init_* / __deinit_* whoes dont use prelude from NDK + # to avoid the __init_* / __deinit_* whoes don't use prelude from NDK # http://www.gknw.net/development/mk_nlm/gcc_pre.zip # PRELUDE = $(NDK_ROOT)/pre/prelude.o CFLAGS += -include $(NDKBASE)/nlmconv/genlm.h diff --git a/lib/config-win32.h b/lib/config-win32.h index af7bb1fb0..4cac859cd 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -493,7 +493,7 @@ #define _CRT_NONSTDC_NO_DEPRECATE 1 #endif -/* VS2005 and later dafault size for time_t is 64-bit, unless +/* VS2005 and later default size for time_t is 64-bit, unless _USE_32BIT_TIME_T has been defined to get a 32-bit time_t. */ #if defined(_MSC_VER) && (_MSC_VER >= 1400) # ifndef _USE_32BIT_TIME_T @@ -514,7 +514,7 @@ # define VS2008_MIN_TARGET 0x0500 /* The minimum build target for VS2012 is Vista unless Update 1 is installed - and the v110_xp toolset is choosen. */ + and the v110_xp toolset is chosen. */ # if defined(_USING_V110_SDK71_) # define VS2012_MIN_TARGET 0x0501 # else @@ -526,7 +526,7 @@ # define VS2008_DEF_TARGET 0x0501 /* VS2012 default build target is Windows Vista unless Update 1 is installed - and the v110_xp toolset is choosen. */ + and the v110_xp toolset is chosen. */ # if defined(_USING_V110_SDK71_) # define VS2012_DEF_TARGET 0x0501 # else diff --git a/lib/config-win32ce.h b/lib/config-win32ce.h index 383948576..eb444c585 100644 --- a/lib/config-win32ce.h +++ b/lib/config-win32ce.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -379,7 +379,7 @@ #define _CRT_NONSTDC_NO_DEPRECATE 1 #endif -/* VS2005 and later dafault size for time_t is 64-bit, unless */ +/* VS2005 and later default size for time_t is 64-bit, unless */ /* _USE_32BIT_TIME_T has been defined to get a 32-bit time_t. */ #if defined(_MSC_VER) && (_MSC_VER >= 1400) # ifndef _USE_32BIT_TIME_T diff --git a/lib/curl_memory.h b/lib/curl_memory.h index 6f792fffd..fccf46879 100644 --- a/lib/curl_memory.h +++ b/lib/curl_memory.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -70,7 +70,7 @@ * * Programs and libraries in 'tests' subdirectories have specific * purposes and needs, and as such each one will use whatever fits - * best, depending additionally wether it links with libcurl or not. + * best, depending additionally whether it links with libcurl or not. * * Caveat emptor. Proper curlx_* separation is a work in progress * the same as CURLX_NO_MEMORY_CALLBACKS usage, some adjustments may @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -1754,7 +1754,7 @@ static CURLcode ftp_state_quote(struct connectdata *conn, /* * This state uses: * 'count1' to iterate over the commands to send - * 'count2' to store wether to allow commands to fail + * 'count2' to store whether to allow commands to fail */ if(init) @@ -2870,7 +2870,7 @@ static CURLcode ftp_statemach_act(struct connectdata *conn) does not start with a '/'), we probably need some server-dependent adjustments. For example, this is the case when connecting to an OS400 FTP server: this server supports two name syntaxes, - the default one being incompatible with standard pathes. In + the default one being incompatible with standard paths. In addition, this server switches automatically to the regular path syntax when one is encountered in a command: this results in having an entrypath in the wrong syntax when later used in CWD. @@ -3552,7 +3552,7 @@ static CURLcode ftp_range(struct connectdata *conn) " to %" CURL_FORMAT_CURL_OFF_T ", totally %" CURL_FORMAT_CURL_OFF_T " bytes\n", from, to, data->req.maxdownload)); - ftpc->dont_check = TRUE; /* dont check for successful transfer */ + ftpc->dont_check = TRUE; /* don't check for successful transfer */ } else data->req.maxdownload = -1; @@ -3621,7 +3621,7 @@ static CURLcode ftp_do_more(struct connectdata *conn, int *completep) if(ftpc->state) { - /* already in a state so skip the intial commands. + /* already in a state so skip the initial commands. They are only done to kickstart the do_more state */ result = ftp_multi_statemach(conn, &complete); diff --git a/lib/hostip.c b/lib/hostip.c index fa4bad982..ed18763fd 100644 --- a/lib/hostip.c +++ b/lib/hostip.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -143,7 +143,7 @@ void Curl_global_host_cache_dtor(void) } /* - * Return # of adresses in a Curl_addrinfo struct + * Return # of addresses in a Curl_addrinfo struct */ int Curl_num_addresses(const Curl_addrinfo *addr) { @@ -573,7 +573,7 @@ int Curl_resolv_timeout(struct connectdata *conn, #ifdef USE_ALARM_TIMEOUT #ifdef HAVE_SIGACTION struct sigaction keep_sigact; /* store the old struct here */ - volatile bool keep_copysig = FALSE; /* wether old sigact has been saved */ + volatile bool keep_copysig = FALSE; /* whether old sigact has been saved */ struct sigaction sigact; #else #ifdef HAVE_SIGNAL diff --git a/lib/hostip.h b/lib/hostip.h index 1dc4079fe..298eeeee3 100644 --- a/lib/hostip.h +++ b/lib/hostip.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -130,7 +130,7 @@ int Curl_mk_dnscache(struct curl_hash *hash); /* prune old entries from the DNS cache */ void Curl_hostcache_prune(struct Curl_easy *data); -/* Return # of adresses in a Curl_addrinfo struct */ +/* Return # of addresses in a Curl_addrinfo struct */ int Curl_num_addresses(const Curl_addrinfo *addr); #if defined(CURLDEBUG) && defined(HAVE_GETNAMEINFO) diff --git a/lib/http.c b/lib/http.c index 935591f91..961c80080 100644 --- a/lib/http.c +++ b/lib/http.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -3313,7 +3313,7 @@ CURLcode Curl_http_readwrite_headers(struct Curl_easy *data, /* * https://tools.ietf.org/html/rfc7230#section-3.1.2 * - * The reponse code is always a three-digit number in HTTP as the spec + * The response code is always a three-digit number in HTTP as the spec * says. We try to allow any number here, but we cannot make * guarantees on future behaviors since it isn't within the protocol. */ diff --git a/lib/imap.c b/lib/imap.c index 44d350be2..b528f77d9 100644 --- a/lib/imap.c +++ b/lib/imap.c @@ -1749,7 +1749,7 @@ static CURLcode imap_setup_connection(struct connectdata *conn) * * imap_sendf() * - * Sends the formated string as an IMAP command to the server. + * Sends the formatted string as an IMAP command to the server. * * Designed to never block. */ diff --git a/lib/memdebug.c b/lib/memdebug.c index 15e866161..32d2adfb5 100644 --- a/lib/memdebug.c +++ b/lib/memdebug.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -458,7 +458,7 @@ int curl_fclose(FILE *file, int line, const char *source) #define LOGLINE_BUFSIZE 1024 -/* this does the writting to the memory tracking log file */ +/* this does the writing to the memory tracking log file */ void curl_memlog(const char *format, ...) { char *buf; diff --git a/lib/objnames.inc b/lib/objnames.inc index b895528af..6a5b2a837 100644 --- a/lib/objnames.inc +++ b/lib/objnames.inc @@ -5,7 +5,7 @@ # * | (__| |_| | _ <| |___ # * \___|\___/|_| \_\_____| # * -# * Copyright (C) 2012, Daniel Stenberg, <daniel@haxx.se>, et al. +# * Copyright (C) 2012 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. # * # * This software is licensed as described in the file COPYING, which # * you should have received as part of this distribution. The terms @@ -36,7 +36,7 @@ # file name that may be longer than 10 characters, or not, into a string # with at most 10 characters which may be used as an OS/400 object name. # -# This function might not be universally usefull, nor we care about it. +# This function might not be universally useful, nor we care about it. # # It is intended to be used with libcurl's (*.c) source file names, so # dependency on libcurl's source file naming scheme is acceptable and diff --git a/lib/pingpong.c b/lib/pingpong.c index 7a9935727..b833fcd4c 100644 --- a/lib/pingpong.c +++ b/lib/pingpong.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -152,7 +152,7 @@ void Curl_pp_init(struct pingpong *pp) * * Curl_pp_vsendf() * - * Send the formated string as a command to a pingpong server. Note that + * Send the formatted string as a command to a pingpong server. Note that * the string should not have any CRLF appended, as this function will * append the necessary things itself. * @@ -239,7 +239,7 @@ CURLcode Curl_pp_vsendf(struct pingpong *pp, * * Curl_pp_sendf() * - * Send the formated string as a command to a pingpong server. Note that + * Send the formatted string as a command to a pingpong server. Note that * the string should not have any CRLF appended, as this function will * append the necessary things itself. * diff --git a/lib/pingpong.h b/lib/pingpong.h index 500100ae4..ee1a59b51 100644 --- a/lib/pingpong.h +++ b/lib/pingpong.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -95,7 +95,7 @@ time_t Curl_pp_state_timeout(struct pingpong *pp); * * Curl_pp_sendf() * - * Send the formated string as a command to a pingpong server. Note that + * Send the formatted string as a command to a pingpong server. Note that * the string should not have any CRLF appended, as this function will * append the necessary things itself. * @@ -108,7 +108,7 @@ CURLcode Curl_pp_sendf(struct pingpong *pp, * * Curl_pp_vsendf() * - * Send the formated string as a command to a pingpong server. Note that + * Send the formatted string as a command to a pingpong server. Note that * the string should not have any CRLF appended, as this function will * append the necessary things itself. * diff --git a/lib/progress.c b/lib/progress.c index b5ea47aca..cfaf4049e 100644 --- a/lib/progress.c +++ b/lib/progress.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -229,16 +229,16 @@ void Curl_pgrsStartNow(struct Curl_easy *data) * need to wait until we're back under the speed limit, if needed. * * The way it works is by having a "starting point" (time & amount of data - * transfered by then) used in the speed computation, to be used instead of the - * start of the transfer. - * This starting point is regularly moved as transfer goes on, to keep getting - * accurate values (instead of average over the entire tranfer). + * transferred by then) used in the speed computation, to be used instead of + * the start of the transfer. This starting point is regularly moved as + * transfer goes on, to keep getting accurate values (instead of average over + * the entire transfer). * - * This function takes the current amount of data transfered, the amount at the - * starting point, the limit (in bytes/s), the time of the starting point and - * the current time. + * This function takes the current amount of data transferred, the amount at + * the starting point, the limit (in bytes/s), the time of the starting point + * and the current time. * - * Returns -1 if no waiting is needed (not enough data transfered since + * Returns -1 if no waiting is needed (not enough data transferred since * starting point yet), 0 when no waiting is needed but the starting point * should be reset (to current), or the number of milliseconds to wait to get * back under the speed limit. diff --git a/lib/rand.c b/lib/rand.c index 4da37b9dc..8a1408425 100644 --- a/lib/rand.c +++ b/lib/rand.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -63,7 +63,7 @@ static CURLcode randit(struct Curl_easy *data, unsigned int *rnd) /* data may be NULL! */ result = Curl_ssl_random(data, (unsigned char *)rnd, sizeof(*rnd)); if(result != CURLE_NOT_BUILT_IN) - /* only if there is no random funtion in the TLS backend do the non crypto + /* only if there is no random function in the TLS backend do the non crypto version, otherwise return result */ return result; diff --git a/lib/rtsp.c b/lib/rtsp.c index e091a0db2..1810cdafb 100644 --- a/lib/rtsp.c +++ b/lib/rtsp.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -793,7 +793,7 @@ CURLcode Curl_rtsp_parseheader(struct connectdata *conn, /* If the Session ID is not set, and we find it in a response, then set * it. * - * Allow any non whitespace content, up to the field seperator or end of + * Allow any non whitespace content, up to the field separator or end of * line. RFC 2326 isn't 100% clear on the session ID and for example * gstreamer does url-encoded session ID's not covered by the standard. */ diff --git a/lib/select.c b/lib/select.c index 03af645ee..14dc6e134 100644 --- a/lib/select.c +++ b/lib/select.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -129,7 +129,7 @@ int Curl_wait_ms(int timeout_ms) * and a file descriptor is too large for FD_SETSIZE. * * A negative timeout value makes this function wait indefinitely, - * unles no valid file descriptor is given, when this happens the + * unless no valid file descriptor is given, when this happens the * negative timeout is ignored and the function times out immediately. * * Return values: @@ -380,7 +380,7 @@ int Curl_socket_check(curl_socket_t readfd0, /* two sockets to read from */ * select() is used instead. An error is returned if select() is * being used and a file descriptor is too large for FD_SETSIZE. * A negative timeout value makes this function wait indefinitely, - * unles no valid file descriptor is given, when this happens the + * unless no valid file descriptor is given, when this happens the * negative timeout is ignored and the function times out immediately. * * Return values: diff --git a/lib/sendf.c b/lib/sendf.c index 9435a30e6..e03241f0d 100644 --- a/lib/sendf.c +++ b/lib/sendf.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -262,7 +262,7 @@ void Curl_failf(struct Curl_easy *data, const char *fmt, ...) va_end(ap); } -/* Curl_sendf() sends formated data to the server */ +/* Curl_sendf() sends formatted data to the server */ CURLcode Curl_sendf(curl_socket_t sockfd, struct connectdata *conn, const char *fmt, ...) { diff --git a/lib/system_win32.c b/lib/system_win32.c index 78737593a..cfbbf3279 100644 --- a/lib/system_win32.c +++ b/lib/system_win32.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2016, Steve Holme, <steve_holme@hotmail.com>. + * Copyright (C) 2016 - 2017, Steve Holme, <steve_holme@hotmail.com>. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -68,7 +68,7 @@ typedef HMODULE (APIENTRY *LOADLIBRARYEX_FN)(LPCTSTR, HANDLE, DWORD); * * majorVersion [in] - The major version number. * minorVersion [in] - The minor version number. - * platform [in] - The optional platform identifer. + * platform [in] - The optional platform identifier. * condition [in] - The test condition used to specifier whether we are * checking a version less then, equal to or greater than * what is specified in the major and minor version diff --git a/lib/transfer.c b/lib/transfer.c index fea76df19..38a049956 100644 --- a/lib/transfer.c +++ b/lib/transfer.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -1795,7 +1795,7 @@ CURLcode Curl_follow(struct Curl_easy *data, break; case 303: /* See Other */ - /* Disable both types of POSTs, unless the user explicitely + /* Disable both types of POSTs, unless the user explicitly asks for POST after POST */ if(data->set.httpreq != HTTPREQ_GET && !(data->set.keep_post & CURL_REDIR_POST_303)) { @@ -4011,7 +4011,7 @@ CURLcode Curl_protocol_connect(struct connectdata *conn, } /* - * Helpers for IDNA convertions. + * Helpers for IDNA conversions. */ static bool is_ASCII_name(const char *hostname) { diff --git a/lib/urldata.h b/lib/urldata.h index 2dd7938e0..3ec7e0f16 100644 --- a/lib/urldata.h +++ b/lib/urldata.h @@ -1314,7 +1314,7 @@ struct UrlState { char *buffer; /* download buffer */ char uploadbuffer[BUFSIZE+1]; /* upload buffer */ - curl_off_t current_speed; /* the ProgressShow() funcion sets this, + curl_off_t current_speed; /* the ProgressShow() function sets this, bytes / second */ bool this_is_a_follow; /* this is a followed Location: request */ diff --git a/lib/vauth/digest.c b/lib/vauth/digest.c index 7d9200ad0..31d25cfa1 100644 --- a/lib/vauth/digest.c +++ b/lib/vauth/digest.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -237,7 +237,7 @@ static CURLcode auth_digest_get_qop_values(const char *options, int *value) * auth_decode_digest_md5_message() * * This is used internally to decode an already encoded DIGEST-MD5 challenge - * message into the seperate attributes. + * message into the separate attributes. * * Parameters: * @@ -366,7 +366,7 @@ CURLcode Curl_auth_create_digest_md5_message(struct Curl_easy *data, char qop[] = DIGEST_QOP_VALUE_STRING_AUTH; char *spn = NULL; - /* Decode the challange message */ + /* Decode the challenge message */ result = auth_decode_digest_md5_message(chlg64, nonce, sizeof(nonce), realm, sizeof(realm), algorithm, sizeof(algorithm), @@ -502,7 +502,7 @@ CURLcode Curl_auth_create_digest_md5_message(struct Curl_easy *data, /* * Curl_auth_decode_digest_http_message() * - * This is used to decode a HTTP DIGEST challenge message into the seperate + * This is used to decode a HTTP DIGEST challenge message into the separate * attributes. * * Parameters: diff --git a/lib/vauth/digest_sspi.c b/lib/vauth/digest_sspi.c index a6eea5ca6..0bd94442d 100644 --- a/lib/vauth/digest_sspi.c +++ b/lib/vauth/digest_sspi.c @@ -6,7 +6,7 @@ * \___|\___/|_| \_\_____| * * Copyright (C) 2014 - 2016, Steve Holme, <steve_holme@hotmail.com>. - * Copyright (C) 2015, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2015 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -320,7 +320,7 @@ CURLcode Curl_override_sspi_http_realm(const char *chlg, /* * Curl_auth_decode_digest_http_message() * - * This is used to decode a HTTP DIGEST challenge message into the seperate + * This is used to decode a HTTP DIGEST challenge message into the separate * attributes. * * Parameters: @@ -550,7 +550,7 @@ CURLcode Curl_auth_create_digest_http_message(struct Curl_easy *data, if(!digest->http_context) return CURLE_OUT_OF_MEMORY; - /* Generate our reponse message */ + /* Generate our response message */ status = s_pSecFn->InitializeSecurityContext(&credentials, NULL, spn, ISC_REQ_USE_HTTP_STYLE, 0, 0, @@ -586,7 +586,7 @@ CURLcode Curl_auth_create_digest_http_message(struct Curl_easy *data, return CURLE_OUT_OF_MEMORY; } - /* Copy the generated reponse */ + /* Copy the generated response */ memcpy(resp, output_token, output_token_len); resp[output_token_len] = 0; diff --git a/lib/vauth/krb5_gssapi.c b/lib/vauth/krb5_gssapi.c index c754fae45..560ecc5bc 100644 --- a/lib/vauth/krb5_gssapi.c +++ b/lib/vauth/krb5_gssapi.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2014 - 2016, Steve Holme, <steve_holme@hotmail.com>. + * Copyright (C) 2014 - 2017, Steve Holme, <steve_holme@hotmail.com>. * Copyright (C) 2015, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which @@ -68,7 +68,7 @@ bool Curl_auth_is_gssapi_supported(void) * passdwp [in] - The user's password. * service [in] - The service type such as http, smtp, pop or imap. * host [in[ - The host name. - * mutual_auth [in] - Flag specifing whether or not mutual authentication + * mutual_auth [in] - Flag specifying whether or not mutual authentication * is enabled. * chlg64 [in] - Pointer to the optional base64 encoded challenge * message. diff --git a/lib/vauth/krb5_sspi.c b/lib/vauth/krb5_sspi.c index 151794e61..1b4cef486 100644 --- a/lib/vauth/krb5_sspi.c +++ b/lib/vauth/krb5_sspi.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2014 - 2016, Steve Holme, <steve_holme@hotmail.com>. + * Copyright (C) 2014 - 2017, Steve Holme, <steve_holme@hotmail.com>. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -74,7 +74,7 @@ bool Curl_auth_is_gssapi_supported(void) * passdwp [in] - The user's password. * service [in] - The service type such as http, smtp, pop or imap. * host [in] - The host name. - * mutual_auth [in] - Flag specifing whether or not mutual authentication + * mutual_auth [in] - Flag specifying whether or not mutual authentication * is enabled. * chlg64 [in] - The optional base64 encoded challenge message. * krb5 [in/out] - The Kerberos 5 data struct being used and modified. diff --git a/lib/vtls/gskit.c b/lib/vtls/gskit.c index d760b6a87..bf75bddc2 100644 --- a/lib/vtls/gskit.c +++ b/lib/vtls/gskit.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -320,7 +320,7 @@ static CURLcode set_ciphers(struct connectdata *conn, /* We allocate GSKit buffers of the same size as the input string: since GSKit tokens are always shorter than their cipher names, allocated buffers - will always be large enough to accomodate the result. */ + will always be large enough to accommodate the result. */ l = strlen(cipherlist) + 1; memset((char *) ciphers, 0, sizeof ciphers); for(i = 0; i < CURL_GSKPROTO_LAST; i++) { diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c index 8eb1e5ab9..67425566d 100644 --- a/lib/vtls/openssl.c +++ b/lib/vtls/openssl.c @@ -1630,7 +1630,7 @@ static void ssl_tls_trace(int direction, int ssl_ver, int content_type, #ifdef HAS_NPN /* - * in is a list of lenght prefixed strings. this function has to select + * in is a list of length prefixed strings. this function has to select * the protocol we want to use from the list and write its string into out. */ diff --git a/m4/curl-override.m4 b/m4/curl-override.m4 index a35d3b2f1..b27cb6111 100644 --- a/m4/curl-override.m4 +++ b/m4/curl-override.m4 @@ -21,7 +21,7 @@ dnl ------------------------------------------------- dnl This is done to prevent compiler warning dnl 'function declaration isn't a prototype' dnl in function main. This requires at least -dnl a c89 compiler and does not suport K&R. +dnl a c89 compiler and does not support K&R. m4_define([AC_LANG_PROGRAM(C)], [$1 diff --git a/m4/xc-lt-iface.m4 b/m4/xc-lt-iface.m4 index 82aaafae6..ec903f575 100644 --- a/m4/xc-lt-iface.m4 +++ b/m4/xc-lt-iface.m4 @@ -112,7 +112,7 @@ esac # of non-PIC compiled objects will fail with following linker error # "relocation R_X86_64_32 can not be used when making a shared object" # is to build PIC objects even for static libraries. This behavior may -# be overriden using 'configure --disable-shared --without-pic'. +# be overridden using 'configure --disable-shared --without-pic'. # if test "x$xc_lt_want_with_pic" = 'xdefault'; then @@ -171,7 +171,7 @@ dnl _XC_CHECK_LT_BUILD_LIBRARIES dnl ------------------------------------------------- dnl Private macro. dnl -dnl Checks wether libtool shared and static libraries +dnl Checks whether libtool shared and static libraries dnl are finally built depending on user input, default dnl behavior and knowledge that libtool has about host dnl characteristics. @@ -306,7 +306,7 @@ dnl _XC_CHECK_LT_BUILD_WITH_PIC dnl ------------------------------------------------- dnl Private macro. dnl -dnl Checks wether libtool shared and static libraries +dnl Checks whether libtool shared and static libraries dnl would be built with PIC depending on user input, dnl default behavior and knowledge that libtool has dnl about host characteristics. @@ -317,7 +317,7 @@ dnl xc_lt_build_static_with_pic m4_define([_XC_CHECK_LT_BUILD_WITH_PIC], [dnl # -# Find out wether libtool libraries would be built wit PIC +# Find out whether libtool libraries would be built wit PIC # case "x$pic_mode" in @%:@ (((( @@ -352,7 +352,7 @@ dnl _XC_CHECK_LT_BUILD_SINGLE_VERSION dnl ------------------------------------------------- dnl Private macro. dnl -dnl Checks wether a libtool shared or static library +dnl Checks whether a libtool shared or static library dnl is finally built exclusively without the other. dnl Results stored in following shell variables: dnl xc_lt_build_shared_only diff --git a/m4/zz50-xc-ovr.m4 b/m4/zz50-xc-ovr.m4 index 7e9ae592e..de0c84310 100644 --- a/m4/zz50-xc-ovr.m4 +++ b/m4/zz50-xc-ovr.m4 @@ -31,7 +31,7 @@ dnl file may override those provided in other files. dnl Override some language related macros dnl ------------------------------------------------- dnl This is done to prevent Libtool 1.5.X from doing -dnl unnecesary C++, Fortran and Java tests when only +dnl unnecessary C++, Fortran and Java tests when only dnl using C language and reduce resulting configure dnl script by nearly 300 Kb. diff --git a/packages/AIX/RPM/curl.spec.in b/packages/AIX/RPM/curl.spec.in index c64a0b759..634fc71a0 100644 --- a/packages/AIX/RPM/curl.spec.in +++ b/packages/AIX/RPM/curl.spec.in @@ -36,7 +36,7 @@ Note: this version is compiled without SSL support. %endif %package devel -Summary: Development files for the curl libary +Summary: Development files for the curl library Group: Development/Libraries %if %{SSL} == 1 Requires: openssl >= 0.9.5 diff --git a/packages/EPM/curl.list.in b/packages/EPM/curl.list.in index 00f05fb1d..3a2028b80 100644 --- a/packages/EPM/curl.list.in +++ b/packages/EPM/curl.list.in @@ -16,7 +16,7 @@ $datarootdir=@datarootdir@ %vendor Daniel Stenberg, <daniel@haxx.se> %license ${srcdir}/MITX.txt %readme ${srcdir}/README -%description Curl is a command line tool for transfering data specified +%description Curl is a command line tool for transferring data specified %description with URL syntax %version @VERSION@ %packager Giuseppe "Cowo" Corbelli <cowo@lugbs.linux.it> diff --git a/packages/OS400/README.OS400 b/packages/OS400/README.OS400 index 92eff4e53..552a3cb77 100644 --- a/packages/OS400/README.OS400 +++ b/packages/OS400/README.OS400 @@ -276,7 +276,7 @@ _ CURL.INC member in file H. This defines everything needed by an ILE/RPG program using libcurl. _ LIBxxx modules and programs. Although the test environment is not supported on OS/400, the libcurl test programs are compiled for manual tests. -_ IFS directory /curl/include/curl containg the C header files for IFS source +_ IFS directory /curl/include/curl containing the C header files for IFS source C/C++ compilation and curl.inc.rpgle for IFS source ILE/RPG compilation. diff --git a/packages/OS400/ccsidcurl.c b/packages/OS400/ccsidcurl.c index c5ac3d35a..de2c9cc01 100644 --- a/packages/OS400/ccsidcurl.c +++ b/packages/OS400/ccsidcurl.c @@ -797,7 +797,7 @@ curl_formadd_ccsid(struct curl_httppost * * httppost, unsigned int contentccsid; unsigned int nameccsid; - /* A single curl_formadd() call cannot be splitted in several calls to deal + /* A single curl_formadd() call cannot be split in several calls to deal with all parameters: the original parameters are thus copied to a local curl_forms array and converted to ASCII when needed. CURLFORM_PTRNAME is processed as if it were CURLFORM_COPYNAME. diff --git a/packages/Symbian/readme.txt b/packages/Symbian/readme.txt index 57b899f91..d6312fbe3 100644 --- a/packages/Symbian/readme.txt +++ b/packages/Symbian/readme.txt @@ -70,7 +70,7 @@ P.I.P.S. causes a USER:87 panic if certain timeouts much longer than half an hour are selected. LDAP, SCP or SFTP methods are not supported due to lack of support for -the dependent libaries on Symbian. +the dependent libraries on Symbian. gzip and deflate decompression is supported when the appropriate macro is uncommented in the libcurl.mmp file. diff --git a/packages/Win32/README b/packages/Win32/README index eb5d0a6a5..b37b57532 100644 --- a/packages/Win32/README +++ b/packages/Win32/README @@ -20,7 +20,7 @@ marker, you'll want to rejoin the pieces to be all on one line in the batch file). Call any of these batch files - after compiling the curl binaries - with a single parameter specifying the name of the archive file to be created. -It is implicitely assumed that all of the binary files (curl.exe, libcurl.a, +It is implicitly assumed that all of the binary files (curl.exe, libcurl.a, etc) have previously been copied to the main directory of the curl source package (the directory where the main README resides), because that is where they should end up in the zip archive. The archive should *not* be built with diff --git a/packages/vms/clean_gnv_curl.com b/packages/vms/clean_gnv_curl.com index 24ecb11e7..ba0173fe0 100644 --- a/packages/vms/clean_gnv_curl.com +++ b/packages/vms/clean_gnv_curl.com @@ -11,7 +11,7 @@ $! $! This should be run with no parameters after the gnv_curl_configure.sh $! script is run. $! -$! Paramter P1: REALCLEAN +$! Parameter P1: REALCLEAN $! This removes all build products and brings the environment back to $! the point where the gnv_curl_configure.sh procedure needs to be run again. $! diff --git a/packages/vms/curl_gnv_build_steps.txt b/packages/vms/curl_gnv_build_steps.txt index 83534c002..3420aae73 100644 --- a/packages/vms/curl_gnv_build_steps.txt +++ b/packages/vms/curl_gnv_build_steps.txt @@ -235,7 +235,7 @@ branding the PCSI kit based on who is making the kit. Since at this time curl does not need this alias procedure, the steps to automatically build it are not included here. - While newer versions of PCSI can support ODS-5 filenames, not all verions + While newer versions of PCSI can support ODS-5 filenames, not all versions of PCSI on systems that have ODS-5 filenames do. So as a post install step, the PCSI kit built by these steps does a rename to the correct case as a post install step. diff --git a/packages/vms/generate_vax_transfer.com b/packages/vms/generate_vax_transfer.com index 115db8a8c..92391f92e 100644 --- a/packages/vms/generate_vax_transfer.com +++ b/packages/vms/generate_vax_transfer.com @@ -219,7 +219,7 @@ $deck ; The first for upper case which matches the tradition method of generating ; VAX transfer vectors. ; -; The second is the exact case for compatibilty with open source C programs +; The second is the exact case for compatibility with open source C programs ; that expect exact case symbols in images. These are separated because a ; previous kit had only upper case symbols. ; diff --git a/packages/vms/readme b/packages/vms/readme index 5f116a554..ddfac747a 100644 --- a/packages/vms/readme +++ b/packages/vms/readme @@ -218,7 +218,7 @@ allow interrupted downloads to be continued. The libcurl file module still does not understand VMS file types and requires -the input files to be in STREAM_LF to work propery. +the input files to be in STREAM_LF to work property. The test suites are not supported as of 7.11.0. diff --git a/src/tool_cb_hdr.c b/src/tool_cb_hdr.c index bedc7b385..5de973470 100644 --- a/src/tool_cb_hdr.c +++ b/src/tool_cb_hdr.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -214,7 +214,7 @@ static char *parse_filename(const char *ptr, size_t len) } #endif /* MSDOS || WIN32 */ - /* in case we built debug enabled, we allow an evironment variable + /* in case we built debug enabled, we allow an environment variable * named CURL_TESTDIR to prefix the given file name to put it into a * specific directory */ diff --git a/tests/certs/Server-localhost-sv.pem b/tests/certs/Server-localhost-sv.pem index 6ef1fd513..a6d9b0350 100644 --- a/tests/certs/Server-localhost-sv.pem +++ b/tests/certs/Server-localhost-sv.pem @@ -21,7 +21,7 @@ commonName_value = localhost [something] # The key -# the certficate +# the certificate # some dhparam -----BEGIN RSA PRIVATE KEY----- MIICXgIBAAKBgQC6X0tpdDGZTfS0typluLcxwTjPNje7XhjjUh9SqlolLwxmiDKw diff --git a/tests/certs/Server-localhost-sv.prm b/tests/certs/Server-localhost-sv.prm index 97e64cec2..50ccfd858 100644 --- a/tests/certs/Server-localhost-sv.prm +++ b/tests/certs/Server-localhost-sv.prm @@ -21,5 +21,5 @@ commonName_value = localhost [something] # The key -# the certficate +# the certificate # some dhparam diff --git a/tests/certs/Server-localhost.nn-sv.pem b/tests/certs/Server-localhost.nn-sv.pem index b3712f74f..7dfd4e6e2 100644 --- a/tests/certs/Server-localhost.nn-sv.pem +++ b/tests/certs/Server-localhost.nn-sv.pem @@ -21,7 +21,7 @@ commonName_value = localhost.nn [something] # The key -# the certficate +# the certificate # some dhparam -----BEGIN RSA PRIVATE KEY----- MIICXQIBAAKBgQCszBFwdCntewBEisBHA1Cdb1G3yXvdfu4pZ1uRm8fF5p1ZPmsz diff --git a/tests/certs/Server-localhost.nn-sv.prm b/tests/certs/Server-localhost.nn-sv.prm index 399e38a4e..093d47561 100644 --- a/tests/certs/Server-localhost.nn-sv.prm +++ b/tests/certs/Server-localhost.nn-sv.prm @@ -21,5 +21,5 @@ commonName_value = localhost.nn [something] # The key -# the certficate +# the certificate # some dhparam diff --git a/tests/certs/scripts/genserv.sh b/tests/certs/scripts/genserv.sh index e7845c5c1..50bac0116 100755 --- a/tests/certs/scripts/genserv.sh +++ b/tests/certs/scripts/genserv.sh @@ -39,7 +39,7 @@ if [ ".$CAPREFIX" = . ] ; then NOTOK=1 else if [ ! -f $CAPREFIX-ca.cacert ] ; then - echo No CA certficate file $CAPREFIX-ca.caert + echo No CA certificate file $CAPREFIX-ca.caert NOTOK=1 fi if [ ! -f $CAPREFIX-ca.key ] ; then diff --git a/tests/data/DISABLED b/tests/data/DISABLED index 6ab4c4376..11d54b463 100644 --- a/tests/data/DISABLED +++ b/tests/data/DISABLED @@ -13,7 +13,7 @@ # test 1801 causes problems on Mac OS X and github # https://github.com/curl/curl/issues/380 1801 -# test 1510 casues problems on the CI on github +# test 1510 causes problems on the CI on github # example: https://travis-ci.org/curl/curl/builds/81633600 1510 # Pipelining test that is causing false positives a little too often diff --git a/tests/data/test1429 b/tests/data/test1429 index da09dca48..ddf52ec42 100644 --- a/tests/data/test1429 +++ b/tests/data/test1429 @@ -31,7 +31,7 @@ http </server> <name> -HTTP GET with 4-digit reponse code +HTTP GET with 4-digit response code </name> <command> http://%HOSTIP:%HTTPPORT/1429 --write-out '%{response_code}' diff --git a/tests/data/test1430 b/tests/data/test1430 index c5f65cfc8..e3c9b1d60 100644 --- a/tests/data/test1430 +++ b/tests/data/test1430 @@ -30,7 +30,7 @@ Funny-head: yesyes http </server> <name> -HTTP GET with negative reponse code +HTTP GET with negative response code </name> <command> http://%HOSTIP:%HTTPPORT/1430 diff --git a/tests/data/test1431 b/tests/data/test1431 index 4ea33edc2..bec3ebbde 100644 --- a/tests/data/test1431 +++ b/tests/data/test1431 @@ -30,7 +30,7 @@ Funny-head: yesyes http </server> <name> -HTTP GET with single-digit reponse code +HTTP GET with single-digit response code </name> <command> http://%HOSTIP:%HTTPPORT/1431 diff --git a/tests/data/test1432 b/tests/data/test1432 index eb1d0c2ad..7f41c65be 100644 --- a/tests/data/test1432 +++ b/tests/data/test1432 @@ -31,7 +31,7 @@ http </server> <name> -HTTP GET with 100-digit reponse code and survive +HTTP GET with 100-digit response code and survive </name> <command> http://%HOSTIP:%HTTPPORT/1432 diff --git a/tests/data/test554 b/tests/data/test554 index fdbd1868b..3419e5e0f 100644 --- a/tests/data/test554 +++ b/tests/data/test554 @@ -61,7 +61,7 @@ http://%HOSTIP:%HTTPPORT/554 s/^--------------------------[a-z0-9]*/------------------------------/ s/boundary=------------------------[a-z0-9]*/boundary=----------------------------/ </strippart> -# Note that the stripping above removes 12 bytes from every occurance of the +# Note that the stripping above removes 12 bytes from every occurrence of the # boundary string and since 5 of them are in the body contents, we see # (5*12) == 60 bytes less <protocol> diff --git a/tests/data/test555 b/tests/data/test555 index 0f3bb07fc..0bccf3bfa 100644 --- a/tests/data/test555 +++ b/tests/data/test555 @@ -1,6 +1,6 @@ <testcase> # NOTE: this test case is a duplicate of 547 but the tool is built to use the -# multi interface instead of easy, but that shouldn't be noticable at all in +# multi interface instead of easy, but that shouldn't be noticeable at all in # this file! <info> <keywords> diff --git a/tests/data/test842 b/tests/data/test842 index b98d5a25e..d5aabbca8 100644 --- a/tests/data/test842 +++ b/tests/data/test842 @@ -40,7 +40,7 @@ IMAP OAuth 2.0 (OAUTHBEARER) authentication <command> 'imap://%HOSTIP:%IMAPPORT/842/;UID=1' -u user --oauth2-bearer mF_9.B5f-4.1JqM </command> -# The protocol section doesn't support ways of specifing the raw data in the +# The protocol section doesn't support ways of specifying the raw data in the # base64 encoded message so we must assert this <precheck> perl -e "print 'Test requires default test server host and port' if ( '%HOSTIP' ne '127.0.0.1' || '%IMAPPORT' ne '9003' );" diff --git a/tests/data/test843 b/tests/data/test843 index 266aaa7c4..a1c31a454 100644 --- a/tests/data/test843 +++ b/tests/data/test843 @@ -41,7 +41,7 @@ IMAP OAuth 2.0 (OAUTHBEARER) authentication with initial response <command> 'imap://%HOSTIP:%IMAPPORT/843/;UID=1' -u user --oauth2-bearer mF_9.B5f-4.1JqM </command> -# The protocol section doesn't support ways of specifing the raw data in the +# The protocol section doesn't support ways of specifying the raw data in the # base64 encoded message so we must assert this <precheck> perl -e "print 'Test requires default test server host and port' if ( '%HOSTIP' ne '127.0.0.1' || '%IMAPPORT' ne '9003' );" diff --git a/tests/data/test844 b/tests/data/test844 index 4acd66726..055a9d2f4 100644 --- a/tests/data/test844 +++ b/tests/data/test844 @@ -32,7 +32,7 @@ IMAP OAuth 2.0 (OAUTHBEARER) failure as continuation <command> 'imap://%HOSTIP:%IMAPPORT/844/;UID=1' -u user --oauth2-bearer mF_9.B5f-4.1JqM </command> -# The protocol section doesn't support ways of specifing the raw data in the +# The protocol section doesn't support ways of specifying the raw data in the # base64 encoded message so we must assert this <precheck> perl -e "print 'Test requires default test server host and port' if ( '%HOSTIP' ne '127.0.0.1' || '%IMAPPORT' ne '9003' );" diff --git a/tests/data/test845 b/tests/data/test845 index 152ab5827..e23b3d69e 100644 --- a/tests/data/test845 +++ b/tests/data/test845 @@ -33,7 +33,7 @@ IMAP OAuth 2.0 (OAUTHBEARER) failure as continuation with initial response <command> 'imap://%HOSTIP:%IMAPPORT/845/;UID=1' -u user --oauth2-bearer mF_9.B5f-4.1JqM </command> -# The protocol section doesn't support ways of specifing the raw data in the +# The protocol section doesn't support ways of specifying the raw data in the # base64 encoded message so we must assert this <precheck> perl -e "print 'Test requires default test server host and port' if ( '%HOSTIP' ne '127.0.0.1' || '%IMAPPORT' ne '9003' );" diff --git a/tests/data/test887 b/tests/data/test887 index b39dc21cc..fed4e3d92 100644 --- a/tests/data/test887 +++ b/tests/data/test887 @@ -42,7 +42,7 @@ POP3 OAuth 2.0 (OAUTHBEARER) authentication <command> pop3://%HOSTIP:%POP3PORT/887 -u user --oauth2-bearer mF_9.B5f-4.1JqM </command> -# The protocol section doesn't support ways of specifing the raw data in the +# The protocol section doesn't support ways of specifying the raw data in the # base64 encoded message so we must assert this <precheck> perl -e "print 'Test requires default test server host and port' if ( '%HOSTIP' ne '127.0.0.1' || '%POP3PORT' ne '9001' );" diff --git a/tests/data/test888 b/tests/data/test888 index 1a359df22..c52974f19 100644 --- a/tests/data/test888 +++ b/tests/data/test888 @@ -42,7 +42,7 @@ POP3 OAuth 2.0 (OAUTHBEARER) authentication with initial response <command> pop3://%HOSTIP:%POP3PORT/888 -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir </command> -# The protocol section doesn't support ways of specifing the raw data in the +# The protocol section doesn't support ways of specifying the raw data in the # base64 encoded message so we must assert this <precheck> perl -e "print 'Test requires default test server host and port' if ( '%HOSTIP' ne '127.0.0.1' || '%POP3PORT' ne '9001' );" diff --git a/tests/data/test889 b/tests/data/test889 index 5fbd0ca8a..da26a3729 100644 --- a/tests/data/test889 +++ b/tests/data/test889 @@ -34,7 +34,7 @@ POP3 OAuth 2.0 (OAUTHBEARER) failure as continuation <command> pop3://%HOSTIP:%POP3PORT/889 -u user --oauth2-bearer mF_9.B5f-4.1JqM </command> -# The protocol section doesn't support ways of specifing the raw data in the +# The protocol section doesn't support ways of specifying the raw data in the # base64 encoded message so we must assert this <precheck> perl -e "print 'Test requires default test server host and port' if ( '%HOSTIP' ne '127.0.0.1' || '%POP3PORT' ne '9001' );" diff --git a/tests/data/test890 b/tests/data/test890 index 6392dfa01..30aa0b232 100644 --- a/tests/data/test890 +++ b/tests/data/test890 @@ -34,7 +34,7 @@ POP3 OAuth 2.0 (OAUTHBEARER) failure as continuation with initial response <command> pop3://%HOSTIP:%POP3PORT/890 -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir </command> -# The protocol section doesn't support ways of specifing the raw data in the +# The protocol section doesn't support ways of specifying the raw data in the # base64 encoded message so we must assert this <precheck> perl -e "print 'Test requires default test server host and port' if ( '%HOSTIP' ne '127.0.0.1' || '%POP3PORT' ne '9001' );" diff --git a/tests/data/test946 b/tests/data/test946 index d34bd914e..da4b924f9 100644 --- a/tests/data/test946 +++ b/tests/data/test946 @@ -35,7 +35,7 @@ mail body <command> smtp://%HOSTIP:%SMTPPORT/946 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user --oauth2-bearer mF_9.B5f-4.1JqM -T - </command> -# The protocol section doesn't support ways of specifing the raw data in the +# The protocol section doesn't support ways of specifying the raw data in the # base64 encoded message so we must assert this <precheck> perl -e "print 'Test requires default test server host and port' if ( '%HOSTIP' ne '127.0.0.1' || '%SMTPPORT' ne '9005' );" diff --git a/tests/data/test947 b/tests/data/test947 index 03648a412..d33a55931 100644 --- a/tests/data/test947 +++ b/tests/data/test947 @@ -35,7 +35,7 @@ mail body <command> smtp://%HOSTIP:%SMTPPORT/947 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir -T - </command> -# The protocol section doesn't support ways of specifing the raw data in the +# The protocol section doesn't support ways of specifying the raw data in the # base64 encoded message so we must assert this <precheck> perl -e "print 'Test requires default test server host and port' if ( '%HOSTIP' ne '127.0.0.1' || '%SMTPPORT' ne '9005' );" diff --git a/tests/data/test948 b/tests/data/test948 index 51bb41ad2..9c1e31deb 100644 --- a/tests/data/test948 +++ b/tests/data/test948 @@ -36,7 +36,7 @@ mail body <command> smtp://%HOSTIP:%SMTPPORT/948 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user --oauth2-bearer mF_9.B5f-4.1JqM -T - </command> -# The protocol section doesn't support ways of specifing the raw data in the +# The protocol section doesn't support ways of specifying the raw data in the # base64 encoded message so we must assert this <precheck> perl -e "print 'Test requires default test server host and port' if ( '%HOSTIP' ne '127.0.0.1' || '%SMTPPORT' ne '9005' );" diff --git a/tests/data/test949 b/tests/data/test949 index f84c42b40..9145d61e9 100644 --- a/tests/data/test949 +++ b/tests/data/test949 @@ -36,7 +36,7 @@ mail body <command> smtp://%HOSTIP:%SMTPPORT/949 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir -T - </command> -# The protocol section doesn't support ways of specifing the raw data in the +# The protocol section doesn't support ways of specifying the raw data in the # base64 encoded message so we must assert this <precheck> perl -e "print 'Test requires default test server host and port' if ( '%HOSTIP' ne '127.0.0.1' || '%SMTPPORT' ne '9005' );" diff --git a/tests/httpserver.pl b/tests/httpserver.pl index 0be5667fe..7f6c86a8a 100755 --- a/tests/httpserver.pl +++ b/tests/httpserver.pl @@ -38,7 +38,7 @@ my $verbose = 0; # set to 1 for debugging my $port = 8990; # just a default my $unix_socket; # location to place a listening Unix socket my $ipvnum = 4; # default IP version of http server -my $idnum = 1; # dafault http server instance number +my $idnum = 1; # default http server instance number my $proto = 'http'; # protocol the http server speaks my $pidfile; # http server pid file my $logfile; # http server log file diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am index c08c5e3ca..ee29ab7db 100644 --- a/tests/libtest/Makefile.am +++ b/tests/libtest/Makefile.am @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -66,7 +66,7 @@ SUPPORTFILES_LIBS = $(top_builddir)/lib/libcurl.la @CURL_NETWORK_LIBS@ @NSS_LIBS TESTUTIL_LIBS = $(top_builddir)/lib/libcurl.la @CURL_NETWORK_AND_TIME_LIBS@ @NSS_LIBS@ endif -# Dependencies (may need to be overriden) +# Dependencies (may need to be overridden) LDADD = $(SUPPORTFILES_LIBS) # Makefile.inc provides the source defines (TESTUTIL, SUPPORTFILES, diff --git a/tests/libtest/lib509.c b/tests/libtest/lib509.c index a2522eb85..941ef7206 100644 --- a/tests/libtest/lib509.c +++ b/tests/libtest/lib509.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -23,7 +23,7 @@ /* * This test uses these funny custom memory callbacks for the only purpose - * of verifying that curl_global_init_mem() functionallity is present in + * of verifying that curl_global_init_mem() functionality is present in * libcurl and that it works unconditionally no matter how libcurl is built, * nothing more. * diff --git a/tests/libtest/lib526.c b/tests/libtest/lib526.c index 0ce7ebbe1..522cd7422 100644 --- a/tests/libtest/lib526.c +++ b/tests/libtest/lib526.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -29,7 +29,7 @@ * controlling the small differences. * * - lib526 closes all easy handles after - * they all have transfered the file over the single connection + * they all have transferred the file over the single connection * - lib527 closes each easy handle after each single transfer. * - lib532 uses only a single easy handle that is removed, reset and then * re-added for each transfer diff --git a/tests/rtspserver.pl b/tests/rtspserver.pl index bddccb919..02d2f9f90 100755 --- a/tests/rtspserver.pl +++ b/tests/rtspserver.pl @@ -6,7 +6,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -37,7 +37,7 @@ use serverhelp qw( my $verbose = 0; # set to 1 for debugging my $port = 8990; # just a default my $ipvnum = 4; # default IP version of rtsp server -my $idnum = 1; # dafault rtsp server instance number +my $idnum = 1; # default rtsp server instance number my $proto = 'rtsp'; # protocol the rtsp server speaks my $pidfile; # rtsp server pid file my $logfile; # rtsp server log file diff --git a/tests/secureserver.pl b/tests/secureserver.pl index 3a7443c40..1d05e9a4c 100755 --- a/tests/secureserver.pl +++ b/tests/secureserver.pl @@ -6,7 +6,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -63,7 +63,7 @@ my $pidfile; # stunnel pid file my $logfile; # stunnel log file my $loglevel = 5; # stunnel log level my $ipvnum = 4; # default IP version of stunneled server -my $idnum = 1; # dafault stunneled server instance number +my $idnum = 1; # default stunneled server instance number my $proto = 'https'; # default secure server protocol my $conffile; # stunnel configuration file my $capath; # certificate chain PEM folder @@ -172,7 +172,7 @@ while(@ARGV) { } #*************************************************************************** -# Initialize command line option dependant variables +# Initialize command line option dependent variables # if(!$pidfile) { $pidfile = "$path/". server_pidfilename($proto, $ipvnum, $idnum); diff --git a/tests/sshserver.pl b/tests/sshserver.pl index 3ebf8e675..9b3d122fd 100755 --- a/tests/sshserver.pl +++ b/tests/sshserver.pl @@ -84,7 +84,7 @@ my $port = 8999; # our default SCP/SFTP server port my $socksport = $port + 1; # our default SOCKS4/5 server port my $listenaddr = '127.0.0.1'; # default address on which to listen my $ipvnum = 4; # default IP version of listener address -my $idnum = 1; # dafault ssh daemon instance number +my $idnum = 1; # default ssh daemon instance number my $proto = 'ssh'; # protocol the ssh daemon speaks my $path = getcwd(); # current working directory my $logdir = $path .'/log'; # directory for log files diff --git a/tests/tftpserver.pl b/tests/tftpserver.pl index a4c4e47c0..8c84111bf 100755 --- a/tests/tftpserver.pl +++ b/tests/tftpserver.pl @@ -6,7 +6,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -37,7 +37,7 @@ use serverhelp qw( my $verbose = 0; # set to 1 for debugging my $port = 8997; # just a default my $ipvnum = 4; # default IP version of tftp server -my $idnum = 1; # dafault tftp server instance number +my $idnum = 1; # default tftp server instance number my $proto = 'tftp'; # protocol the tftp server speaks my $pidfile; # tftp server pid file my $logfile; # tftp server log file diff --git a/tests/unit/unit1300.c b/tests/unit/unit1300.c index c4d9dd90d..d90f7da0c 100644 --- a/tests/unit/unit1300.c +++ b/tests/unit/unit1300.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -242,7 +242,7 @@ UNITTEST_START /** * @case 1: - * moving head from an llist containg one element to an empty llist + * moving head from an llist containing one element to an empty llist * @assumptions: * 1: llist size will be 0 * 2: llist_destination size will be 1 |