commit 0b22e20357dad582e4b7a7a45b6e68102fb27b43
parent 69c600bd8510c3ec94f1f4ca8557e42832d6c142
Author: Evgeny Grin (Karlson2k) <k2k@narod.ru>
Date: Mon, 19 Apr 2021 15:52:05 +0300
log messaged-related minor fixes
Diffstat:
2 files changed, 28 insertions(+), 25 deletions(-)
diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c
@@ -798,6 +798,7 @@ connection_close_error (struct MHD_Connection *connection,
#ifdef HAVE_MESSAGES
if (NULL != emsg)
MHD_DLOG (connection->daemon,
+ "%s\n",
emsg);
#else /* ! HAVE_MESSAGES */
(void) emsg; /* Mute compiler warning. */
@@ -855,7 +856,7 @@ try_ready_normal_body (struct MHD_Connection *connection)
MHD_mutex_unlock_chk_ (&response->mutex);
/* not enough memory */
CONNECTION_CLOSE_ERROR (connection,
- _ ("Closing connection (out of memory).\n"));
+ _ ("Closing connection (out of memory)."));
return MHD_NO;
}
memcpy (connection->resp_iov.iov,
@@ -900,7 +901,7 @@ try_ready_normal_body (struct MHD_Connection *connection)
else
CONNECTION_CLOSE_ERROR (connection,
_ (
- "Closing connection (application reported error generating data).\n"));
+ "Closing connection (application reported error generating data)."));
return MHD_NO;
}
response->data_start = connection->response_write_position;
@@ -949,7 +950,7 @@ try_ready_chunked_body (struct MHD_Connection *connection)
#endif
/* not enough memory */
CONNECTION_CLOSE_ERROR (connection,
- _ ("Closing connection (out of memory).\n"));
+ _ ("Closing connection (out of memory)."));
return MHD_NO;
}
if ( (2 * (0xFFFFFF + sizeof(cbuf) + 2)) < size)
@@ -997,7 +998,7 @@ try_ready_chunked_body (struct MHD_Connection *connection)
#endif
CONNECTION_CLOSE_ERROR (connection,
_ (
- "Closing connection (application error generating response).\n"));
+ "Closing connection (application error generating response)."));
return MHD_NO;
}
if ( (((ssize_t) MHD_CONTENT_READER_END_OF_STREAM) == ret) ||
@@ -1667,7 +1668,7 @@ transmit_error_response (struct MHD_Connection *connection,
/* can't even send a reply, at least close the connection */
CONNECTION_CLOSE_ERROR (connection,
_ (
- "Closing connection (failed to queue response).\n"));
+ "Closing connection (failed to queue response)."));
return;
}
mhd_assert (NULL != connection->response);
@@ -1678,7 +1679,7 @@ transmit_error_response (struct MHD_Connection *connection,
/* oops - close! */
CONNECTION_CLOSE_ERROR (connection,
_ (
- "Closing connection (failed to create response header).\n"));
+ "Closing connection (failed to create response header)."));
}
else
{
@@ -2220,7 +2221,7 @@ call_connection_handler (struct MHD_Connection *connection)
/* serious internal error, close connection */
CONNECTION_CLOSE_ERROR (connection,
_ (
- "Application reported internal error, closing connection.\n"));
+ "Application reported internal error, closing connection."));
return;
}
}
@@ -2289,7 +2290,7 @@ process_request_body (struct MHD_Connection *connection)
/* malformed encoding */
CONNECTION_CLOSE_ERROR (connection,
_ (
- "Received malformed HTTP request (bad chunked encoding). Closing connection.\n"));
+ "Received malformed HTTP request (bad chunked encoding). Closing connection."));
return;
}
available -= i;
@@ -2368,7 +2369,7 @@ process_request_body (struct MHD_Connection *connection)
/* malformed encoding */
CONNECTION_CLOSE_ERROR (connection,
_ (
- "Received malformed HTTP request (bad chunked encoding). Closing connection.\n"));
+ "Received malformed HTTP request (bad chunked encoding). Closing connection."));
return;
}
/* skip 2nd part of line feed */
@@ -2424,7 +2425,7 @@ process_request_body (struct MHD_Connection *connection)
/* serious internal error, close connection */
CONNECTION_CLOSE_ERROR (connection,
_ (
- "Application reported internal error, closing connection.\n"));
+ "Application reported internal error, closing connection."));
return;
}
if (left_unprocessed > to_be_processed)
@@ -2522,7 +2523,7 @@ process_header_line (struct MHD_Connection *connection,
/* error in header line, die hard */
CONNECTION_CLOSE_ERROR (connection,
_ (
- "Received malformed line (no colon). Closing connection.\n"));
+ "Received malformed line (no colon). Closing connection."));
return MHD_NO;
}
if (-1 >= connection->daemon->strict_for_client)
@@ -2697,7 +2698,7 @@ parse_connection_headers (struct MHD_Connection *connection)
/* can't even send a reply, at least close the connection */
CONNECTION_CLOSE_ERROR (connection,
_ (
- "Closing connection (failed to create response).\n"));
+ "Closing connection (failed to create response)."));
return;
}
iret = MHD_queue_response (connection,
@@ -2709,7 +2710,7 @@ parse_connection_headers (struct MHD_Connection *connection)
/* can't even send a reply, at least close the connection */
CONNECTION_CLOSE_ERROR (connection,
_ (
- "Closing connection (failed to queue response).\n"));
+ "Closing connection (failed to queue response)."));
}
return;
}
@@ -2746,7 +2747,8 @@ parse_connection_headers (struct MHD_Connection *connection)
connection->remaining_upload_size = 0;
#ifdef HAVE_MESSAGES
MHD_DLOG (connection->daemon,
- "Failed to parse `Content-Length' header. Closing connection.\n");
+ _ (
+ "Failed to parse `Content-Length' header. Closing connection.\n"));
#endif
CONNECTION_CLOSE_ERROR (connection,
NULL);
@@ -2847,14 +2849,14 @@ MHD_connection_handle_read (struct MHD_Connection *connection)
(MHD_CONNECTION_INIT == connection->state) ?
NULL :
_ (
- "Socket disconnected while reading request.\n"));
+ "Socket disconnected while reading request."));
return;
}
CONNECTION_CLOSE_ERROR (connection,
(MHD_CONNECTION_INIT == connection->state) ?
NULL :
_ (
- "Connection socket is closed due to error when reading request.\n"));
+ "Connection socket is closed due to error when reading request."));
return;
}
@@ -3689,7 +3691,7 @@ MHD_connection_handle_idle (struct MHD_Connection *connection)
/* oops - close! */
CONNECTION_CLOSE_ERROR (connection,
_ (
- "Closing connection (failed to create response header).\n"));
+ "Closing connection (failed to create response header)."));
continue;
}
if ( (! connection->have_chunked_upload) ||
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
@@ -562,7 +562,7 @@ MHD_init_daemon_certificate (struct MHD_Daemon *daemon)
{
#ifdef HAVE_MESSAGES
MHD_DLOG (daemon,
- "Too long trust certificate.\n");
+ _ ("Too long trust certificate.\n"));
#endif
return -1;
}
@@ -574,7 +574,7 @@ MHD_init_daemon_certificate (struct MHD_Daemon *daemon)
{
#ifdef HAVE_MESSAGES
MHD_DLOG (daemon,
- "Bad trust certificate format.\n");
+ _ ("Bad trust certificate format.\n"));
#endif
return -1;
}
@@ -599,7 +599,7 @@ MHD_init_daemon_certificate (struct MHD_Daemon *daemon)
{
#ifdef HAVE_MESSAGES
MHD_DLOG (daemon,
- "Too long key or certificate.\n");
+ _ ("Too long key or certificate.\n"));
#endif
return -1;
}
@@ -634,7 +634,7 @@ MHD_init_daemon_certificate (struct MHD_Daemon *daemon)
#ifdef HAVE_MESSAGES
if (0 != ret)
MHD_DLOG (daemon,
- "GnuTLS failed to setup x509 certificate/key: %s\n",
+ _ ("GnuTLS failed to setup x509 certificate/key: %s\n"),
gnutls_strerror (ret));
#endif
return ret;
@@ -649,7 +649,7 @@ MHD_init_daemon_certificate (struct MHD_Daemon *daemon)
#endif
#ifdef HAVE_MESSAGES
MHD_DLOG (daemon,
- "You need to specify a certificate and key location.\n");
+ _ ("You need to specify a certificate and key location.\n"));
#endif
return -1;
}
@@ -2447,7 +2447,7 @@ new_connection_prepare_ (struct MHD_Daemon *daemon,
eno = errno;
#ifdef HAVE_MESSAGES
MHD_DLOG (daemon,
- "Error allocating memory: %s\n",
+ _ ("Error allocating memory: %s\n"),
MHD_strerror_ (errno));
#endif
MHD_socket_close_chk_ (client_socket);
@@ -2754,7 +2754,7 @@ new_connection_process_ (struct MHD_Daemon *daemon,
eno = errno;
#ifdef HAVE_MESSAGES
MHD_DLOG (daemon,
- "Failed to create a thread: %s\n",
+ _ ("Failed to create a thread: %s\n"),
MHD_strerror_ (eno));
#endif
goto cleanup;
@@ -5355,7 +5355,8 @@ MHD_quiesce_daemon (struct MHD_Daemon *daemon)
{
#ifdef HAVE_MESSAGES
MHD_DLOG (daemon,
- "Using MHD_quiesce_daemon in this mode requires MHD_USE_ITC.\n");
+ _ (
+ "Using MHD_quiesce_daemon in this mode requires MHD_USE_ITC.\n"));
#endif
return MHD_INVALID_SOCKET;
}
