aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac8
-rw-r--r--doc/chapters/websocket.inc4
-rw-r--r--doc/libmicrohttpd.texi2
-rw-r--r--m4/mhd_check_cc_cflag.m42
-rw-r--r--m4/mhd_check_cc_ldflag.m42
-rw-r--r--src/include/microhttpd_ws.h2
-rw-r--r--src/microhttpd/digestauth.c12
-rw-r--r--src/microhttpd_ws/test_websocket.c2
8 files changed, 17 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac
index 871df81c..8f87bc0f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -77,7 +77,7 @@ AC_MSG_CHECKING([for build type])
77AC_ARG_ENABLE([build-type], 77AC_ARG_ENABLE([build-type],
78 [AS_HELP_STRING([[--enable-build-type=TYPE]], 78 [AS_HELP_STRING([[--enable-build-type=TYPE]],
79 [enable build TYPE, a set of configuration parameters; individual settings ] 79 [enable build TYPE, a set of configuration parameters; individual settings ]
80 [(asserts, sanitizers, compiler and linker flags) can be overriden by ] 80 [(asserts, sanitizers, compiler and linker flags) can be overridden by ]
81 [additional configure parameters (debug, debugger, neutral, release, release-compact, ] 81 [additional configure parameters (debug, debugger, neutral, release, release-compact, ]
82 [release-hardened) [neutral]])], 82 [release-hardened) [neutral]])],
83 [], [enable_build_type=neutral]) 83 [], [enable_build_type=neutral])
@@ -86,7 +86,7 @@ AS_VAR_IF([enable_build_type], ["no"], [enable_build_type="neutral"])
86AS_VAR_IF([enable_build_type], ["yes"], [AC_MSG_ERROR([[Missing TYPE for --enable-build-type=]])]) 86AS_VAR_IF([enable_build_type], ["yes"], [AC_MSG_ERROR([[Missing TYPE for --enable-build-type=]])])
87AS_CASE([${enable_build_type}], 87AS_CASE([${enable_build_type}],
88 [debug], [AC_MSG_RESULT([debug. Defaults: enable asserts, sanitizers (if any supported), debug information, compiler optimisation for debugging])], 88 [debug], [AC_MSG_RESULT([debug. Defaults: enable asserts, sanitizers (if any supported), debug information, compiler optimisation for debugging])],
89 [debugger], [AC_MSG_RESULT([debuger. Defaults: enable asserts, disable sanitizers, debug information, no compiler optimisation])], 89 [debugger], [AC_MSG_RESULT([debugger. Defaults: enable asserts, disable sanitizers, debug information, no compiler optimisation])],
90 [neutral], [AC_MSG_RESULT([neutral. Defaults: use only user-specified compiler and linker flags])], 90 [neutral], [AC_MSG_RESULT([neutral. Defaults: use only user-specified compiler and linker flags])],
91 [release], [AC_MSG_RESULT([release. Defaults: disable asserts, enable compiler optimisations])], 91 [release], [AC_MSG_RESULT([release. Defaults: disable asserts, enable compiler optimisations])],
92 [release-compact], [AC_MSG_RESULT([release-compact. Defaults: disable asserts, enable compiler optimisations for size, enable compact code])], 92 [release-compact], [AC_MSG_RESULT([release-compact. Defaults: disable asserts, enable compiler optimisations for size, enable compact code])],
@@ -1537,7 +1537,7 @@ fd = epoll_create1(EPOLL_CLOEXEC);]])],
1537 AS_IF([test "x$mhd_cv_have_epoll_create1" = "xyes"],[ 1537 AS_IF([test "x$mhd_cv_have_epoll_create1" = "xyes"],[
1538 AC_DEFINE([[HAVE_EPOLL_CREATE1]], [[1]], [Define if you have epoll_create1 function.])])) 1538 AC_DEFINE([[HAVE_EPOLL_CREATE1]], [[1]], [Define if you have epoll_create1 function.])]))
1539 1539
1540AC_CACHE_CHECK([for suported 'noreturn' keyword], [mhd_cv_decl_noreturn], 1540AC_CACHE_CHECK([for supported 'noreturn' keyword], [mhd_cv_decl_noreturn],
1541 [ 1541 [
1542 mhd_cv_decl_noreturn="none" 1542 mhd_cv_decl_noreturn="none"
1543 CFLAGS="${CFLAGS_ac} ${user_CFLAGS} ${errattr_CFLAGS}" 1543 CFLAGS="${CFLAGS_ac} ${user_CFLAGS} ${errattr_CFLAGS}"
@@ -3297,7 +3297,7 @@ AC_MSG_CHECKING([whether to enable run-time sanitizers])
3297AC_ARG_ENABLE([sanitizers], 3297AC_ARG_ENABLE([sanitizers],
3298 [AS_HELP_STRING([[--enable-sanitizers[=address,undefined,leak,user-poison]]], 3298 [AS_HELP_STRING([[--enable-sanitizers[=address,undefined,leak,user-poison]]],
3299 [enable run-time sanitizers, specify the list of types of sanitizers to enable, ] 3299 [enable run-time sanitizers, specify the list of types of sanitizers to enable, ]
3300 [leave the list empty (or set to "auto") to enable all suppoted and available ] 3300 [leave the list empty (or set to "auto") to enable all supported and available ]
3301 [sanitizers, or specify "auto-fallback" to use sanitizers even without ] 3301 [sanitizers, or specify "auto-fallback" to use sanitizers even without ]
3302 [installed sanitizer run-time library])], 3302 [installed sanitizer run-time library])],
3303 [], [AS_CASE([${enable_build_type}],[debug], 3303 [], [AS_CASE([${enable_build_type}],[debug],
diff --git a/doc/chapters/websocket.inc b/doc/chapters/websocket.inc
index e1cbdc2b..a091bfa0 100644
--- a/doc/chapters/websocket.inc
+++ b/doc/chapters/websocket.inc
@@ -105,7 +105,7 @@ to @code{MHD_upgrade_action()}.
105 105
106Depending of the flags specified while calling @code{MHD_start_deamon()} 106Depending of the flags specified while calling @code{MHD_start_deamon()}
107our @code{upgrade_handler} is either executed in the same thread 107our @code{upgrade_handler} is either executed in the same thread
108as our deamon or in a thread specific for each connection. 108as our daemon or in a thread specific for each connection.
109If it is executed in the same thread then @code{upgrade_handler} is 109If it is executed in the same thread then @code{upgrade_handler} is
110a blocking call for our webserver and 110a blocking call for our webserver and
111we should finish it as fast as possible (i. e. by creating a thread and 111we should finish it as fast as possible (i. e. by creating a thread and
@@ -436,7 +436,7 @@ to the websocket protocol.
436To use received payload data, you need to decode the frame data first. 436To use received payload data, you need to decode the frame data first.
437To send payload data, you need to encode it into frame data first. 437To send payload data, you need to encode it into frame data first.
438 438
439@emph{libmicrohttpd_ws} provides serveral functions for encoding of 439@emph{libmicrohttpd_ws} provides several functions for encoding of
440payload data and decoding of frame data: 440payload data and decoding of frame data:
441 441
442@itemize @bullet 442@itemize @bullet
diff --git a/doc/libmicrohttpd.texi b/doc/libmicrohttpd.texi
index 265496a0..b1ae347d 100644
--- a/doc/libmicrohttpd.texi
+++ b/doc/libmicrohttpd.texi
@@ -4459,7 +4459,7 @@ should be @code{NULL}.
4459This parameter is a pointer to a variable which contains the last check status 4459This parameter is a pointer to a variable which contains the last check status
4460of the UTF-8 sequence. It is required to continue a previous 4460of the UTF-8 sequence. It is required to continue a previous
4461UTF-8 sequence check when fragmentation is used, because a UTF-8 sequence 4461UTF-8 sequence check when fragmentation is used, because a UTF-8 sequence
4462could be splitted upon fragments. 4462could be split upon fragments.
4463 4463
4464@code{enum MHD_WEBSOCKET_UTF8STEP} is used for this value. 4464@code{enum MHD_WEBSOCKET_UTF8STEP} is used for this value.
4465If you start a new fragment using 4465If you start a new fragment using
diff --git a/m4/mhd_check_cc_cflag.m4 b/m4/mhd_check_cc_cflag.m4
index f387495b..bdac60ec 100644
--- a/m4/mhd_check_cc_cflag.m4
+++ b/m4/mhd_check_cc_cflag.m4
@@ -9,7 +9,7 @@
9# The check is performing by prepending FLAG-TO-TEST to CFLAGS, then 9# The check is performing by prepending FLAG-TO-TEST to CFLAGS, then
10# prepending value of VARIABLE-TO-PREPEND-CFLAGS (if any) to CFLAGS, and 10# prepending value of VARIABLE-TO-PREPEND-CFLAGS (if any) to CFLAGS, and
11# then performing compile and link test. If test succeed without warnings, 11# then performing compile and link test. If test succeed without warnings,
12# then the flag is considered to be suppoted. Otherwise, if compile and link 12# then the flag is considered to be supported. Otherwise, if compile and link
13# without test flag can be done without any warning, the flag is considered 13# without test flag can be done without any warning, the flag is considered
14# to be unsuppoted. 14# to be unsuppoted.
15# 15#
diff --git a/m4/mhd_check_cc_ldflag.m4 b/m4/mhd_check_cc_ldflag.m4
index e5f57953..9eb5b96b 100644
--- a/m4/mhd_check_cc_ldflag.m4
+++ b/m4/mhd_check_cc_ldflag.m4
@@ -9,7 +9,7 @@
9# The check is performing by prepending FLAG-TO-TEST to LDFLAGS, then 9# The check is performing by prepending FLAG-TO-TEST to LDFLAGS, then
10# prepending value of VARIABLE-TO-PREPEND-LDFLAGS (if any) to LDFLAGS, and 10# prepending value of VARIABLE-TO-PREPEND-LDFLAGS (if any) to LDFLAGS, and
11# then performing compile and link test. If test succeed without warnings, 11# then performing compile and link test. If test succeed without warnings,
12# then the flag is considered to be suppoted. Otherwise, if compile and link 12# then the flag is considered to be supported. Otherwise, if compile and link
13# without test flag can be done without any warning, the flag is considered 13# without test flag can be done without any warning, the flag is considered
14# to be unsuppoted. 14# to be unsuppoted.
15# 15#
diff --git a/src/include/microhttpd_ws.h b/src/include/microhttpd_ws.h
index 27da0553..a1322388 100644
--- a/src/include/microhttpd_ws.h
+++ b/src/include/microhttpd_ws.h
@@ -23,7 +23,7 @@
23 */ 23 */
24/* 24/*
25 * *** WARNING! *** 25 * *** WARNING! ***
26 * * The websockets interface is currenly in "experimental" stage. * 26 * * The websockets interface is currently in "experimental" stage. *
27 * * It does not work on architectures with endianness different from * 27 * * It does not work on architectures with endianness different from *
28 * * big endian and little endian and may have some portability issues.* 28 * * big endian and little endian and may have some portability issues.*
29 * * API and ABI are not yet stable. * 29 * * API and ABI are not yet stable. *
diff --git a/src/microhttpd/digestauth.c b/src/microhttpd/digestauth.c
index 1e25fa4a..35c2deb5 100644
--- a/src/microhttpd/digestauth.c
+++ b/src/microhttpd/digestauth.c
@@ -651,7 +651,7 @@ get_rq_dauth_params (struct MHD_Connection *connection)
651/** 651/**
652 * Extract timestamp from the given nonce. 652 * Extract timestamp from the given nonce.
653 * @param nonce the nonce to check 653 * @param nonce the nonce to check
654 * @param noncelen the lenght of the nonce, zero for autodetect 654 * @param noncelen the length of the nonce, zero for autodetect
655 * @param[out] ptimestamp the pointer to store extracted timestamp 655 * @param[out] ptimestamp the pointer to store extracted timestamp
656 * @return true if timestamp was extracted, 656 * @return true if timestamp was extracted,
657 * false if nonce does not have valid timestamp. 657 * false if nonce does not have valid timestamp.
@@ -709,7 +709,7 @@ fast_simple_hash (const uint8_t *data,
709 * 709 *
710 * @param arr_size the size of nonce_nc array 710 * @param arr_size the size of nonce_nc array
711 * @param nonce the pointer that referenced a zero-terminated array of nonce 711 * @param nonce the pointer that referenced a zero-terminated array of nonce
712 * @param noncelen the lenth of @a nonce, in characters 712 * @param noncelen the length of @a nonce, in characters
713 * @return #MHD_YES if successful, #MHD_NO if invalid (or we have no NC array) 713 * @return #MHD_YES if successful, #MHD_NO if invalid (or we have no NC array)
714 */ 714 */
715static size_t 715static size_t
@@ -1065,7 +1065,7 @@ is_slot_available (const struct MHD_NonceNc *const nn,
1065 * @param connection the MHD connection structure 1065 * @param connection the MHD connection structure
1066 * @param timestamp the current timestamp 1066 * @param timestamp the current timestamp
1067 * @param realm the string of characters that describes the realm of auth 1067 * @param realm the string of characters that describes the realm of auth
1068 * @param realm_len the lenght of the @a realm 1068 * @param realm_len the length of the @a realm
1069 * @param da the digest algorithm to use 1069 * @param da the digest algorithm to use
1070 * @param[out] nonce the pointer to a character array for the nonce to put in, 1070 * @param[out] nonce the pointer to a character array for the nonce to put in,
1071 * must provide NONCE_STD_LEN(da->digest_size)+1 bytes 1071 * must provide NONCE_STD_LEN(da->digest_size)+1 bytes
@@ -1377,7 +1377,7 @@ get_buffer_for_size (char tmp1[_MHD_STATIC_UNQ_BUFFER_SIZE],
1377enum _MHD_GetUnqResult 1377enum _MHD_GetUnqResult
1378{ 1378{
1379 _MHD_UNQ_OK = 0, /**< Got unquoted string */ 1379 _MHD_UNQ_OK = 0, /**< Got unquoted string */
1380 _MHD_UNQ_TOO_LARGE = -7, /**< The string is too large to unqoute */ 1380 _MHD_UNQ_TOO_LARGE = -7, /**< The string is too large to unquote */
1381 _MHD_UNQ_OUT_OF_MEM = 3 /**< Out of memory error */ 1381 _MHD_UNQ_OUT_OF_MEM = 3 /**< Out of memory error */
1382}; 1382};
1383 1383
@@ -1536,8 +1536,8 @@ digest_auth_check_all_inner (struct MHD_Connection *connection,
1536 uint64_t nci; 1536 uint64_t nci;
1537 char *qmark; 1537 char *qmark;
1538 const struct MHD_RqDAuth *params; 1538 const struct MHD_RqDAuth *params;
1539 char tmp1[_MHD_STATIC_UNQ_BUFFER_SIZE]; /**< Temporal buffer in stack for unqouting */ 1539 char tmp1[_MHD_STATIC_UNQ_BUFFER_SIZE]; /**< Temporal buffer in stack for unquoting */
1540 char **const ptmp2 = pbuf; /**< Temporal malloc'ed buffer for unqouting */ 1540 char **const ptmp2 = pbuf; /**< Temporal malloc'ed buffer for unquoting */
1541 size_t tmp2_size; /**< The size of @a tmp2 buffer */ 1541 size_t tmp2_size; /**< The size of @a tmp2 buffer */
1542 struct _MHD_str_w_len unquoted; 1542 struct _MHD_str_w_len unquoted;
1543 struct _MHD_mstr_w_len unq_copy; 1543 struct _MHD_mstr_w_len unq_copy;
diff --git a/src/microhttpd_ws/test_websocket.c b/src/microhttpd_ws/test_websocket.c
index 00fd8e03..b824b9ce 100644
--- a/src/microhttpd_ws/test_websocket.c
+++ b/src/microhttpd_ws/test_websocket.c
@@ -9838,7 +9838,7 @@ test_check_upgrade_header ()
9838 (unsigned int) __LINE__); 9838 (unsigned int) __LINE__);
9839 ++failed; 9839 ++failed;
9840 } 9840 }
9841 /* Edge test (success): All allowed token characters plus /, then websocket keyowrd */ 9841 /* Edge test (success): All allowed token characters plus /, then websocket keyword */
9842 ret = MHD_websocket_check_upgrade_header ( 9842 ret = MHD_websocket_check_upgrade_header (
9843 "!#$%&'*+-.^_`|~0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz/,websocket"); 9843 "!#$%&'*+-.^_`|~0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz/,websocket");
9844 if (MHD_WEBSOCKET_STATUS_OK != ret) 9844 if (MHD_WEBSOCKET_STATUS_OK != ret)