summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.travis.yml2
-rw-r--r--docs/MAIL-ETIQUETTE2
-rw-r--r--docs/examples/Makefile.netware4
-rw-r--r--docs/examples/curlx.c2
-rw-r--r--docs/examples/smtp-mime.c2
-rw-r--r--docs/examples/threaded-shared-conn.c2
-rw-r--r--include/curl/typecheck-gcc.h2
-rw-r--r--lib/Makefile.netware4
-rw-r--r--lib/curl_fnmatch.c2
-rw-r--r--lib/easy.c4
-rw-r--r--lib/file.c2
-rw-r--r--lib/multi.c2
-rw-r--r--lib/telnet.c2
-rw-r--r--lib/urldata.h2
-rw-r--r--packages/vms/build_gnv_curl_pcsi_desc.com2
-rw-r--r--packages/vms/setup_gnv_curl_build.com2
-rw-r--r--projects/build-openssl.bat2
-rw-r--r--projects/wolfssl_options.h2
-rw-r--r--src/Makefile.netware4
-rw-r--r--tests/data/test8512
-rw-r--r--tests/server/rtspd.c8
-rw-r--r--tests/server/sws.c8
22 files changed, 32 insertions, 32 deletions
diff --git a/.travis.yml b/.travis.yml
index 6952f704f..4d3b6caee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,7 +34,7 @@ addons:
- libssh-dev
- krb5-user
- autopoint # for libpsl that needs autoreconf that uses gettext that needs it
- - libunistring-dev # for libidn2 neeed by libpsl
+ - libunistring-dev # for libidn2 needed by libpsl
- libnss3-dev
matrix:
diff --git a/docs/MAIL-ETIQUETTE b/docs/MAIL-ETIQUETTE
index effdcce21..07660a001 100644
--- a/docs/MAIL-ETIQUETTE
+++ b/docs/MAIL-ETIQUETTE
@@ -180,7 +180,7 @@ MAIL ETIQUETTE
encoded HTTP Basic auth headers.
This public nature of the curl mailing lists makes automatically inserted mail
- footers about mails being "private" or "only meant for the receipient" or
+ footers about mails being "private" or "only meant for the recipient" or
similar even more silly than usual. Because they are absolutely not private
when sent to a public mailing list.
diff --git a/docs/examples/Makefile.netware b/docs/examples/Makefile.netware
index e75d143d5..9ff6d9498 100644
--- a/docs/examples/Makefile.netware
+++ b/docs/examples/Makefile.netware
@@ -136,7 +136,7 @@ endif
CFLAGS += -align 4
else
# PRELUDE = $(NDK_CLIB)/imports/clibpre.o
- # to avoid the __init_* / __deinit_* whoes don't use prelude from NDK
+ # to avoid the __init_* / __deinit_* woes 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 don't use prelude from NDK
+ # to avoid the __init_* / __deinit_* woes 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/curlx.c b/docs/examples/curlx.c
index 3e47b460a..141f5a88a 100644
--- a/docs/examples/curlx.c
+++ b/docs/examples/curlx.c
@@ -159,7 +159,7 @@ static char *ia5string(ASN1_IA5STRING *ia5)
return tmp;
}
-/* A conveniance routine to get an access URI. */
+/* A convenience routine to get an access URI. */
static unsigned char *my_get_ext(X509 *cert, const int type,
int extensiontype)
{
diff --git a/docs/examples/smtp-mime.c b/docs/examples/smtp-mime.c
index dcd867f68..35997fa0e 100644
--- a/docs/examples/smtp-mime.c
+++ b/docs/examples/smtp-mime.c
@@ -107,7 +107,7 @@ int main(void)
/* Build the mime message. */
mime = curl_mime_init(curl);
- /* The inline part is an alterative proposing the html and the text
+ /* The inline part is an alternative proposing the html and the text
versions of the e-mail. */
alt = curl_mime_init(curl);
diff --git a/docs/examples/threaded-shared-conn.c b/docs/examples/threaded-shared-conn.c
index ab5ac406d..e238b952e 100644
--- a/docs/examples/threaded-shared-conn.c
+++ b/docs/examples/threaded-shared-conn.c
@@ -107,7 +107,7 @@ static void *run_thread(void *ptr)
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_db);
curl_easy_perform(curl); /* ignores error */
curl_easy_cleanup(curl);
- fprintf(stderr, "Tread %d transfer %d\n", u->threadno, i);
+ fprintf(stderr, "Thread %d transfer %d\n", u->threadno, i);
}
return NULL;
diff --git a/include/curl/typecheck-gcc.h b/include/curl/typecheck-gcc.h
index 3a0f253f6..a6f638614 100644
--- a/include/curl/typecheck-gcc.h
+++ b/include/curl/typecheck-gcc.h
@@ -428,7 +428,7 @@ _CURL_WARNING(_curl_easy_getinfo_err_curl_off_t,
* == or whatsoever.
*/
-/* XXX: should evaluate to true iff expr is a pointer */
+/* XXX: should evaluate to true if expr is a pointer */
#define _curl_is_any_ptr(expr) \
(sizeof(expr) == sizeof(void *))
diff --git a/lib/Makefile.netware b/lib/Makefile.netware
index f4b6528eb..2b392f3f4 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 don't use prelude from NDK
+ # to avoid the __init_* / __deinit_* woes 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 don't use prelude from NDK
+ # to avoid the __init_* / __deinit_* woes 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/curl_fnmatch.c b/lib/curl_fnmatch.c
index e8aff6761..fbfd85c43 100644
--- a/lib/curl_fnmatch.c
+++ b/lib/curl_fnmatch.c
@@ -37,7 +37,7 @@
*
* Make this function match POSIX. Test 1307 includes a set of test patterns
* that returns different results with a POSIX fnmatch() than with this
- * implemenation and this is considered a bug where POSIX is the guiding
+ * implementation and this is considered a bug where POSIX is the guiding
* light.
*/
diff --git a/lib/easy.c b/lib/easy.c
index 6b914353d..bf85075e1 100644
--- a/lib/easy.c
+++ b/lib/easy.c
@@ -113,7 +113,7 @@ static CURLcode win32_init(void)
res = WSAStartup(wVersionRequested, &wsaData);
if(res != 0)
- /* Tell the user that we couldn't find a useable */
+ /* Tell the user that we couldn't find a usable */
/* winsock.dll. */
return CURLE_FAILED_INIT;
@@ -125,7 +125,7 @@ static CURLcode win32_init(void)
if(LOBYTE(wsaData.wVersion) != LOBYTE(wVersionRequested) ||
HIBYTE(wsaData.wVersion) != HIBYTE(wVersionRequested) ) {
- /* Tell the user that we couldn't find a useable */
+ /* Tell the user that we couldn't find a usable */
/* winsock.dll. */
WSACleanup();
diff --git a/lib/file.c b/lib/file.c
index db04cc2da..988bc7440 100644
--- a/lib/file.c
+++ b/lib/file.c
@@ -461,7 +461,7 @@ static CURLcode file_do(struct connectdata *conn, bool *done)
return result;
/* Adjust the start offset in case we want to get the N last bytes
- * of the stream iff the filesize could be determined */
+ * of the stream if the filesize could be determined */
if(data->state.resume_from < 0) {
if(!fstated) {
failf(data, "Can't get the size of file.");
diff --git a/lib/multi.c b/lib/multi.c
index be926ae92..b318ce713 100644
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -458,7 +458,7 @@ CURLMcode curl_multi_add_handle(struct Curl_multi *multi,
happens if the lastcall time is set to the same time when the handle is
removed as when the next handle is added, as then the check in
update_timer() that prevents calling the application multiple times with
- the same timer infor will not trigger and then the new handle's timeout
+ the same timer info will not trigger and then the new handle's timeout
will not be notified to the app.
The work-around is thus simply to clear the 'lastcall' variable to force
diff --git a/lib/telnet.c b/lib/telnet.c
index 0a051e6f9..4e5a6eaa0 100644
--- a/lib/telnet.c
+++ b/lib/telnet.c
@@ -1017,7 +1017,7 @@ static void sendsuboption(struct connectdata *conn, int option)
CURL_SB_ACCUM(tn, CURL_IAC);
CURL_SB_ACCUM(tn, CURL_SB);
CURL_SB_ACCUM(tn, CURL_TELOPT_NAWS);
- /* We must deal either with litte or big endian processors */
+ /* We must deal either with little or big endian processors */
/* Window size must be sent according to the 'network order' */
x = htons(tn->subopt_wsx);
y = htons(tn->subopt_wsy);
diff --git a/lib/urldata.h b/lib/urldata.h
index 7e647a2a6..86295b681 100644
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -1348,7 +1348,7 @@ struct DynamicStatic {
char *url; /* work URL, copied from UserDefined */
bool url_alloc; /* URL string is malloc()'ed */
char *referer; /* referer string */
- bool referer_alloc; /* referer sting is malloc()ed */
+ bool referer_alloc; /* referer string is malloc()ed */
struct curl_slist *cookielist; /* list of cookie files set by
curl_easy_setopt(COOKIEFILE) calls */
struct curl_slist *resolve; /* set to point to the set.resolve list when
diff --git a/packages/vms/build_gnv_curl_pcsi_desc.com b/packages/vms/build_gnv_curl_pcsi_desc.com
index 3b4cd803f..fab2c823c 100644
--- a/packages/vms/build_gnv_curl_pcsi_desc.com
+++ b/packages/vms/build_gnv_curl_pcsi_desc.com
@@ -351,7 +351,7 @@ $ endif
$ endif
$ endif
$!
-$! Filenames with $ in them are VMS special and do not need to be lowercased.
+$! Filenames with $ in them are VMS special and do not need to be lowercase.
$! --------------------------------------------------------------------------
$ if f$locate("$", pathname) .lt. f$length(pathname) then goto inst_file_loop
$!
diff --git a/packages/vms/setup_gnv_curl_build.com b/packages/vms/setup_gnv_curl_build.com
index beec733c3..09f22a22e 100644
--- a/packages/vms/setup_gnv_curl_build.com
+++ b/packages/vms/setup_gnv_curl_build.com
@@ -60,7 +60,7 @@ $!
$! We want detailed build logs.
$ clist = "/list/show=(expan,includ)"
$!
-$! We want full symbol names in exact case. Need a commmon
+$! We want full symbol names in exact case. Need a common
$! repository for all directories.
$ cnames = "/names=(shortened,as_is)/repository=''base_dir'"
$!
diff --git a/projects/build-openssl.bat b/projects/build-openssl.bat
index d337b219c..9fd49b780 100644
--- a/projects/build-openssl.bat
+++ b/projects/build-openssl.bat
@@ -156,7 +156,7 @@ rem ***************************************************************************
if not defined PERL_PATH (
rem Check we have Perl in our path
- rem using !! below as %% was having \Microsoft was unexecpted error.
+ rem using !! below as %% was having \Microsoft was unexpected error.
echo !PATH! | findstr /I /C:"\Perl" 1>nul
if errorlevel 1 (
rem It isn't so check we have it installed and set the path if it is
diff --git a/projects/wolfssl_options.h b/projects/wolfssl_options.h
index f6af47cab..1ca618f10 100644
--- a/projects/wolfssl_options.h
+++ b/projects/wolfssl_options.h
@@ -47,7 +47,7 @@ create the thread local storage and that could be a problem for LoadLibrary.
Regarding the options that were added via C_EXTRA_FLAGS:
FP_MAX_BITS=16384
-http://www.yassl.com/forums/topic423-cacertorgs-ca-cert-verify-failed-but-withdisablefastmath-it-works.html
+https://web.archive.org/web/20150218183550/www.yassl.com/forums/topic423-cacertorgs-ca-cert-verify-failed-but-withdisablefastmath-it-works.html
"Since root.crt uses a 4096-bit RSA key, you'll need to increase the fastmath
buffer size. You can do this using the define:
FP_MAX_BITS and setting it to 8192."
diff --git a/src/Makefile.netware b/src/Makefile.netware
index ebe6500eb..53d803b2b 100644
--- a/src/Makefile.netware
+++ b/src/Makefile.netware
@@ -178,7 +178,7 @@ endif
CFLAGS += -align 4
else
# PRELUDE = $(NDK_CLIB)/imports/clibpre.o
- # to avoid the __init_* / __deinit_* whoes don't use prelude from NDK
+ # to avoid the __init_* / __deinit_* woes 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
@@ -201,7 +201,7 @@ else
endif
else
# PRELUDE = $(NDK_CLIB)/imports/clibpre.gcc.o
- # to avoid the __init_* / __deinit_* whoes don't use prelude from NDK
+ # to avoid the __init_* / __deinit_* woes 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/tests/data/test851 b/tests/data/test851
index 60c49c47f..6269dd776 100644
--- a/tests/data/test851
+++ b/tests/data/test851
@@ -11,7 +11,7 @@ LIST
# Server-side
<reply>
<servercmd>
-# include the '.\r\n' 3-byte trailer to end the transfer poperly!
+# include the '.\r\n' 3-byte trailer to end the transfer properly!
REPLY LIST +OK 851 100\r\n.
</servercmd>
</reply>
diff --git a/tests/server/rtspd.c b/tests/server/rtspd.c
index 8e61a43f3..955e9a233 100644
--- a/tests/server/rtspd.c
+++ b/tests/server/rtspd.c
@@ -904,7 +904,7 @@ static int send_doc(curl_socket_t sock, struct httprequest *req)
char *cmd = NULL;
size_t cmdsize = 0;
FILE *dump;
- bool persistant = TRUE;
+ bool persistent = TRUE;
bool sendfailure = FALSE;
size_t responsesize;
int error = 0;
@@ -1046,7 +1046,7 @@ static int send_doc(curl_socket_t sock, struct httprequest *req)
connection will be closed after the data has been sent to the requesting
client... */
if(strstr(buffer, "swsclose") || !count) {
- persistant = FALSE;
+ persistent = FALSE;
logmsg("connection close instruction \"swsclose\" found in response");
}
if(strstr(buffer, "swsbounce")) {
@@ -1176,7 +1176,7 @@ static int send_doc(curl_socket_t sock, struct httprequest *req)
} while(ptr && *ptr);
}
free(cmd);
- req->open = persistant;
+ req->open = persistent;
prevtestno = req->testno;
prevpartno = req->partno;
@@ -1430,7 +1430,7 @@ int main(int argc, char *argv[])
}
if(req.open)
- logmsg("=> persistant connection request ended, awaits new request");
+ logmsg("=> persistent connection request ended, awaits new request");
/* if we got a CONNECT, loop and get another request as well! */
} while(req.open || (req.testno == DOCNUMBER_CONNECT));
diff --git a/tests/server/sws.c b/tests/server/sws.c
index 10a87746b..22ef8168a 100644
--- a/tests/server/sws.c
+++ b/tests/server/sws.c
@@ -1065,7 +1065,7 @@ static int send_doc(curl_socket_t sock, struct httprequest *req)
char *cmd = NULL;
size_t cmdsize = 0;
FILE *dump;
- bool persistant = TRUE;
+ bool persistent = TRUE;
bool sendfailure = FALSE;
size_t responsesize;
int error = 0;
@@ -1196,7 +1196,7 @@ static int send_doc(curl_socket_t sock, struct httprequest *req)
connection will be closed after the data has been sent to the requesting
client... */
if(strstr(buffer, "swsclose") || !count) {
- persistant = FALSE;
+ persistent = FALSE;
logmsg("connection close instruction \"swsclose\" found in response");
}
if(strstr(buffer, "swsbounce")) {
@@ -1313,7 +1313,7 @@ static int send_doc(curl_socket_t sock, struct httprequest *req)
} while(ptr && *ptr);
}
free(cmd);
- req->open = use_gopher?FALSE:persistant;
+ req->open = use_gopher?FALSE:persistent;
prevtestno = req->testno;
prevpartno = req->partno;
@@ -1968,7 +1968,7 @@ static int service_connection(curl_socket_t msgsock, struct httprequest *req,
/* if we got a CONNECT, loop and get another request as well! */
if(req->open) {
- logmsg("=> persistant connection request ended, awaits new request\n");
+ logmsg("=> persistent connection request ended, awaits new request\n");
return 1;
}
View Lorry Controller Status