diff options
author | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2021-04-16 17:17:28 +0300 |
---|---|---|
committer | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2021-04-16 17:17:28 +0300 |
commit | 9829eb349801efd7bc89fc791bb0f9e8f18221a6 (patch) | |
tree | c2c72afb139ae29193110d2a0838b63ff5dd88b1 /src | |
parent | 61fa3896442b5629e28d36d4e9e924440e03d873 (diff) | |
download | libmicrohttpd-9829eb349801efd7bc89fc791bb0f9e8f18221a6.tar.gz libmicrohttpd-9829eb349801efd7bc89fc791bb0f9e8f18221a6.zip |
Formatting and minor fix for 61fa3896442b5629e28d36d4e9e924440e03d873
Diffstat (limited to 'src')
-rw-r--r-- | src/microhttpd/daemon.c | 2 | ||||
-rw-r--r-- | src/microhttpd/mhd_send.c | 60 |
2 files changed, 30 insertions, 32 deletions
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c index 294ed722..b91278a9 100644 --- a/src/microhttpd/daemon.c +++ b/src/microhttpd/daemon.c | |||
@@ -6713,8 +6713,6 @@ MHD_start_daemon_va (unsigned int flags, | |||
6713 | servaddr = (struct sockaddr *) &servaddr4; | 6713 | servaddr = (struct sockaddr *) &servaddr4; |
6714 | } | 6714 | } |
6715 | } | 6715 | } |
6716 | else | ||
6717 | daemon->listen_is_unix = _MHD_UNKNOWN; | ||
6718 | daemon->listen_fd = listen_fd; | 6716 | daemon->listen_fd = listen_fd; |
6719 | if (0 != (*pflags & MHD_USE_IPv6)) | 6717 | if (0 != (*pflags & MHD_USE_IPv6)) |
6720 | { | 6718 | { |
diff --git a/src/microhttpd/mhd_send.c b/src/microhttpd/mhd_send.c index 7637773e..02079c03 100644 --- 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, | |||
189 | err_code = MHD_socket_get_error_ (); | 189 | err_code = MHD_socket_get_error_ (); |
190 | switch (err_code) | 190 | switch (err_code) |
191 | { | 191 | { |
192 | case EINVAL: | 192 | case EINVAL: |
193 | case ENOPROTOOPT: | 193 | case ENOPROTOOPT: |
194 | case ENOTSOCK: | 194 | case ENOTSOCK: |
195 | if (_MHD_NO == connection->is_nonip) | 195 | if (_MHD_NO == connection->is_nonip) |
196 | { | 196 | { |
197 | #ifdef HAVE_MESSAGES | 197 | #ifdef HAVE_MESSAGES |
198 | MHD_DLOG (connection->daemon, | 198 | MHD_DLOG (connection->daemon, |
199 | _ ("Setting %s option to %s state failed " | 199 | _ ("Setting %s option to %s state failed " |
200 | "for TCP/IP socket %d: %s\n"), | 200 | "for TCP/IP socket %d: %s\n"), |
201 | "TCP_NODELAY", | 201 | "TCP_NODELAY", |
202 | nodelay_state ? _ ("ON") : _ ("OFF"), | 202 | nodelay_state ? _ ("ON") : _ ("OFF"), |
203 | (int) connection->socket_fd, | 203 | (int) connection->socket_fd, |
204 | MHD_socket_strerr_ (err_code)); | 204 | MHD_socket_strerr_ (err_code)); |
205 | #endif /* HAVE_MESSAGES */ | 205 | #endif /* HAVE_MESSAGES */ |
206 | } | 206 | } |
207 | else | 207 | else |
208 | connection->is_nonip = _MHD_YES; | 208 | connection->is_nonip = _MHD_YES; |
209 | break; | 209 | break; |
210 | case EBADF: | 210 | case EBADF: |
211 | case EFAULT: | 211 | case EFAULT: |
@@ -258,23 +258,23 @@ connection_set_cork_state_ (struct MHD_Connection *connection, | |||
258 | err_code = MHD_socket_get_error_ (); | 258 | err_code = MHD_socket_get_error_ (); |
259 | switch (err_code) | 259 | switch (err_code) |
260 | { | 260 | { |
261 | case EINVAL: | 261 | case EINVAL: |
262 | case ENOPROTOOPT: | 262 | case ENOPROTOOPT: |
263 | case ENOTSOCK: | 263 | case ENOTSOCK: |
264 | if (_MHD_NO == connection->is_nonip) | 264 | if (_MHD_NO == connection->is_nonip) |
265 | { | 265 | { |
266 | #ifdef HAVE_MESSAGES | 266 | #ifdef HAVE_MESSAGES |
267 | MHD_DLOG (connection->daemon, | 267 | MHD_DLOG (connection->daemon, |
268 | _ ("Setting %s option to %s state failed " | 268 | _ ("Setting %s option to %s state failed " |
269 | "for TCP/IP socket %d: %s\n"), | 269 | "for TCP/IP socket %d: %s\n"), |
270 | "TCP_NODELAY", | 270 | "TCP_NODELAY", |
271 | nodelay_state ? _ ("ON") : _ ("OFF"), | 271 | nodelay_state ? _ ("ON") : _ ("OFF"), |
272 | (int) connection->socket_fd, | 272 | (int) connection->socket_fd, |
273 | MHD_socket_strerr_ (err_code)); | 273 | MHD_socket_strerr_ (err_code)); |
274 | #endif /* HAVE_MESSAGES */ | 274 | #endif /* HAVE_MESSAGES */ |
275 | } | 275 | } |
276 | else | 276 | else |
277 | connection->is_nonip = _MHD_YES; | 277 | connection->is_nonip = _MHD_YES; |
278 | break; | 278 | break; |
279 | case EBADF: | 279 | case EBADF: |
280 | case EFAULT: | 280 | case EFAULT: |