commit 9829eb349801efd7bc89fc791bb0f9e8f18221a6
parent 61fa3896442b5629e28d36d4e9e924440e03d873
Author: Evgeny Grin (Karlson2k) <k2k@narod.ru>
Date: Fri, 16 Apr 2021 17:17:28 +0300
Formatting and minor fix for 61fa3896442b5629e28d36d4e9e924440e03d873
Diffstat:
2 files changed, 30 insertions(+), 32 deletions(-)
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
@@ -6713,8 +6713,6 @@ MHD_start_daemon_va (unsigned int flags,
servaddr = (struct sockaddr *) &servaddr4;
}
}
- else
- daemon->listen_is_unix = _MHD_UNKNOWN;
daemon->listen_fd = listen_fd;
if (0 != (*pflags & MHD_USE_IPv6))
{
diff --git a/src/microhttpd/mhd_send.c b/src/microhttpd/mhd_send.c
@@ -189,23 +189,23 @@ MHD_connection_set_nodelay_state_ (struct MHD_Connection *connection,
err_code = MHD_socket_get_error_ ();
switch (err_code)
{
- case EINVAL:
- case ENOPROTOOPT:
- case ENOTSOCK:
- if (_MHD_NO == connection->is_nonip)
- {
+ case EINVAL:
+ case ENOPROTOOPT:
+ case ENOTSOCK:
+ if (_MHD_NO == connection->is_nonip)
+ {
#ifdef HAVE_MESSAGES
- MHD_DLOG (connection->daemon,
- _ ("Setting %s option to %s state failed "
- "for TCP/IP socket %d: %s\n"),
- "TCP_NODELAY",
- nodelay_state ? _ ("ON") : _ ("OFF"),
- (int) connection->socket_fd,
- MHD_socket_strerr_ (err_code));
+ MHD_DLOG (connection->daemon,
+ _ ("Setting %s option to %s state failed "
+ "for TCP/IP socket %d: %s\n"),
+ "TCP_NODELAY",
+ nodelay_state ? _ ("ON") : _ ("OFF"),
+ (int) connection->socket_fd,
+ MHD_socket_strerr_ (err_code));
#endif /* HAVE_MESSAGES */
- }
- else
- connection->is_nonip = _MHD_YES;
+ }
+ else
+ connection->is_nonip = _MHD_YES;
break;
case EBADF:
case EFAULT:
@@ -258,23 +258,23 @@ connection_set_cork_state_ (struct MHD_Connection *connection,
err_code = MHD_socket_get_error_ ();
switch (err_code)
{
- case EINVAL:
- case ENOPROTOOPT:
- case ENOTSOCK:
- if (_MHD_NO == connection->is_nonip)
- {
+ case EINVAL:
+ case ENOPROTOOPT:
+ case ENOTSOCK:
+ if (_MHD_NO == connection->is_nonip)
+ {
#ifdef HAVE_MESSAGES
- MHD_DLOG (connection->daemon,
- _ ("Setting %s option to %s state failed "
- "for TCP/IP socket %d: %s\n"),
- "TCP_NODELAY",
- nodelay_state ? _ ("ON") : _ ("OFF"),
- (int) connection->socket_fd,
- MHD_socket_strerr_ (err_code));
+ MHD_DLOG (connection->daemon,
+ _ ("Setting %s option to %s state failed "
+ "for TCP/IP socket %d: %s\n"),
+ "TCP_NODELAY",
+ nodelay_state ? _ ("ON") : _ ("OFF"),
+ (int) connection->socket_fd,
+ MHD_socket_strerr_ (err_code));
#endif /* HAVE_MESSAGES */
- }
- else
- connection->is_nonip = _MHD_YES;
+ }
+ else
+ connection->is_nonip = _MHD_YES;
break;
case EBADF:
case EFAULT: