aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeny Grin (Karlson2k) <k2k@narod.ru>2021-11-28 19:38:18 +0300
committerEvgeny Grin (Karlson2k) <k2k@narod.ru>2021-11-28 19:38:18 +0300
commitdbf407c26a3d76a26c1a28fbb8f7b810bcdbf16f (patch)
tree2efe07e4bcf2fcfb16b4fc07c1899ca59c7d0e7a
parent679f259b952f418a8cf5edec9c071f3fa0e5850e (diff)
downloadlibmicrohttpd-dbf407c26a3d76a26c1a28fbb8f7b810bcdbf16f.tar.gz
libmicrohttpd-dbf407c26a3d76a26c1a28fbb8f7b810bcdbf16f.zip
Fixed MHD_FEATURE_AUTOSUPPRESS_SIGPIPE return value
-rw-r--r--src/include/microhttpd.h2
-rw-r--r--src/microhttpd/daemon.c4
-rw-r--r--src/microhttpd/mhd_sockets.h4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h
index 6d9fa67d..3b755e5d 100644
--- a/src/include/microhttpd.h
+++ b/src/include/microhttpd.h
@@ -4543,7 +4543,7 @@ enum MHD_FEATURE
4543 MHD_FEATURE_AUTODETECT_BIND_PORT = 19, 4543 MHD_FEATURE_AUTODETECT_BIND_PORT = 19,
4544 4544
4545 /** 4545 /**
4546 * Get whether MHD support SIGPIPE suppression. 4546 * Get whether MHD supports automatic SIGPIPE suppression.
4547 * If SIGPIPE suppression is not supported, application must handle 4547 * If SIGPIPE suppression is not supported, application must handle
4548 * SIGPIPE signal by itself. 4548 * SIGPIPE signal by itself.
4549 */ 4549 */
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 95f10fdd..25ac0969 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -8035,8 +8035,8 @@ MHD_is_feature_supported (enum MHD_FEATURE feature)
8035 return MHD_NO; 8035 return MHD_NO;
8036#endif 8036#endif
8037 case MHD_FEATURE_AUTOSUPPRESS_SIGPIPE: 8037 case MHD_FEATURE_AUTOSUPPRESS_SIGPIPE:
8038#if defined(MHD_SEND_SPIPE_SUPPRESS_POSSIBLE) && \ 8038#if defined(MHD_SEND_SPIPE_SUPPRESS_POSSIBLE) || \
8039 defined(MHD_SEND_SPIPE_SUPPRESS_NEEDED) 8039 ! defined(MHD_SEND_SPIPE_SUPPRESS_NEEDED)
8040 return MHD_YES; 8040 return MHD_YES;
8041#else 8041#else
8042 return MHD_NO; 8042 return MHD_NO;
diff --git a/src/microhttpd/mhd_sockets.h b/src/microhttpd/mhd_sockets.h
index d46f10a9..35fdf6b4 100644
--- a/src/microhttpd/mhd_sockets.h
+++ b/src/microhttpd/mhd_sockets.h
@@ -926,8 +926,8 @@ static const int _MHD_socket_int_one = 1;
926/** 926/**
927 * Indicate that SIGPIPE can be suppressed by MHD for normal send() by flags 927 * Indicate that SIGPIPE can be suppressed by MHD for normal send() by flags
928 * or socket options. 928 * or socket options.
929 * If this macro is undefined, MHD cannot suppress SIGPIPE for normal 929 * If this macro is undefined, MHD cannot suppress SIGPIPE for socket functions
930 * processing so sendfile() or writev() calls is not avoided. 930 * so sendfile() or writev() calls are avoided in application threads.
931 */ 931 */
932#define MHD_SEND_SPIPE_SUPPRESS_POSSIBLE 1 932#define MHD_SEND_SPIPE_SUPPRESS_POSSIBLE 1
933#endif /* MHD_WINSOCK_SOCKETS || MHD_socket_nosignal_ || MSG_NOSIGNAL */ 933#endif /* MHD_WINSOCK_SOCKETS || MHD_socket_nosignal_ || MSG_NOSIGNAL */