aboutsummaryrefslogtreecommitdiff
path: root/src/microhttpd
diff options
context:
space:
mode:
authorsilvioprog <silvioprog@gmail.com>2020-03-31 15:08:34 -0300
committersilvioprog <silvioprog@gmail.com>2020-03-31 15:08:34 -0300
commitbcffdf809fabc09ff8f0a6ef6af601062191a2b4 (patch)
tree771d4408c8daa05136c722cd4729549862271ac7 /src/microhttpd
parent6702e6202368720d7a381669c03eedc318f225ca (diff)
downloadlibmicrohttpd-bcffdf809fabc09ff8f0a6ef6af601062191a2b4.tar.gz
libmicrohttpd-bcffdf809fabc09ff8f0a6ef6af601062191a2b4.zip
Applied several spelling fixes. (#6142)
Diffstat (limited to 'src/microhttpd')
-rw-r--r--src/microhttpd/connection.c2
-rw-r--r--src/microhttpd/daemon.c2
-rw-r--r--src/microhttpd/digestauth.c4
-rw-r--r--src/microhttpd/internal.h2
-rw-r--r--src/microhttpd/memorypool.h2
-rw-r--r--src/microhttpd/mhd_bithelpers.h12
-rw-r--r--src/microhttpd/mhd_send.c8
-rw-r--r--src/microhttpd/test_md5.c8
-rw-r--r--src/microhttpd/test_sha256.c8
-rw-r--r--src/microhttpd/test_upgrade.c4
-rw-r--r--src/microhttpd/test_upgrade_large.c4
11 files changed, 28 insertions, 28 deletions
diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c
index 77ccfbfb..80a9bff0 100644
--- a/src/microhttpd/connection.c
+++ b/src/microhttpd/connection.c
@@ -835,7 +835,7 @@ MHD_connection_finish_forward_ (struct MHD_Connection *connection)
835 835
836 836
837/** 837/**
838 * A serious error occured, close the 838 * A serious error occurred, close the
839 * connection (and notify the application). 839 * connection (and notify the application).
840 * 840 *
841 * @param connection connection to close with error 841 * @param connection connection to close with error
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 4f7c2108..f7c138aa 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -3223,7 +3223,7 @@ MHD_accept_connection (struct MHD_Daemon *daemon)
3223 { 3223 {
3224 const int err = MHD_socket_get_error_ (); 3224 const int err = MHD_socket_get_error_ ();
3225 3225
3226 /* This could be a common occurance with multiple worker threads */ 3226 /* This could be a common occurrence with multiple worker threads */
3227 if (MHD_SCKT_ERR_IS_ (err, 3227 if (MHD_SCKT_ERR_IS_ (err,
3228 MHD_SCKT_EINVAL_)) 3228 MHD_SCKT_EINVAL_))
3229 return MHD_NO; /* can happen during shutdown */ 3229 return MHD_NO; /* can happen during shutdown */
diff --git a/src/microhttpd/digestauth.c b/src/microhttpd/digestauth.c
index b6a684a4..e5c66d56 100644
--- a/src/microhttpd/digestauth.c
+++ b/src/microhttpd/digestauth.c
@@ -1140,7 +1140,7 @@ digest_auth_check_all (struct MHD_Connection *connection,
1140 * Uses #MHD_DIGEST_ALG_MD5 (for now, for backwards-compatibility). 1140 * Uses #MHD_DIGEST_ALG_MD5 (for now, for backwards-compatibility).
1141 * Note that this MAY change to #MHD_DIGEST_ALG_AUTO in the future. 1141 * Note that this MAY change to #MHD_DIGEST_ALG_AUTO in the future.
1142 * If you want to be sure you get MD5, use #MHD_digest_auth_check2 1142 * If you want to be sure you get MD5, use #MHD_digest_auth_check2
1143 * and specifiy MD5 explicitly. 1143 * and specify MD5 explicitly.
1144 * 1144 *
1145 * @param connection The MHD connection structure 1145 * @param connection The MHD connection structure
1146 * @param realm The realm presented to the client 1146 * @param realm The realm presented to the client
@@ -1278,7 +1278,7 @@ MHD_digest_auth_check_digest2 (struct MHD_Connection *connection,
1278 1278
1279 mhd_assert (NULL != digest); 1279 mhd_assert (NULL != digest);
1280 if (da.digest_size != digest_size) 1280 if (da.digest_size != digest_size)
1281 MHD_PANIC (_ ("digest size missmatch")); /* API violation! */ 1281 MHD_PANIC (_ ("digest size mismatch")); /* API violation! */
1282 return digest_auth_check_all (connection, 1282 return digest_auth_check_all (connection,
1283 &da, 1283 &da,
1284 realm, 1284 realm,
diff --git a/src/microhttpd/internal.h b/src/microhttpd/internal.h
index ad16535e..96e24780 100644
--- a/src/microhttpd/internal.h
+++ b/src/microhttpd/internal.h
@@ -1546,7 +1546,7 @@ struct MHD_Daemon
1546 volatile bool shutdown; 1546 volatile bool shutdown;
1547 1547
1548 /** 1548 /**
1549 * Has this deamon been quiesced via #MHD_quiesce_daemon()? 1549 * Has this daemon been quiesced via #MHD_quiesce_daemon()?
1550 * If so, we should no longer use the @e listen_fd (including 1550 * If so, we should no longer use the @e listen_fd (including
1551 * removing it from the @e epoll_fd when possible). 1551 * removing it from the @e epoll_fd when possible).
1552 */ 1552 */
diff --git a/src/microhttpd/memorypool.h b/src/microhttpd/memorypool.h
index 6f5d539d..2d1fd119 100644
--- a/src/microhttpd/memorypool.h
+++ b/src/microhttpd/memorypool.h
@@ -44,7 +44,7 @@
44struct MemoryPool; 44struct MemoryPool;
45 45
46/** 46/**
47 * Initilise values for memory pools 47 * Initialize values for memory pools
48 */ 48 */
49void 49void
50MHD_init_mem_pools_ (void); 50MHD_init_mem_pools_ (void);
diff --git a/src/microhttpd/mhd_bithelpers.h b/src/microhttpd/mhd_bithelpers.h
index 34e49d15..e023bf12 100644
--- a/src/microhttpd/mhd_bithelpers.h
+++ b/src/microhttpd/mhd_bithelpers.h
@@ -100,7 +100,7 @@
100#define _MHD_PUT_64BIT_LE(addr, value64) \ 100#define _MHD_PUT_64BIT_LE(addr, value64) \
101 ((*(uint64_t*) (addr)) = _MHD_BYTES_SWAP64 (value64)) 101 ((*(uint64_t*) (addr)) = _MHD_BYTES_SWAP64 (value64))
102#else /* _MHD_BYTE_ORDER != _MHD_BIG_ENDIAN */ 102#else /* _MHD_BYTE_ORDER != _MHD_BIG_ENDIAN */
103/* Endianess was not detected or non-standard like PDP-endian */ 103/* Endianness was not detected or non-standard like PDP-endian */
104#define _MHD_PUT_64BIT_LE(addr, value64) do { \ 104#define _MHD_PUT_64BIT_LE(addr, value64) do { \
105 ((uint8_t*) (addr))[0] = (uint8_t) ((uint64_t) (value64)); \ 105 ((uint8_t*) (addr))[0] = (uint8_t) ((uint64_t) (value64)); \
106 ((uint8_t*) (addr))[1] = (uint8_t) (((uint64_t) (value64)) >> 8); \ 106 ((uint8_t*) (addr))[1] = (uint8_t) (((uint64_t) (value64)) >> 8); \
@@ -124,7 +124,7 @@
124#define _MHD_PUT_32BIT_LE(addr, value32) \ 124#define _MHD_PUT_32BIT_LE(addr, value32) \
125 ((*(uint32_t*) (addr)) = _MHD_BYTES_SWAP32 (value32)) 125 ((*(uint32_t*) (addr)) = _MHD_BYTES_SWAP32 (value32))
126#else /* _MHD_BYTE_ORDER != _MHD_BIG_ENDIAN */ 126#else /* _MHD_BYTE_ORDER != _MHD_BIG_ENDIAN */
127/* Endianess was not detected or non-standard like PDP-endian */ 127/* Endianness was not detected or non-standard like PDP-endian */
128#define _MHD_PUT_32BIT_LE(addr, value32) do { \ 128#define _MHD_PUT_32BIT_LE(addr, value32) do { \
129 ((uint8_t*) (addr))[0] = (uint8_t) ((uint32_t) (value32)); \ 129 ((uint8_t*) (addr))[0] = (uint8_t) ((uint32_t) (value32)); \
130 ((uint8_t*) (addr))[1] = (uint8_t) (((uint32_t) (value32)) >> 8); \ 130 ((uint8_t*) (addr))[1] = (uint8_t) (((uint32_t) (value32)) >> 8); \
@@ -144,7 +144,7 @@
144#define _MHD_GET_32BIT_LE(addr) \ 144#define _MHD_GET_32BIT_LE(addr) \
145 _MHD_BYTES_SWAP32 (*(const uint32_t*) (addr)) 145 _MHD_BYTES_SWAP32 (*(const uint32_t*) (addr))
146#else /* _MHD_BYTE_ORDER != _MHD_BIG_ENDIAN */ 146#else /* _MHD_BYTE_ORDER != _MHD_BIG_ENDIAN */
147/* Endianess was not detected or non-standard like PDP-endian */ 147/* Endianness was not detected or non-standard like PDP-endian */
148#define _MHD_GET_32BIT_LE(addr) \ 148#define _MHD_GET_32BIT_LE(addr) \
149 ( ( (uint32_t) (((const uint8_t*) addr)[0])) \ 149 ( ( (uint32_t) (((const uint8_t*) addr)[0])) \
150 | (((uint32_t) (((const uint8_t*) addr)[1])) << 8) \ 150 | (((uint32_t) (((const uint8_t*) addr)[1])) << 8) \
@@ -164,7 +164,7 @@
164#define _MHD_PUT_64BIT_BE(addr, value64) \ 164#define _MHD_PUT_64BIT_BE(addr, value64) \
165 ((*(uint64_t*) (addr)) = _MHD_BYTES_SWAP64 (value64)) 165 ((*(uint64_t*) (addr)) = _MHD_BYTES_SWAP64 (value64))
166#else /* _MHD_BYTE_ORDER != _MHD_LITTLE_ENDIAN */ 166#else /* _MHD_BYTE_ORDER != _MHD_LITTLE_ENDIAN */
167/* Endianess was not detected or non-standard like PDP-endian */ 167/* Endianness was not detected or non-standard like PDP-endian */
168#define _MHD_PUT_64BIT_BE(addr, value64) do { \ 168#define _MHD_PUT_64BIT_BE(addr, value64) do { \
169 ((uint8_t*) (addr))[7] = (uint8_t) ((uint64_t) (value64)); \ 169 ((uint8_t*) (addr))[7] = (uint8_t) ((uint64_t) (value64)); \
170 ((uint8_t*) (addr))[6] = (uint8_t) (((uint64_t) (value64)) >> 8); \ 170 ((uint8_t*) (addr))[6] = (uint8_t) (((uint64_t) (value64)) >> 8); \
@@ -188,7 +188,7 @@
188#define _MHD_PUT_32BIT_BE(addr, value32) \ 188#define _MHD_PUT_32BIT_BE(addr, value32) \
189 ((*(uint32_t*) (addr)) = _MHD_BYTES_SWAP32 (value32)) 189 ((*(uint32_t*) (addr)) = _MHD_BYTES_SWAP32 (value32))
190#else /* _MHD_BYTE_ORDER != _MHD_LITTLE_ENDIAN */ 190#else /* _MHD_BYTE_ORDER != _MHD_LITTLE_ENDIAN */
191/* Endianess was not detected or non-standard like PDP-endian */ 191/* Endianness was not detected or non-standard like PDP-endian */
192#define _MHD_PUT_32BIT_BE(addr, value32) do { \ 192#define _MHD_PUT_32BIT_BE(addr, value32) do { \
193 ((uint8_t*) (addr))[3] = (uint8_t) ((uint32_t) (value32)); \ 193 ((uint8_t*) (addr))[3] = (uint8_t) ((uint32_t) (value32)); \
194 ((uint8_t*) (addr))[2] = (uint8_t) (((uint32_t) (value32)) >> 8); \ 194 ((uint8_t*) (addr))[2] = (uint8_t) (((uint32_t) (value32)) >> 8); \
@@ -208,7 +208,7 @@
208#define _MHD_GET_32BIT_BE(addr) \ 208#define _MHD_GET_32BIT_BE(addr) \
209 _MHD_BYTES_SWAP32 (*(const uint32_t*) (addr)) 209 _MHD_BYTES_SWAP32 (*(const uint32_t*) (addr))
210#else /* _MHD_BYTE_ORDER != _MHD_LITTLE_ENDIAN */ 210#else /* _MHD_BYTE_ORDER != _MHD_LITTLE_ENDIAN */
211/* Endianess was not detected or non-standard like PDP-endian */ 211/* Endianness was not detected or non-standard like PDP-endian */
212#define _MHD_GET_32BIT_BE(addr) \ 212#define _MHD_GET_32BIT_BE(addr) \
213 ( (((uint32_t) (((const uint8_t*) addr)[0])) << 24) \ 213 ( (((uint32_t) (((const uint8_t*) addr)[0])) << 24) \
214 | (((uint32_t) (((const uint8_t*) addr)[1])) << 16) \ 214 | (((uint32_t) (((const uint8_t*) addr)[1])) << 16) \
diff --git a/src/microhttpd/mhd_send.c b/src/microhttpd/mhd_send.c
index b0c0842b..cc75bbde 100644
--- a/src/microhttpd/mhd_send.c
+++ b/src/microhttpd/mhd_send.c
@@ -86,11 +86,11 @@ pre_cork_setsockopt (struct MHD_Connection *connection,
86#endif 86#endif
87 break; 87 break;
88 case EFAULT: 88 case EFAULT:
89 /* wopsie, should at leats log this, FIXME: maybe die */ 89 /* wopsie, should at least log this, FIXME: maybe die */
90#ifdef HAVE_MESSAGES 90#ifdef HAVE_MESSAGES
91 MHD_DLOG (connection->daemon, 91 MHD_DLOG (connection->daemon,
92 _ ( 92 _ (
93 "The addresss pointed to by optval is not a valid part of the process address space: %s\n"), 93 "The address pointed to by optval is not a valid part of the process address space: %s\n"),
94 MHD_socket_last_strerr_ ()); 94 MHD_socket_last_strerr_ ());
95#endif 95#endif
96 break; 96 break;
@@ -173,11 +173,11 @@ post_cork_setsockopt (struct MHD_Connection *connection,
173#endif 173#endif
174 break; 174 break;
175 case EFAULT: 175 case EFAULT:
176 /* wopsie, should at leats log this, FIXME: maybe die */ 176 /* wopsie, should at least log this, FIXME: maybe die */
177#ifdef HAVE_MESSAGES 177#ifdef HAVE_MESSAGES
178 MHD_DLOG (connection->daemon, 178 MHD_DLOG (connection->daemon,
179 _ ( 179 _ (
180 "The addresss pointed to by optval is not a valid part of the process address space: %s\n"), 180 "The address pointed to by optval is not a valid part of the process address space: %s\n"),
181 MHD_socket_last_strerr_ ()); 181 MHD_socket_last_strerr_ ());
182#endif 182#endif
183 break; 183 break;
diff --git a/src/microhttpd/test_md5.c b/src/microhttpd/test_md5.c
index 2825c09f..9d3ff63f 100644
--- a/src/microhttpd/test_md5.c
+++ b/src/microhttpd/test_md5.c
@@ -243,16 +243,16 @@ bin2hex (const uint8_t *bin,
243static int 243static int
244check_result (const char *test_name, 244check_result (const char *test_name,
245 unsigned int check_num, 245 unsigned int check_num,
246 const uint8_t calcualted[MD5_DIGEST_SIZE], 246 const uint8_t calculated[MD5_DIGEST_SIZE],
247 const uint8_t expected[MD5_DIGEST_SIZE]) 247 const uint8_t expected[MD5_DIGEST_SIZE])
248{ 248{
249 int failed = memcmp (calcualted, expected, MD5_DIGEST_SIZE); 249 int failed = memcmp (calculated, expected, MD5_DIGEST_SIZE);
250 check_num++; /* Print 1-based numbers */ 250 check_num++; /* Print 1-based numbers */
251 if (failed) 251 if (failed)
252 { 252 {
253 char calc_str[MD5_DIGEST_STRING_LENGTH]; 253 char calc_str[MD5_DIGEST_STRING_LENGTH];
254 char expc_str[MD5_DIGEST_STRING_LENGTH]; 254 char expc_str[MD5_DIGEST_STRING_LENGTH];
255 bin2hex (calcualted, MD5_DIGEST_SIZE, calc_str); 255 bin2hex (calculated, MD5_DIGEST_SIZE, calc_str);
256 bin2hex (expected, MD5_DIGEST_SIZE, expc_str); 256 bin2hex (expected, MD5_DIGEST_SIZE, expc_str);
257 fprintf (stderr, 257 fprintf (stderr,
258 "FAILED: %s check %u: calculated digest %s, expected digest %s.\n", 258 "FAILED: %s check %u: calculated digest %s, expected digest %s.\n",
@@ -262,7 +262,7 @@ check_result (const char *test_name,
262 else if (verbose) 262 else if (verbose)
263 { 263 {
264 char calc_str[MD5_DIGEST_STRING_LENGTH]; 264 char calc_str[MD5_DIGEST_STRING_LENGTH];
265 bin2hex (calcualted, MD5_DIGEST_SIZE, calc_str); 265 bin2hex (calculated, MD5_DIGEST_SIZE, calc_str);
266 printf ( 266 printf (
267 "PASSED: %s check %u: calculated digest %s match expected digest.\n", 267 "PASSED: %s check %u: calculated digest %s match expected digest.\n",
268 test_name, check_num, calc_str); 268 test_name, check_num, calc_str);
diff --git a/src/microhttpd/test_sha256.c b/src/microhttpd/test_sha256.c
index 54cdf027..7ad5f399 100644
--- a/src/microhttpd/test_sha256.c
+++ b/src/microhttpd/test_sha256.c
@@ -289,16 +289,16 @@ bin2hex (const uint8_t *bin,
289static int 289static int
290check_result (const char *test_name, 290check_result (const char *test_name,
291 unsigned int check_num, 291 unsigned int check_num,
292 const uint8_t calcualted[SHA256_DIGEST_SIZE], 292 const uint8_t calculated[SHA256_DIGEST_SIZE],
293 const uint8_t expected[SHA256_DIGEST_SIZE]) 293 const uint8_t expected[SHA256_DIGEST_SIZE])
294{ 294{
295 int failed = memcmp (calcualted, expected, SHA256_DIGEST_SIZE); 295 int failed = memcmp (calculated, expected, SHA256_DIGEST_SIZE);
296 check_num++; /* Print 1-based numbers */ 296 check_num++; /* Print 1-based numbers */
297 if (failed) 297 if (failed)
298 { 298 {
299 char calc_str[SHA256_DIGEST_STRING_SIZE]; 299 char calc_str[SHA256_DIGEST_STRING_SIZE];
300 char expc_str[SHA256_DIGEST_STRING_SIZE]; 300 char expc_str[SHA256_DIGEST_STRING_SIZE];
301 bin2hex (calcualted, SHA256_DIGEST_SIZE, calc_str); 301 bin2hex (calculated, SHA256_DIGEST_SIZE, calc_str);
302 bin2hex (expected, SHA256_DIGEST_SIZE, expc_str); 302 bin2hex (expected, SHA256_DIGEST_SIZE, expc_str);
303 fprintf (stderr, 303 fprintf (stderr,
304 "FAILED: %s check %u: calculated digest %s, expected digest %s.\n", 304 "FAILED: %s check %u: calculated digest %s, expected digest %s.\n",
@@ -308,7 +308,7 @@ check_result (const char *test_name,
308 else if (verbose) 308 else if (verbose)
309 { 309 {
310 char calc_str[SHA256_DIGEST_STRING_SIZE]; 310 char calc_str[SHA256_DIGEST_STRING_SIZE];
311 bin2hex (calcualted, SHA256_DIGEST_SIZE, calc_str); 311 bin2hex (calculated, SHA256_DIGEST_SIZE, calc_str);
312 printf ( 312 printf (
313 "PASSED: %s check %u: calculated digest %s match expected digest.\n", 313 "PASSED: %s check %u: calculated digest %s match expected digest.\n",
314 test_name, check_num, calc_str); 314 test_name, check_num, calc_str);
diff --git a/src/microhttpd/test_upgrade.c b/src/microhttpd/test_upgrade.c
index 404c2854..7c76d221 100644
--- a/src/microhttpd/test_upgrade.c
+++ b/src/microhttpd/test_upgrade.c
@@ -279,7 +279,7 @@ wr_create_from_plain_sckt (MHD_socket plain_sk)
279 * Connect socket to specified address. 279 * Connect socket to specified address.
280 * @param s socket to use 280 * @param s socket to use
281 * @param addr address to connect 281 * @param addr address to connect
282 * @param length of sturcture pointed by @a addr 282 * @param length of structure pointed by @a addr
283 * @return zero on success, -1 otherwise. 283 * @return zero on success, -1 otherwise.
284 */ 284 */
285static int 285static int
@@ -840,7 +840,7 @@ upgrade_cb (void *cls,
840 * can be set with the #MHD_OPTION_NOTIFY_COMPLETED). 840 * can be set with the #MHD_OPTION_NOTIFY_COMPLETED).
841 * Initially, `*con_cls` will be NULL. 841 * Initially, `*con_cls` will be NULL.
842 * @return #MHD_YES if the connection was handled successfully, 842 * @return #MHD_YES if the connection was handled successfully,
843 * #MHD_NO if the socket must be closed due to a serios 843 * #MHD_NO if the socket must be closed due to a serious
844 * error while handling the request 844 * error while handling the request
845 */ 845 */
846static int 846static int
diff --git a/src/microhttpd/test_upgrade_large.c b/src/microhttpd/test_upgrade_large.c
index a17293db..89eba4b7 100644
--- a/src/microhttpd/test_upgrade_large.c
+++ b/src/microhttpd/test_upgrade_large.c
@@ -289,7 +289,7 @@ wr_create_from_plain_sckt (MHD_socket plain_sk)
289 * Connect socket to specified address. 289 * Connect socket to specified address.
290 * @param s socket to use 290 * @param s socket to use
291 * @param addr address to connect 291 * @param addr address to connect
292 * @param length of sturcture pointed by @a addr 292 * @param length of structure pointed by @a addr
293 * @return zero on success, -1 otherwise. 293 * @return zero on success, -1 otherwise.
294 */ 294 */
295static int 295static int
@@ -864,7 +864,7 @@ upgrade_cb (void *cls,
864 * can be set with the #MHD_OPTION_NOTIFY_COMPLETED). 864 * can be set with the #MHD_OPTION_NOTIFY_COMPLETED).
865 * Initially, `*con_cls` will be NULL. 865 * Initially, `*con_cls` will be NULL.
866 * @return #MHD_YES if the connection was handled successfully, 866 * @return #MHD_YES if the connection was handled successfully,
867 * #MHD_NO if the socket must be closed due to a serios 867 * #MHD_NO if the socket must be closed due to a serious
868 * error while handling the request 868 * error while handling the request
869 */ 869 */
870static int 870static int