mirror of
https://git.gnunet.org/libmicrohttpd.git
synced 2026-09-25 04:09:31 +03:00
Sanitized all log and error messages.
This commit is contained in:
@@ -344,7 +344,7 @@ main ()
|
||||
if (NULL == daemon)
|
||||
{
|
||||
fprintf (stderr,
|
||||
"Failed to start daemon\n");
|
||||
"Failed to start daemon.\n");
|
||||
return 1;
|
||||
}
|
||||
(void) getchar ();
|
||||
|
||||
@@ -120,7 +120,7 @@ main (int argc, char *const *argv)
|
||||
NULL, NULL, &ahc_echo, PAGE, MHD_OPTION_END);
|
||||
if (d == NULL)
|
||||
return 1;
|
||||
fprintf (stderr, "HTTP server running. Press ENTER to stop the server\n");
|
||||
fprintf (stderr, "HTTP server running. Press ENTER to stop the server.\n");
|
||||
(void) getc (stdin);
|
||||
MHD_stop_daemon (d);
|
||||
return 0;
|
||||
|
||||
@@ -156,7 +156,7 @@ main (int argc, char *const *argv)
|
||||
(port > UINT16_MAX) )
|
||||
{
|
||||
fprintf (stderr,
|
||||
"Port must be a number between 1 and 65535\n");
|
||||
"Port must be a number between 1 and 65535.\n");
|
||||
return 1;
|
||||
}
|
||||
d = MHD_start_daemon (/* MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_ERROR_LOG, */
|
||||
|
||||
+2
-2
@@ -524,7 +524,7 @@ process_upload_data (void *cls,
|
||||
}
|
||||
if (NULL == filename)
|
||||
{
|
||||
fprintf (stderr, "No filename, aborting upload\n");
|
||||
fprintf (stderr, "No filename, aborting upload.\n");
|
||||
return MHD_NO; /* no filename, error */
|
||||
}
|
||||
if ( (NULL == uc->category) ||
|
||||
@@ -946,7 +946,7 @@ main (int argc, char *const *argv)
|
||||
MHD_OPTION_END);
|
||||
if (NULL == d)
|
||||
return 1;
|
||||
fprintf (stderr, "HTTP server running. Press ENTER to stop the server\n");
|
||||
fprintf (stderr, "HTTP server running. Press ENTER to stop the server.\n");
|
||||
(void) getc (stdin);
|
||||
MHD_stop_daemon (d);
|
||||
MHD_destroy_response (file_not_found_response);
|
||||
|
||||
@@ -527,7 +527,7 @@ process_upload_data (void *cls,
|
||||
}
|
||||
if (NULL == filename)
|
||||
{
|
||||
fprintf (stderr, "No filename, aborting upload\n");
|
||||
fprintf (stderr, "No filename, aborting upload.\n");
|
||||
return MHD_NO; /* no filename, error */
|
||||
}
|
||||
if ( (NULL == uc->category) ||
|
||||
@@ -1001,7 +1001,7 @@ main (int argc, char *const *argv)
|
||||
MHD_OPTION_END);
|
||||
if (NULL == d)
|
||||
return 1;
|
||||
fprintf (stderr, "HTTP server running. Press ENTER to stop the server\n");
|
||||
fprintf (stderr, "HTTP server running. Press ENTER to stop the server.\n");
|
||||
(void) getc (stdin);
|
||||
MHD_stop_daemon (d);
|
||||
MHD_destroy_response (file_not_found_response);
|
||||
|
||||
@@ -219,7 +219,7 @@ main (int argc, char *const *argv)
|
||||
MHD_OPTION_END);
|
||||
if (NULL == TLS_daemon)
|
||||
{
|
||||
fprintf (stderr, "Error: failed to start TLS_daemon\n");
|
||||
fprintf (stderr, "Error: failed to start TLS_daemon.\n");
|
||||
return 1;
|
||||
}
|
||||
printf ("MHD daemon listening on port %u\n",
|
||||
|
||||
+3
-3
@@ -134,17 +134,17 @@ MHD_TLS_init (void)
|
||||
#if defined(MHD_USE_POSIX_THREADS)
|
||||
if (0 != gcry_control (GCRYCTL_SET_THREAD_CBS,
|
||||
&gcry_threads_pthread))
|
||||
MHD_PANIC (_ ("Failed to initialise multithreading in libgcrypt\n"));
|
||||
MHD_PANIC (_ ("Failed to initialise multithreading in libgcrypt.\n"));
|
||||
#elif defined(MHD_W32_MUTEX_)
|
||||
if (0 != gcry_control (GCRYCTL_SET_THREAD_CBS,
|
||||
&gcry_threads_w32))
|
||||
MHD_PANIC (_ ("Failed to initialise multithreading in libgcrypt\n"));
|
||||
MHD_PANIC (_ ("Failed to initialise multithreading in libgcrypt.\n"));
|
||||
#endif /* defined(MHD_W32_MUTEX_) */
|
||||
gcry_check_version (NULL);
|
||||
#else
|
||||
if (NULL == gcry_check_version ("1.6.0"))
|
||||
MHD_PANIC (_ (
|
||||
"libgcrypt is too old. MHD was compiled for libgcrypt 1.6.0 or newer\n"));
|
||||
"libgcrypt is too old. MHD was compiled for libgcrypt 1.6.0 or newer.\n"));
|
||||
#endif
|
||||
#endif /* MHD_HTTPS_REQUIRE_GRYPT */
|
||||
gnutls_global_init ();
|
||||
|
||||
@@ -25,7 +25,7 @@ setup_connection ()
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (connection->daemon,
|
||||
_ (
|
||||
"Failed to setup TLS credentials: unknown credential type %d\n"),
|
||||
"Failed to setup TLS credentials: unknown credential type %d.\n"),
|
||||
daemon->cred_type);
|
||||
#endif
|
||||
MHD_socket_close_chk_ (client_socket);
|
||||
@@ -33,7 +33,7 @@ setup_connection ()
|
||||
addr,
|
||||
addrlen);
|
||||
free (connection);
|
||||
MHD_PANIC (_ ("Unknown credential type"));
|
||||
MHD_PANIC (_ ("Unknown credential type.\n"));
|
||||
#if EINVAL
|
||||
errno = EINVAL;
|
||||
#endif
|
||||
|
||||
@@ -85,7 +85,7 @@ suspend_action (void *cls,
|
||||
EPOLL_CTL_DEL,
|
||||
connection->socket_fd,
|
||||
NULL))
|
||||
MHD_PANIC (_ ("Failed to remove FD from epoll set\n"));
|
||||
MHD_PANIC (_ ("Failed to remove FD from epoll set.\n"));
|
||||
connection->epoll_state &= ~MHD_EPOLL_STATE_IN_EPOLL_SET;
|
||||
}
|
||||
connection->epoll_state |= MHD_EPOLL_STATE_SUSPENDED;
|
||||
|
||||
@@ -141,7 +141,7 @@ thread_main_handle_connection (void *data)
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (con->daemon,
|
||||
MHD_SC_SOCKET_OUTSIDE_OF_FDSET_RANGE,
|
||||
_ ("Failed to add FD to fd_set\n"));
|
||||
_ ("Failed to add FD to fd_set.\n"));
|
||||
#endif
|
||||
goto exit;
|
||||
}
|
||||
@@ -286,7 +286,7 @@ thread_main_handle_connection (void *data)
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (con->daemon,
|
||||
MHD_SC_SOCKET_OUTSIDE_OF_FDSET_RANGE,
|
||||
_ ("Failed to add FD to fd_set\n"));
|
||||
_ ("Failed to add FD to fd_set.\n"));
|
||||
#endif
|
||||
goto exit;
|
||||
}
|
||||
@@ -427,7 +427,7 @@ thread_main_handle_connection (void *data)
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (con->daemon,
|
||||
MHD_SC_THREAD_TERMINATING,
|
||||
_ ("Processing thread terminating. Closing connection\n"));
|
||||
_ ("Processing thread terminating. Closing connection.\n"));
|
||||
#endif
|
||||
#endif
|
||||
if (MHD_REQUEST_CLOSED != con->request.state)
|
||||
@@ -669,7 +669,7 @@ internal_add_connection (struct MHD_Daemon *daemon,
|
||||
#if DEBUG_CONNECT
|
||||
MHD_DLOG (daemon,
|
||||
MHD_SC_CONNECTION_ACCEPTED,
|
||||
_ ("Accepted connection on socket %d\n"),
|
||||
_ ("Accepted connection on socket %d.\n"),
|
||||
client_socket);
|
||||
#endif
|
||||
#endif
|
||||
@@ -893,7 +893,7 @@ internal_add_connection (struct MHD_Daemon *daemon,
|
||||
MHD_DLOG (daemon,
|
||||
MHD_SC_ITC_USE_FAILED,
|
||||
_ (
|
||||
"Failed to signal new connection via inter-thread communication channel (not necessarily fatal, continuing anyway)."));
|
||||
"Failed to signal new connection via inter-thread communication channel (not necessarily fatal, continuing anyway).\n"));
|
||||
#endif
|
||||
}
|
||||
return MHD_SC_OK;
|
||||
@@ -1124,7 +1124,7 @@ MHD_accept_connection_ (struct MHD_Daemon *daemon)
|
||||
#if DEBUG_CONNECT
|
||||
MHD_DLOG (daemon,
|
||||
MHD_SC_CONNECTION_ACCEPTED,
|
||||
_ ("Accepted connection on socket %d\n"),
|
||||
_ ("Accepted connection on socket %d.\n"),
|
||||
s);
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@@ -621,7 +621,7 @@ try_ready_normal_body (struct MHD_Request *request)
|
||||
CONNECTION_CLOSE_ERROR (connection,
|
||||
MHD_SC_APPLICATION_DATA_GENERATION_FAILURE_CLOSED,
|
||||
_ (
|
||||
"Closing connection (application reported error generating data)\n"));
|
||||
"Closing connection (application reported error generating data).\n"));
|
||||
return false;
|
||||
}
|
||||
response->data_start = request->response_write_position;
|
||||
@@ -671,7 +671,7 @@ try_ready_chunked_body (struct MHD_Request *request)
|
||||
/* not enough memory */
|
||||
CONNECTION_CLOSE_ERROR (connection,
|
||||
MHD_SC_CONNECTION_POOL_MALLOC_FAILURE,
|
||||
_ ("Closing connection (out of memory)\n"));
|
||||
_ ("Closing connection (out of memory).\n"));
|
||||
return false;
|
||||
}
|
||||
buf = MHD_pool_allocate (connection->pool,
|
||||
@@ -718,7 +718,7 @@ try_ready_chunked_body (struct MHD_Request *request)
|
||||
CONNECTION_CLOSE_ERROR (connection,
|
||||
MHD_SC_APPLICATION_DATA_GENERATION_FAILURE_CLOSED,
|
||||
_ (
|
||||
"Closing connection (application error generating response)\n"));
|
||||
"Closing connection (application error generating response).\n"));
|
||||
return false;
|
||||
}
|
||||
if ( (((ssize_t) MHD_CONTENT_READER_END_OF_STREAM) == ret) ||
|
||||
@@ -886,7 +886,7 @@ MHD_request_handle_write_ (struct MHD_Request *request)
|
||||
data_write_offset = request->response_write_position
|
||||
- response->data_start;
|
||||
if (data_write_offset > (uint64_t) SIZE_MAX)
|
||||
MHD_PANIC (_ ("Data offset exceeds limit"));
|
||||
MHD_PANIC (_ ("Data offset exceeds limit.\n"));
|
||||
ret = connection->send_cls (connection,
|
||||
&response->data
|
||||
[(size_t) data_write_offset],
|
||||
@@ -996,7 +996,7 @@ MHD_request_handle_write_ (struct MHD_Request *request)
|
||||
mhd_assert (0);
|
||||
CONNECTION_CLOSE_ERROR (connection,
|
||||
MHD_SC_STATEMACHINE_FAILURE_CONNECTION_CLOSED,
|
||||
_ ("Internal error\n"));
|
||||
_ ("Internal error.\n"));
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -1641,7 +1641,7 @@ transmit_error_response (struct MHD_Request *request,
|
||||
CONNECTION_CLOSE_ERROR (request->connection,
|
||||
ec,
|
||||
_ (
|
||||
"Closing connection (failed to create response header)\n"));
|
||||
"Closing connection (failed to create response header).\n"));
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -2768,7 +2768,7 @@ process_request_body (struct MHD_Request *request)
|
||||
__FILE__,
|
||||
__LINE__
|
||||
#ifdef HAVE_MESSAGES
|
||||
, _ ("libmicrohttpd API violation")
|
||||
, _ ("libmicrohttpd API violation.\n")
|
||||
#else
|
||||
, NULL
|
||||
#endif
|
||||
@@ -2872,7 +2872,7 @@ cleanup_connection (struct MHD_Connection *connection)
|
||||
MHD_DLOG (daemon,
|
||||
MHD_SC_ITC_USE_FAILED,
|
||||
_ (
|
||||
"Failed to signal end of connection via inter-thread communication channel"));
|
||||
"Failed to signal end of connection via inter-thread communication channel.\n"));
|
||||
#endif
|
||||
}
|
||||
}
|
||||
@@ -3366,7 +3366,7 @@ MHD_request_handle_idle_ (struct MHD_Request *request)
|
||||
CONNECTION_CLOSE_ERROR (connection,
|
||||
MHD_SC_FAILED_RESPONSE_HEADER_GENERATION,
|
||||
_ (
|
||||
"Closing connection (failed to create response header)\n"));
|
||||
"Closing connection (failed to create response header).\n"));
|
||||
continue;
|
||||
}
|
||||
request->state = MHD_REQUEST_HEADERS_SENDING;
|
||||
@@ -3481,7 +3481,7 @@ MHD_request_handle_idle_ (struct MHD_Request *request)
|
||||
CONNECTION_CLOSE_ERROR (connection,
|
||||
MHD_SC_FAILED_RESPONSE_HEADER_GENERATION,
|
||||
_ (
|
||||
"Closing connection (failed to create response header)\n"));
|
||||
"Closing connection (failed to create response header).\n"));
|
||||
continue;
|
||||
}
|
||||
if ( (! request->have_chunked_upload) ||
|
||||
|
||||
@@ -90,7 +90,7 @@ MHD_connection_cleanup_ (struct MHD_Daemon *daemon)
|
||||
if ( (MHD_TM_THREAD_PER_CONNECTION == daemon->threading_mode) &&
|
||||
(! pos->thread_joined) &&
|
||||
(! MHD_join_thread_ (pos->pid.handle)) )
|
||||
MHD_PANIC (_ ("Failed to join a thread\n"));
|
||||
MHD_PANIC (_ ("Failed to join a thread.\n"));
|
||||
#ifdef UPGRADE_SUPPORT
|
||||
connection_cleanup_upgraded (pos);
|
||||
#endif /* UPGRADE_SUPPORT */
|
||||
@@ -135,7 +135,7 @@ MHD_connection_cleanup_ (struct MHD_Daemon *daemon)
|
||||
EPOLL_CTL_DEL,
|
||||
pos->socket_fd,
|
||||
NULL))
|
||||
MHD_PANIC (_ ("Failed to remove FD from epoll set\n"));
|
||||
MHD_PANIC (_ ("Failed to remove FD from epoll set.\n"));
|
||||
pos->epoll_state &= ~MHD_EPOLL_STATE_IN_EPOLL_SET;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -56,7 +56,7 @@ MHD_connection_finish_forward_ (struct MHD_Connection *connection)
|
||||
connection->socket_fd,
|
||||
NULL)) )
|
||||
{
|
||||
MHD_PANIC (_ ("Failed to remove FD from epoll set\n"));
|
||||
MHD_PANIC (_ ("Failed to remove FD from epoll set.\n"));
|
||||
}
|
||||
if (urh->in_eready_list)
|
||||
{
|
||||
@@ -75,7 +75,7 @@ MHD_connection_finish_forward_ (struct MHD_Connection *connection)
|
||||
urh->mhd.socket,
|
||||
NULL)) )
|
||||
{
|
||||
MHD_PANIC (_ ("Failed to remove FD from epoll set\n"));
|
||||
MHD_PANIC (_ ("Failed to remove FD from epoll set.\n"));
|
||||
}
|
||||
#endif /* EPOLL_SUPPORT */
|
||||
/* Reflect remote disconnect to application by breaking
|
||||
|
||||
@@ -183,7 +183,7 @@ MHD_daemon_close_all_connections_ (struct MHD_Daemon *daemon)
|
||||
(! MHD_itc_activate_ (daemon->itc,
|
||||
"e")) )
|
||||
MHD_PANIC (_ (
|
||||
"Failed to signal shutdown via inter-thread communication channel"));
|
||||
"Failed to signal shutdown via inter-thread communication channel.\n"));
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -197,7 +197,7 @@ MHD_daemon_close_all_connections_ (struct MHD_Daemon *daemon)
|
||||
{
|
||||
MHD_mutex_unlock_chk_ (&daemon->cleanup_connection_mutex);
|
||||
if (! MHD_join_thread_ (pos->pid.handle))
|
||||
MHD_PANIC (_ ("Failed to join a thread\n"));
|
||||
MHD_PANIC (_ ("Failed to join a thread.\n"));
|
||||
MHD_mutex_lock_chk_ (&daemon->cleanup_connection_mutex);
|
||||
pos->thread_joined = true;
|
||||
/* The thread may have concurrently modified the DLL,
|
||||
@@ -227,7 +227,7 @@ MHD_daemon_close_all_connections_ (struct MHD_Daemon *daemon)
|
||||
{
|
||||
if ( (used_thr_p_c) &&
|
||||
(! pos->thread_joined) )
|
||||
MHD_PANIC (_ ("Failed to join a thread\n"));
|
||||
MHD_PANIC (_ ("Failed to join a thread.\n"));
|
||||
close_connection (pos);
|
||||
}
|
||||
MHD_connection_cleanup_ (daemon);
|
||||
|
||||
@@ -53,7 +53,7 @@ stop_workers (struct MHD_Daemon *daemon)
|
||||
if (! MHD_itc_activate_ (daemon->worker_pool[i].itc,
|
||||
"e"))
|
||||
MHD_PANIC (_ (
|
||||
"Failed to signal shutdown via inter-thread communication channel."));
|
||||
"Failed to signal shutdown via inter-thread communication channel.\n"));
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -121,7 +121,7 @@ MHD_daemon_destroy (struct MHD_Daemon *daemon)
|
||||
if (! MHD_itc_activate_ (daemon->itc,
|
||||
"e"))
|
||||
MHD_PANIC (_ (
|
||||
"Failed to signal shutdown via inter-thread communication channel"));
|
||||
"Failed to signal shutdown via inter-thread communication channel.\n"));
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -139,7 +139,7 @@ MHD_daemon_destroy (struct MHD_Daemon *daemon)
|
||||
|
||||
if (! MHD_join_thread_ (daemon->pid.handle))
|
||||
{
|
||||
MHD_PANIC (_ ("Failed to join a thread\n"));
|
||||
MHD_PANIC (_ ("Failed to join a thread.\n"));
|
||||
}
|
||||
/* close_all_connections() was called in daemon thread. */
|
||||
}
|
||||
|
||||
@@ -266,7 +266,7 @@ MHD_daemon_epoll_ (struct MHD_Daemon *daemon,
|
||||
EPOLL_CTL_DEL,
|
||||
ls,
|
||||
NULL))
|
||||
MHD_PANIC ("Failed to remove listen FD from epoll set\n");
|
||||
MHD_PANIC ("Failed to remove listen FD from epoll set.\n");
|
||||
daemon->listen_socket_in_epoll = false;
|
||||
}
|
||||
|
||||
@@ -303,7 +303,7 @@ MHD_daemon_epoll_ (struct MHD_Daemon *daemon,
|
||||
EPOLL_CTL_DEL,
|
||||
ls,
|
||||
NULL))
|
||||
MHD_PANIC (_ ("Failed to remove listen FD from epoll set\n"));
|
||||
MHD_PANIC (_ ("Failed to remove listen FD from epoll set.\n"));
|
||||
daemon->listen_socket_in_epoll = false;
|
||||
}
|
||||
|
||||
|
||||
@@ -58,7 +58,7 @@ MHD_daemon_get_timeout (struct MHD_Daemon *daemon,
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (daemon,
|
||||
MHD_SC_CONFIGURATION_MISMATCH_FOR_GET_TIMEOUT,
|
||||
_ ("Illegal call to MHD_get_timeout\n"));
|
||||
_ ("Illegal call to MHD_get_timeout.\n"));
|
||||
#endif
|
||||
return MHD_SC_CONFIGURATION_MISSMATCH_FOR_GET_TIMEOUT;
|
||||
}
|
||||
|
||||
@@ -221,7 +221,7 @@ MHD_ip_limit_add (struct MHD_Daemon *daemon,
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (daemon,
|
||||
MHD_SC_IP_COUNTER_FAILURE,
|
||||
_ ("Failed to add IP connection count node\n"));
|
||||
_ ("Failed to add IP connection count node.\n"));
|
||||
#endif
|
||||
MHD_ip_count_unlock (daemon);
|
||||
free (key);
|
||||
@@ -279,13 +279,13 @@ MHD_ip_limit_del (struct MHD_Daemon *daemon,
|
||||
{
|
||||
/* Something's wrong if we couldn't find an IP address
|
||||
* that was previously added */
|
||||
MHD_PANIC (_ ("Failed to find previously-added IP address\n"));
|
||||
MHD_PANIC (_ ("Failed to find previously-added IP address.\n"));
|
||||
}
|
||||
found_key = (struct MHD_IPCount *) *nodep;
|
||||
/* Validate existing count for IP address */
|
||||
if (0 == found_key->count)
|
||||
{
|
||||
MHD_PANIC (_ ("Previously-added IP address had counter of zero\n"));
|
||||
MHD_PANIC (_ ("Previously-added IP address had counter of zero.\n"));
|
||||
}
|
||||
/* Remove the node entirely if count reduces to 0 */
|
||||
if (0 == --found_key->count)
|
||||
|
||||
@@ -620,7 +620,7 @@ MHD_daemon_connection_memory_limit (struct MHD_Daemon *daemon,
|
||||
size_t memory_increment_b)
|
||||
{
|
||||
if (memory_increment_b >= memory_limit_b)
|
||||
MHD_PANIC ("sane memory increment must be below memory limit");
|
||||
MHD_PANIC ("Sane memory increment must be below memory limit.\n");
|
||||
daemon->connection_memory_limit_b = memory_limit_b;
|
||||
daemon->connection_memory_increment_b = memory_increment_b;
|
||||
}
|
||||
@@ -725,7 +725,7 @@ MHD_daemon_digest_auth_random (struct MHD_Daemon *daemon,
|
||||
(void) daemon;
|
||||
(void) buf_size;
|
||||
(void) buf;
|
||||
MHD_PANIC ("digest authentication not supported by this build");
|
||||
MHD_PANIC ("Digest authentication not supported by this build.\n");
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -747,7 +747,7 @@ MHD_daemon_digest_auth_nc_length (struct MHD_Daemon *daemon,
|
||||
{
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (daemon,
|
||||
_ ("Specified value for NC_SIZE too large\n"));
|
||||
_ ("Specified value for NC_SIZE too large.\n"));
|
||||
#endif
|
||||
return MHD_SC_DIGEST_AUTH_NC_LENGTH_TOO_BIG;
|
||||
}
|
||||
|
||||
@@ -58,7 +58,7 @@ MHD_daemon_quiesce (struct MHD_Daemon *daemon)
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (daemon,
|
||||
MHD_SC_SYSCALL_QUIESCE_REQUIRES_ITC,
|
||||
"Using MHD_quiesce_daemon in this mode requires ITC\n");
|
||||
"Using MHD_quiesce_daemon in this mode requires ITC.\n");
|
||||
#endif
|
||||
return MHD_INVALID_SOCKET;
|
||||
}
|
||||
@@ -81,7 +81,7 @@ MHD_daemon_quiesce (struct MHD_Daemon *daemon)
|
||||
EPOLL_CTL_DEL,
|
||||
listen_socket,
|
||||
NULL))
|
||||
MHD_PANIC (_ ("Failed to remove listen FD from epoll set\n"));
|
||||
MHD_PANIC (_ ("Failed to remove listen FD from epoll set.\n"));
|
||||
worker->listen_socket_in_epoll = false;
|
||||
}
|
||||
else
|
||||
@@ -91,7 +91,7 @@ MHD_daemon_quiesce (struct MHD_Daemon *daemon)
|
||||
if (! MHD_itc_activate_ (worker->itc,
|
||||
"q"))
|
||||
MHD_PANIC (_ (
|
||||
"Failed to signal quiesce via inter-thread communication channel"));
|
||||
"Failed to signal quiesce via inter-thread communication channel.\n"));
|
||||
}
|
||||
}
|
||||
daemon->was_quiesced = true;
|
||||
@@ -104,7 +104,7 @@ MHD_daemon_quiesce (struct MHD_Daemon *daemon)
|
||||
EPOLL_CTL_DEL,
|
||||
listen_socket,
|
||||
NULL))
|
||||
MHD_PANIC ("Failed to remove listen FD from epoll set\n");
|
||||
MHD_PANIC ("Failed to remove listen FD from epoll set.\n");
|
||||
daemon->listen_socket_in_epoll = false;
|
||||
}
|
||||
#endif
|
||||
@@ -114,7 +114,7 @@ MHD_daemon_quiesce (struct MHD_Daemon *daemon)
|
||||
(! MHD_itc_activate_ (daemon->itc,
|
||||
"q")) )
|
||||
MHD_PANIC (_ (
|
||||
"Failed to signal quiesce via inter-thread communication channel"));
|
||||
"Failed to signal quiesce via inter-thread communication channel.\n"));
|
||||
|
||||
/* FIXME: we might want some bi-directional communication here
|
||||
(in both the thread-pool and single-thread case!)
|
||||
|
||||
@@ -531,7 +531,7 @@ MHD_daemon_upgrade_connection_with_select_ (struct MHD_Connection *con)
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (con->daemon,
|
||||
MHD_SC_SOCKET_OUTSIDE_OF_FDSET_RANGE,
|
||||
_ ("Error preparing select\n"));
|
||||
_ ("Error preparing select.\n"));
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
@@ -695,7 +695,7 @@ MHD_daemon_select_ (struct MHD_Daemon *daemon,
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (daemon,
|
||||
sc,
|
||||
_ ("Could not obtain daemon fdsets"));
|
||||
_ ("Could not obtain daemon fdsets.\n"));
|
||||
#endif
|
||||
}
|
||||
}
|
||||
@@ -712,7 +712,7 @@ MHD_daemon_select_ (struct MHD_Daemon *daemon,
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (daemon,
|
||||
MHD_SC_SOCKET_OUTSIDE_OF_FDSET_RANGE,
|
||||
_ ("Could not add listen socket to fdset"));
|
||||
_ ("Could not add listen socket to fdset.\n"));
|
||||
#endif
|
||||
return MHD_SC_SOCKET_OUTSIDE_OF_FDSET_RANGE;
|
||||
}
|
||||
@@ -743,7 +743,7 @@ MHD_daemon_select_ (struct MHD_Daemon *daemon,
|
||||
MHD_DLOG (daemon,
|
||||
sc,
|
||||
_ (
|
||||
"Could not add control inter-thread communication channel FD to fdset"));
|
||||
"Could not add control inter-thread communication channel FD to fdset.\n"));
|
||||
#endif
|
||||
#if defined(MHD_WINSOCK_SOCKETS)
|
||||
}
|
||||
|
||||
+11
-11
@@ -99,7 +99,7 @@ configure_listen_reuse (struct MHD_Daemon *daemon)
|
||||
MHD_DLOG (daemon,
|
||||
MHD_SC_LISTEN_ADDRESS_REUSE_ENABLE_NOT_SUPPORTED,
|
||||
_ (
|
||||
"Cannot allow listening address reuse: SO_REUSEPORT not defined\n"));
|
||||
"Cannot allow listening address reuse: SO_REUSEPORT not defined.\n"));
|
||||
#endif
|
||||
return MHD_SC_LISTEN_ADDRESS_REUSE_ENABLE_NOT_SUPPORTED;
|
||||
#endif /* !MHD_WINSOCK_SOCKETS && !SO_REUSEPORT */
|
||||
@@ -138,7 +138,7 @@ configure_listen_reuse (struct MHD_Daemon *daemon)
|
||||
MHD_DLOG (daemon,
|
||||
MHD_SC_LISTEN_ADDRESS_REUSE_DISABLE_NOT_SUPPORTED,
|
||||
_ (
|
||||
"Cannot disallow listening address reuse: SO_EXCLUSIVEADDRUSE not defined\n"));
|
||||
"Cannot disallow listening address reuse: SO_EXCLUSIVEADDRUSE not defined.\n"));
|
||||
#endif
|
||||
return MHD_SC_LISTEN_ADDRESS_REUSE_DISABLE_NOT_SUPPORTED;
|
||||
#endif /* MHD_WINSOCK_SOCKETS */
|
||||
@@ -221,7 +221,7 @@ open_listen_socket (struct MHD_Daemon *daemon)
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (daemon,
|
||||
MHD_SC_IPV6_NOT_SUPPORTED_BY_BUILD,
|
||||
_ ("IPv6 not supported by this build\n"));
|
||||
_ ("IPv6 not supported by this build.\n"));
|
||||
#endif
|
||||
return MHD_SC_IPV6_NOT_SUPPORTED_BY_BUILD;
|
||||
#endif
|
||||
@@ -281,7 +281,7 @@ try_open_listen_socket:
|
||||
MHD_DLOG (daemon,
|
||||
MHD_SC_LISTEN_DUAL_STACK_CONFIGURATION_NOT_SUPPORTED,
|
||||
_ (
|
||||
"Cannot explicitly setup dual stack behavior on this platform\n"));
|
||||
"Cannot explicitly setup dual stack behavior on this platform.\n"));
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
@@ -452,7 +452,7 @@ get_listen_port_number (struct MHD_Daemon *daemon)
|
||||
MHD_DLOG (daemon,
|
||||
MHD_SC_LISTEN_PORT_INTROSPECTION_FAILURE,
|
||||
_ (
|
||||
"Failed to get listen port number (`struct sockaddr_storage` too small!?)\n"));
|
||||
"Failed to get listen port number (`struct sockaddr_storage` too small!?).\n"));
|
||||
#endif /* HAVE_MESSAGES */
|
||||
return;
|
||||
}
|
||||
@@ -626,7 +626,7 @@ MHD_polling_thread (void *cls)
|
||||
switch (daemon->event_loop_syscall)
|
||||
{
|
||||
case MHD_ELS_AUTO:
|
||||
MHD_PANIC ("MHD_ELS_AUTO should have been mapped to preferred style");
|
||||
MHD_PANIC ("MHD_ELS_AUTO should have been mapped to preferred style.\n");
|
||||
break;
|
||||
case MHD_ELS_SELECT:
|
||||
MHD_daemon_select_ (daemon,
|
||||
@@ -637,7 +637,7 @@ MHD_polling_thread (void *cls)
|
||||
MHD_daemon_poll_ (daemon,
|
||||
MHD_YES);
|
||||
#else
|
||||
MHD_PANIC ("MHD_ELS_POLL not supported, should have failed earlier");
|
||||
MHD_PANIC ("MHD_ELS_POLL not supported, should have failed earlier.\n");
|
||||
#endif
|
||||
break;
|
||||
case MHD_ELS_EPOLL:
|
||||
@@ -645,7 +645,7 @@ MHD_polling_thread (void *cls)
|
||||
MHD_daemon_epoll_ (daemon,
|
||||
MHD_YES);
|
||||
#else
|
||||
MHD_PANIC ("MHD_ELS_EPOLL not supported, should have failed earlier");
|
||||
MHD_PANIC ("MHD_ELS_EPOLL not supported, should have failed earlier.\n");
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
@@ -731,7 +731,7 @@ setup_thread_pool (struct MHD_Daemon *daemon)
|
||||
MHD_DLOG (daemon,
|
||||
MHD_SC_ITC_DESCRIPTOR_TOO_LARGE,
|
||||
_ (
|
||||
"File descriptor for inter-thread communication channel exceeds maximum value\n"));
|
||||
"File descriptor for inter-thread communication channel exceeds maximum value.\n"));
|
||||
#endif
|
||||
MHD_itc_destroy_chk_ (d->itc);
|
||||
sc = MHD_SC_ITC_DESCRIPTOR_TOO_LARGE;
|
||||
@@ -755,7 +755,7 @@ setup_thread_pool (struct MHD_Daemon *daemon)
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (daemon,
|
||||
MHD_SC_THREAD_POOL_CREATE_MUTEX_FAILURE,
|
||||
_ ("MHD failed to initialize cleanup connection mutex\n"));
|
||||
_ ("MHD failed to initialize cleanup connection mutex.\n"));
|
||||
#endif
|
||||
if (! daemon->disable_itc)
|
||||
MHD_itc_destroy_chk_ (d->itc);
|
||||
@@ -879,7 +879,7 @@ MHD_daemon_start (struct MHD_Daemon *daemon)
|
||||
MHD_DLOG (daemon,
|
||||
MHD_SC_ITC_DESCRIPTOR_TOO_LARGE,
|
||||
_ (
|
||||
"File descriptor for inter-thread communication channel exceeds maximum value\n"));
|
||||
"File descriptor for inter-thread communication channel exceeds maximum value.\n"));
|
||||
#endif
|
||||
return MHD_SC_ITC_DESCRIPTOR_TOO_LARGE;
|
||||
}
|
||||
|
||||
+2
-2
@@ -95,11 +95,11 @@ MHD_init (void)
|
||||
#if defined(_WIN32) && ! defined(__CYGWIN__)
|
||||
if (0 != WSAStartup (MAKEWORD (2, 2),
|
||||
&wsd))
|
||||
MHD_PANIC (_ ("Failed to initialize winsock\n"));
|
||||
MHD_PANIC (_ ("Failed to initialize winsock.\n"));
|
||||
mhd_winsock_inited_ = 1;
|
||||
if ( (2 != LOBYTE (wsd.wVersion)) &&
|
||||
(2 != HIBYTE (wsd.wVersion)) )
|
||||
MHD_PANIC (_ ("Winsock version 2.2 is not available\n"));
|
||||
MHD_PANIC (_ ("Winsock version 2.2 is not available.\n"));
|
||||
#endif
|
||||
MHD_monotonic_sec_counter_init ();
|
||||
#ifdef HAVE_FREEBSD_SENDFILE
|
||||
|
||||
@@ -59,7 +59,7 @@ MHD_request_resume (struct MHD_Request *request)
|
||||
MHD_DLOG (daemon,
|
||||
MHD_SC_ITC_USE_FAILED,
|
||||
_ (
|
||||
"Failed to signal resume via inter-thread communication channel."));
|
||||
"Failed to signal resume via inter-thread communication channel.\n"));
|
||||
#endif
|
||||
}
|
||||
}
|
||||
@@ -144,7 +144,7 @@ MHD_resume_suspended_connections_ (struct MHD_Daemon *daemon)
|
||||
if (MHD_ELS_EPOLL == daemon->event_loop_syscall)
|
||||
{
|
||||
if (0 != (pos->epoll_state & MHD_EPOLL_STATE_IN_EREADY_EDLL))
|
||||
MHD_PANIC ("Resumed connection was already in EREADY set\n");
|
||||
MHD_PANIC ("Resumed connection was already in EREADY set.\n");
|
||||
/* we always mark resumed connections as ready, as we
|
||||
might have missed the edge poll event during suspension */
|
||||
EDLL_insert (daemon->eready_head,
|
||||
@@ -190,7 +190,7 @@ MHD_resume_suspended_connections_ (struct MHD_Daemon *daemon)
|
||||
MHD_DLOG (daemon,
|
||||
MHD_SC_ITC_USE_FAILED,
|
||||
_ (
|
||||
"Failed to signal resume of connection via inter-thread communication channel."));
|
||||
"Failed to signal resume of connection via inter-thread communication channel.\n"));
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
@@ -76,7 +76,7 @@ MHD_upgrade_response_handle_process_ (struct MHD_UpgradeResponseHandle *urh)
|
||||
_ (
|
||||
"Failed to forward to application "
|
||||
MHD_UNSIGNED_LONG_LONG_PRINTF \
|
||||
" bytes of data received from remote side: application shut down socket\n"),
|
||||
" bytes of data received from remote side: application shut down socket.\n"),
|
||||
(MHD_UNSIGNED_LONG_LONG) urh->in_buffer_used);
|
||||
#endif
|
||||
|
||||
@@ -376,7 +376,7 @@ MHD_upgrade_response_handle_process_ (struct MHD_UpgradeResponseHandle *urh)
|
||||
_ (
|
||||
"Failed to forward to remote client "
|
||||
MHD_UNSIGNED_LONG_LONG_PRINTF \
|
||||
" bytes of data received from application: daemon shut down\n"),
|
||||
" bytes of data received from application: daemon shut down.\n"),
|
||||
(MHD_UNSIGNED_LONG_LONG) urh->out_buffer_used);
|
||||
#endif
|
||||
/* Discard any data unsent to remote. */
|
||||
|
||||
@@ -68,7 +68,7 @@ MHD_basic_auth_get_username_password (struct MHD_Connection *connection,
|
||||
{
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (connection->daemon,
|
||||
_ ("Error decoding basic authentication\n"));
|
||||
_ ("Error decoding basic authentication.\n"));
|
||||
#endif
|
||||
return NULL;
|
||||
}
|
||||
@@ -78,7 +78,7 @@ MHD_basic_auth_get_username_password (struct MHD_Connection *connection,
|
||||
{
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (connection->daemon,
|
||||
_ ("Basic authentication doesn't contain ':' separator\n"));
|
||||
_ ("Basic authentication doesn't contain ':' separator.\n"));
|
||||
#endif
|
||||
free (decode);
|
||||
return NULL;
|
||||
@@ -96,7 +96,7 @@ MHD_basic_auth_get_username_password (struct MHD_Connection *connection,
|
||||
{
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (connection->daemon,
|
||||
_ ("Failed to allocate memory for password\n"));
|
||||
_ ("Failed to allocate memory for password.\n"));
|
||||
#endif
|
||||
free (decode);
|
||||
free (user);
|
||||
@@ -135,7 +135,7 @@ MHD_queue_basic_auth_fail_response (struct MHD_Connection *connection,
|
||||
{
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (connection->daemon,
|
||||
"Failed to allocate memory for auth header\n");
|
||||
"Failed to allocate memory for auth header.\n");
|
||||
#endif /* HAVE_MESSAGES */
|
||||
return MHD_NO;
|
||||
}
|
||||
@@ -161,7 +161,7 @@ MHD_queue_basic_auth_fail_response (struct MHD_Connection *connection,
|
||||
{
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (connection->daemon,
|
||||
_ ("Failed to add Basic auth header\n"));
|
||||
_ ("Failed to add Basic auth header.\n"));
|
||||
#endif /* HAVE_MESSAGES */
|
||||
}
|
||||
return ret;
|
||||
|
||||
+15
-15
@@ -798,7 +798,7 @@ MHD_connection_finish_forward_ (struct MHD_Connection *connection)
|
||||
connection->socket_fd,
|
||||
NULL)) )
|
||||
{
|
||||
MHD_PANIC (_ ("Failed to remove FD from epoll set\n"));
|
||||
MHD_PANIC (_ ("Failed to remove FD from epoll set.\n"));
|
||||
}
|
||||
if (urh->in_eready_list)
|
||||
{
|
||||
@@ -817,7 +817,7 @@ MHD_connection_finish_forward_ (struct MHD_Connection *connection)
|
||||
urh->mhd.socket,
|
||||
NULL)) )
|
||||
{
|
||||
MHD_PANIC (_ ("Failed to remove FD from epoll set\n"));
|
||||
MHD_PANIC (_ ("Failed to remove FD from epoll set.\n"));
|
||||
}
|
||||
#endif /* EPOLL_SUPPORT */
|
||||
/* Reflect remote disconnect to application by breaking
|
||||
@@ -925,7 +925,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).\n"));
|
||||
return MHD_NO;
|
||||
}
|
||||
response->data_start = connection->response_write_position;
|
||||
@@ -974,7 +974,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).\n"));
|
||||
return MHD_NO;
|
||||
}
|
||||
if ( (2 * (0xFFFFFF + sizeof(cbuf) + 2)) < size)
|
||||
@@ -1022,7 +1022,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).\n"));
|
||||
return MHD_NO;
|
||||
}
|
||||
if ( (((ssize_t) MHD_CONTENT_READER_END_OF_STREAM) == ret) ||
|
||||
@@ -1677,7 +1677,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).\n"));
|
||||
return;
|
||||
}
|
||||
mhd_assert (NULL != connection->response);
|
||||
@@ -1688,7 +1688,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).\n"));
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -2439,7 +2439,7 @@ process_request_body (struct MHD_Connection *connection)
|
||||
__FILE__,
|
||||
__LINE__
|
||||
#ifdef HAVE_MESSAGES
|
||||
, _ ("libmicrohttpd API violation")
|
||||
, _ ("libmicrohttpd API violation.\n")
|
||||
#else
|
||||
, NULL
|
||||
#endif
|
||||
@@ -2700,7 +2700,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).\n"));
|
||||
return;
|
||||
}
|
||||
iret = MHD_queue_response (connection,
|
||||
@@ -2712,7 +2712,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).\n"));
|
||||
}
|
||||
return;
|
||||
}
|
||||
@@ -3071,7 +3071,7 @@ MHD_connection_handle_write (struct MHD_Connection *connection)
|
||||
data_write_offset = connection->response_write_position
|
||||
- response->data_start;
|
||||
if (data_write_offset > (uint64_t) SIZE_MAX)
|
||||
MHD_PANIC (_ ("Data offset exceeds limit"));
|
||||
MHD_PANIC (_ ("Data offset exceeds limit.\n"));
|
||||
ret = MHD_send_on_connection_ (connection,
|
||||
&response->data
|
||||
[(size_t) data_write_offset],
|
||||
@@ -3181,7 +3181,7 @@ MHD_connection_handle_write (struct MHD_Connection *connection)
|
||||
default:
|
||||
mhd_assert (0);
|
||||
CONNECTION_CLOSE_ERROR (connection,
|
||||
_ ("Internal error\n"));
|
||||
_ ("Internal error.\n"));
|
||||
break;
|
||||
}
|
||||
return;
|
||||
@@ -3255,7 +3255,7 @@ cleanup_connection (struct MHD_Connection *connection)
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (daemon,
|
||||
_ (
|
||||
"Failed to signal end of connection via inter-thread communication channel"));
|
||||
"Failed to signal end of connection via inter-thread communication channel.\n"));
|
||||
#endif
|
||||
}
|
||||
}
|
||||
@@ -3520,7 +3520,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).\n"));
|
||||
continue;
|
||||
}
|
||||
connection->state = MHD_CONNECTION_HEADERS_SENDING;
|
||||
@@ -3629,7 +3629,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).\n"));
|
||||
continue;
|
||||
}
|
||||
if ( (! connection->have_chunked_upload) ||
|
||||
|
||||
@@ -172,7 +172,7 @@ MHD_run_tls_handshake_ (struct MHD_Connection *connection)
|
||||
connection->tls_state = MHD_TLS_CONN_TLS_FAILED;
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (connection->daemon,
|
||||
_ ("Error: received handshake message out of context\n"));
|
||||
_ ("Error: received handshake message out of context.\n"));
|
||||
#endif
|
||||
MHD_connection_close_ (connection,
|
||||
MHD_REQUEST_TERMINATED_WITH_ERROR);
|
||||
|
||||
+81
-81
@@ -448,7 +448,7 @@ MHD_ip_limit_add (struct MHD_Daemon *daemon,
|
||||
{
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (daemon,
|
||||
_ ("Failed to add IP connection count node\n"));
|
||||
_ ("Failed to add IP connection count node.\n"));
|
||||
#endif
|
||||
MHD_ip_count_unlock (daemon);
|
||||
free (key);
|
||||
@@ -506,13 +506,13 @@ MHD_ip_limit_del (struct MHD_Daemon *daemon,
|
||||
{
|
||||
/* Something's wrong if we couldn't find an IP address
|
||||
* that was previously added */
|
||||
MHD_PANIC (_ ("Failed to find previously-added IP address\n"));
|
||||
MHD_PANIC (_ ("Failed to find previously-added IP address.\n"));
|
||||
}
|
||||
found_key = (struct MHD_IPCount *) *nodep;
|
||||
/* Validate existing count for IP address */
|
||||
if (0 == found_key->count)
|
||||
{
|
||||
MHD_PANIC (_ ("Previously-added IP address had counter of zero\n"));
|
||||
MHD_PANIC (_ ("Previously-added IP address had counter of zero.\n"));
|
||||
}
|
||||
/* Remove the node entirely if count reduces to 0 */
|
||||
if (0 == --found_key->count)
|
||||
@@ -564,7 +564,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;
|
||||
}
|
||||
@@ -576,7 +576,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;
|
||||
}
|
||||
@@ -601,7 +601,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;
|
||||
}
|
||||
@@ -623,7 +623,7 @@ MHD_init_daemon_certificate (struct MHD_Daemon *daemon)
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (daemon,
|
||||
_ ("Failed to setup x509 certificate/key: pre 3.X.X version " \
|
||||
"of GnuTLS does not support setting key password"));
|
||||
"of GnuTLS does not support setting key password.\n"));
|
||||
#endif
|
||||
return -1;
|
||||
#endif
|
||||
@@ -651,7 +651,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;
|
||||
}
|
||||
@@ -1370,7 +1370,7 @@ process_urh (struct MHD_UpgradeResponseHandle *urh)
|
||||
_ (
|
||||
"Failed to forward to application "
|
||||
MHD_UNSIGNED_LONG_LONG_PRINTF \
|
||||
" bytes of data received from remote side: application shut down socket\n"),
|
||||
" bytes of data received from remote side: application shut down socket.\n"),
|
||||
(MHD_UNSIGNED_LONG_LONG) urh->in_buffer_used);
|
||||
#endif
|
||||
|
||||
@@ -1661,7 +1661,7 @@ process_urh (struct MHD_UpgradeResponseHandle *urh)
|
||||
_ (
|
||||
"Failed to forward to remote client "
|
||||
MHD_UNSIGNED_LONG_LONG_PRINTF \
|
||||
" bytes of data received from application: daemon shut down\n"),
|
||||
" bytes of data received from application: daemon shut down.\n"),
|
||||
(MHD_UNSIGNED_LONG_LONG) urh->out_buffer_used);
|
||||
#endif
|
||||
/* Discard any data unsent to remote. */
|
||||
@@ -1727,7 +1727,7 @@ thread_main_connection_upgrade (struct MHD_Connection *con)
|
||||
{
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (con->daemon,
|
||||
_ ("Error preparing select\n"));
|
||||
_ ("Error preparing select.\n"));
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
@@ -1899,7 +1899,7 @@ thread_main_handle_connection (void *data)
|
||||
{
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (con->daemon,
|
||||
_ ("Failed to add FD to fd_set\n"));
|
||||
_ ("Failed to add FD to fd_set.\n"));
|
||||
#endif
|
||||
goto exit;
|
||||
}
|
||||
@@ -2041,7 +2041,7 @@ thread_main_handle_connection (void *data)
|
||||
{
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (con->daemon,
|
||||
_ ("Failed to add FD to fd_set\n"));
|
||||
_ ("Failed to add FD to fd_set.\n"));
|
||||
#endif
|
||||
goto exit;
|
||||
}
|
||||
@@ -2181,7 +2181,7 @@ thread_main_handle_connection (void *data)
|
||||
#if DEBUG_CLOSE
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (con->daemon,
|
||||
_ ("Processing thread terminating. Closing connection\n"));
|
||||
_ ("Processing thread terminating. Closing connection.\n"));
|
||||
#endif
|
||||
#endif
|
||||
if (MHD_CONNECTION_CLOSED != con->state)
|
||||
@@ -2211,7 +2211,7 @@ exit:
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (daemon,
|
||||
_ (
|
||||
"Failed to signal thread termination via inter-thread communication channel."));
|
||||
"Failed to signal thread termination via inter-thread communication channel.\n"));
|
||||
#endif
|
||||
}
|
||||
return (MHD_THRD_RTRN_TYPE_) 0;
|
||||
@@ -2311,7 +2311,7 @@ psk_gnutls_adapter (gnutls_session_t session,
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (daemon,
|
||||
_ (
|
||||
"PSK authentication failed: gnutls_malloc failed to allocate memory\n"));
|
||||
"PSK authentication failed: gnutls_malloc failed to allocate memory.\n"));
|
||||
#endif
|
||||
free (app_psk);
|
||||
return -1;
|
||||
@@ -2320,7 +2320,7 @@ psk_gnutls_adapter (gnutls_session_t session,
|
||||
{
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (daemon,
|
||||
_ ("PSK authentication failed: PSK too long\n"));
|
||||
_ ("PSK authentication failed: PSK too long.\n"));
|
||||
#endif
|
||||
free (app_psk);
|
||||
return -1;
|
||||
@@ -2451,7 +2451,7 @@ internal_add_connection (struct MHD_Daemon *daemon,
|
||||
#ifdef HAVE_MESSAGES
|
||||
#if DEBUG_CONNECT
|
||||
MHD_DLOG (daemon,
|
||||
_ ("Accepted connection on socket %d\n"),
|
||||
_ ("Accepted connection on socket %d.\n"),
|
||||
client_socket);
|
||||
#endif
|
||||
#endif
|
||||
@@ -2614,7 +2614,7 @@ internal_add_connection (struct MHD_Daemon *daemon,
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (connection->daemon,
|
||||
_ (
|
||||
"Failed to setup TLS credentials: unknown credential type %d\n"),
|
||||
"Failed to setup TLS credentials: unknown credential type %d.\n"),
|
||||
daemon->cred_type);
|
||||
#endif
|
||||
MHD_socket_close_chk_ (client_socket);
|
||||
@@ -2623,7 +2623,7 @@ internal_add_connection (struct MHD_Daemon *daemon,
|
||||
addrlen);
|
||||
free (connection->addr);
|
||||
free (connection);
|
||||
MHD_PANIC (_ ("Unknown credential type"));
|
||||
MHD_PANIC (_ ("Unknown credential type.\n"));
|
||||
#if EINVAL
|
||||
errno = EINVAL;
|
||||
#endif
|
||||
@@ -2753,7 +2753,7 @@ internal_add_connection (struct MHD_Daemon *daemon,
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (daemon,
|
||||
_ (
|
||||
"Failed to signal new connection via inter-thread communication channel."));
|
||||
"Failed to signal new connection via inter-thread communication channel.\n"));
|
||||
#endif
|
||||
}
|
||||
return MHD_YES;
|
||||
@@ -2858,7 +2858,7 @@ internal_suspend_connection_ (struct MHD_Connection *connection)
|
||||
EPOLL_CTL_DEL,
|
||||
connection->socket_fd,
|
||||
NULL))
|
||||
MHD_PANIC (_ ("Failed to remove FD from epoll set\n"));
|
||||
MHD_PANIC (_ ("Failed to remove FD from epoll set.\n"));
|
||||
connection->epoll_state &= ~MHD_EPOLL_STATE_IN_EPOLL_SET;
|
||||
}
|
||||
connection->epoll_state |= MHD_EPOLL_STATE_SUSPENDED;
|
||||
@@ -2915,7 +2915,7 @@ MHD_suspend_connection (struct MHD_Connection *connection)
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (daemon,
|
||||
_ (
|
||||
"Error: connection scheduled for \"upgrade\" cannot be suspended"));
|
||||
"Error: connection scheduled for \"upgrade\" cannot be suspended.\n"));
|
||||
#endif /* HAVE_MESSAGES */
|
||||
return;
|
||||
}
|
||||
@@ -2954,7 +2954,7 @@ MHD_resume_connection (struct MHD_Connection *connection)
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (daemon,
|
||||
_ (
|
||||
"Failed to signal resume via inter-thread communication channel."));
|
||||
"Failed to signal resume via inter-thread communication channel.\n"));
|
||||
#endif
|
||||
}
|
||||
}
|
||||
@@ -3039,7 +3039,7 @@ resume_suspended_connections (struct MHD_Daemon *daemon)
|
||||
if (0 != (daemon->options & MHD_USE_EPOLL))
|
||||
{
|
||||
if (0 != (pos->epoll_state & MHD_EPOLL_STATE_IN_EREADY_EDLL))
|
||||
MHD_PANIC ("Resumed connection was already in EREADY set\n");
|
||||
MHD_PANIC ("Resumed connection was already in EREADY set.\n");
|
||||
/* we always mark resumed connections as ready, as we
|
||||
might have missed the edge poll event during suspension */
|
||||
EDLL_insert (daemon->eready_head,
|
||||
@@ -3089,7 +3089,7 @@ resume_suspended_connections (struct MHD_Daemon *daemon)
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (daemon,
|
||||
_ (
|
||||
"Failed to signal resume of connection via inter-thread communication channel."));
|
||||
"Failed to signal resume of connection via inter-thread communication channel.\n"));
|
||||
#endif
|
||||
}
|
||||
}
|
||||
@@ -3353,7 +3353,7 @@ MHD_cleanup_connections (struct MHD_Daemon *daemon)
|
||||
if ( (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) &&
|
||||
(! pos->thread_joined) &&
|
||||
(! MHD_join_thread_ (pos->pid.handle)) )
|
||||
MHD_PANIC (_ ("Failed to join a thread\n"));
|
||||
MHD_PANIC (_ ("Failed to join a thread.\n"));
|
||||
#endif
|
||||
#ifdef UPGRADE_SUPPORT
|
||||
cleanup_upgraded_connection (pos);
|
||||
@@ -3395,7 +3395,7 @@ MHD_cleanup_connections (struct MHD_Daemon *daemon)
|
||||
EPOLL_CTL_DEL,
|
||||
pos->socket_fd,
|
||||
NULL))
|
||||
MHD_PANIC (_ ("Failed to remove FD from epoll set\n"));
|
||||
MHD_PANIC (_ ("Failed to remove FD from epoll set.\n"));
|
||||
pos->epoll_state &= ~MHD_EPOLL_STATE_IN_EPOLL_SET;
|
||||
}
|
||||
}
|
||||
@@ -3456,7 +3456,7 @@ MHD_get_timeout (struct MHD_Daemon *daemon,
|
||||
{
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (daemon,
|
||||
_ ("Illegal call to MHD_get_timeout\n"));
|
||||
_ ("Illegal call to MHD_get_timeout.\n"));
|
||||
#endif
|
||||
return MHD_NO;
|
||||
}
|
||||
@@ -3733,7 +3733,7 @@ MHD_select (struct MHD_Daemon *daemon,
|
||||
{
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (daemon,
|
||||
_ ("Could not obtain daemon fdsets"));
|
||||
_ ("Could not obtain daemon fdsets.\n"));
|
||||
#endif
|
||||
err_state = MHD_YES;
|
||||
}
|
||||
@@ -3750,7 +3750,7 @@ MHD_select (struct MHD_Daemon *daemon,
|
||||
{
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (daemon,
|
||||
_ ("Could not add listen socket to fdset"));
|
||||
_ ("Could not add listen socket to fdset.\n"));
|
||||
#endif
|
||||
return MHD_NO;
|
||||
}
|
||||
@@ -3779,7 +3779,7 @@ MHD_select (struct MHD_Daemon *daemon,
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (daemon,
|
||||
_ (
|
||||
"Could not add control inter-thread communication channel FD to fdset"));
|
||||
"Could not add control inter-thread communication channel FD to fdset.\n"));
|
||||
#endif
|
||||
err_state = MHD_YES;
|
||||
#if defined(MHD_WINSOCK_SOCKETS)
|
||||
@@ -4412,7 +4412,7 @@ MHD_epoll (struct MHD_Daemon *daemon,
|
||||
NULL)) &&
|
||||
(ENOENT != errno) ) /* ENOENT can happen due to race with
|
||||
#MHD_quiesce_daemon() */
|
||||
MHD_PANIC ("Failed to remove listen FD from epoll set\n");
|
||||
MHD_PANIC ("Failed to remove listen FD from epoll set.\n");
|
||||
daemon->listen_socket_in_epoll = false;
|
||||
}
|
||||
|
||||
@@ -4448,7 +4448,7 @@ MHD_epoll (struct MHD_Daemon *daemon,
|
||||
EPOLL_CTL_DEL,
|
||||
ls,
|
||||
NULL))
|
||||
MHD_PANIC (_ ("Failed to remove listen FD from epoll set\n"));
|
||||
MHD_PANIC (_ ("Failed to remove listen FD from epoll set.\n"));
|
||||
daemon->listen_socket_in_epoll = false;
|
||||
}
|
||||
|
||||
@@ -4890,7 +4890,7 @@ 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;
|
||||
}
|
||||
@@ -4909,7 +4909,7 @@ MHD_quiesce_daemon (struct MHD_Daemon *daemon)
|
||||
EPOLL_CTL_DEL,
|
||||
ret,
|
||||
NULL))
|
||||
MHD_PANIC (_ ("Failed to remove listen FD from epoll set\n"));
|
||||
MHD_PANIC (_ ("Failed to remove listen FD from epoll set.\n"));
|
||||
daemon->worker_pool[i].listen_socket_in_epoll = false;
|
||||
}
|
||||
else
|
||||
@@ -4918,7 +4918,7 @@ MHD_quiesce_daemon (struct MHD_Daemon *daemon)
|
||||
{
|
||||
if (! MHD_itc_activate_ (daemon->worker_pool[i].itc, "q"))
|
||||
MHD_PANIC (_ (
|
||||
"Failed to signal quiesce via inter-thread communication channel"));
|
||||
"Failed to signal quiesce via inter-thread communication channel.\n"));
|
||||
}
|
||||
}
|
||||
#endif
|
||||
@@ -4934,14 +4934,14 @@ MHD_quiesce_daemon (struct MHD_Daemon *daemon)
|
||||
NULL)) &&
|
||||
(ENOENT != errno) ) /* ENOENT can happen due to race with
|
||||
#MHD_epoll() */
|
||||
MHD_PANIC ("Failed to remove listen FD from epoll set\n");
|
||||
MHD_PANIC ("Failed to remove listen FD from epoll set.\n");
|
||||
daemon->listen_socket_in_epoll = false;
|
||||
}
|
||||
#endif
|
||||
if ( (MHD_ITC_IS_VALID_ (daemon->itc)) &&
|
||||
(! MHD_itc_activate_ (daemon->itc, "q")) )
|
||||
MHD_PANIC (_ (
|
||||
"failed to signal quiesce via inter-thread communication channel"));
|
||||
"failed to signal quiesce via inter-thread communication channel.\n"));
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -5122,7 +5122,7 @@ parse_options_va (struct MHD_Daemon *daemon,
|
||||
{
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (daemon,
|
||||
_ ("Specified thread pool size (%u) too big\n"),
|
||||
_ ("Specified thread pool size (%u) too big.\n"),
|
||||
daemon->worker_pool_size);
|
||||
#endif
|
||||
return MHD_NO;
|
||||
@@ -5160,7 +5160,7 @@ parse_options_va (struct MHD_Daemon *daemon,
|
||||
else
|
||||
MHD_DLOG (daemon,
|
||||
_ (
|
||||
"MHD HTTPS option %d passed to MHD but MHD_USE_TLS not set\n"),
|
||||
"MHD HTTPS option %d passed to MHD but MHD_USE_TLS not set.\n"),
|
||||
opt);
|
||||
#endif
|
||||
break;
|
||||
@@ -5173,7 +5173,7 @@ parse_options_va (struct MHD_Daemon *daemon,
|
||||
else
|
||||
MHD_DLOG (daemon,
|
||||
_ (
|
||||
"MHD HTTPS option %d passed to MHD but MHD_USE_TLS not set\n"),
|
||||
"MHD HTTPS option %d passed to MHD but MHD_USE_TLS not set.\n"),
|
||||
opt);
|
||||
#endif
|
||||
break;
|
||||
@@ -5186,7 +5186,7 @@ parse_options_va (struct MHD_Daemon *daemon,
|
||||
else
|
||||
MHD_DLOG (daemon,
|
||||
_ (
|
||||
"MHD HTTPS option %d passed to MHD but MHD_USE_TLS not set\n"),
|
||||
"MHD HTTPS option %d passed to MHD but MHD_USE_TLS not set.\n"),
|
||||
opt);
|
||||
#endif
|
||||
break;
|
||||
@@ -5199,7 +5199,7 @@ parse_options_va (struct MHD_Daemon *daemon,
|
||||
else
|
||||
MHD_DLOG (daemon,
|
||||
_ (
|
||||
"MHD HTTPS option %d passed to MHD but MHD_USE_TLS not set\n"),
|
||||
"MHD HTTPS option %d passed to MHD but MHD_USE_TLS not set.\n"),
|
||||
opt);
|
||||
#endif
|
||||
break;
|
||||
@@ -5219,7 +5219,7 @@ parse_options_va (struct MHD_Daemon *daemon,
|
||||
{
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (daemon,
|
||||
_ ("Error initializing DH parameters\n"));
|
||||
_ ("Error initializing DH parameters.\n"));
|
||||
#endif
|
||||
return MHD_NO;
|
||||
}
|
||||
@@ -5229,7 +5229,7 @@ parse_options_va (struct MHD_Daemon *daemon,
|
||||
{
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (daemon,
|
||||
_ ("Diffie-Hellman parameters string too long\n"));
|
||||
_ ("Diffie-Hellman parameters string too long.\n"));
|
||||
#endif
|
||||
return MHD_NO;
|
||||
}
|
||||
@@ -5240,7 +5240,7 @@ parse_options_va (struct MHD_Daemon *daemon,
|
||||
{
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (daemon,
|
||||
_ ("Bad Diffie-Hellman parameters format\n"));
|
||||
_ ("Bad Diffie-Hellman parameters format.\n"));
|
||||
#endif
|
||||
gnutls_dh_params_deinit (daemon->https_mem_dhparams);
|
||||
return MHD_NO;
|
||||
@@ -5251,7 +5251,7 @@ parse_options_va (struct MHD_Daemon *daemon,
|
||||
else
|
||||
MHD_DLOG (daemon,
|
||||
_ (
|
||||
"MHD HTTPS option %d passed to MHD but MHD_USE_TLS not set\n"),
|
||||
"MHD HTTPS option %d passed to MHD but MHD_USE_TLS not set.\n"),
|
||||
opt);
|
||||
#endif
|
||||
break;
|
||||
@@ -5280,7 +5280,7 @@ parse_options_va (struct MHD_Daemon *daemon,
|
||||
else
|
||||
MHD_DLOG (daemon,
|
||||
_ (
|
||||
"MHD HTTPS option %d passed to MHD but MHD_USE_TLS not set\n"),
|
||||
"MHD HTTPS option %d passed to MHD but MHD_USE_TLS not set.\n"),
|
||||
opt);
|
||||
#endif
|
||||
break;
|
||||
@@ -5289,7 +5289,7 @@ parse_options_va (struct MHD_Daemon *daemon,
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (daemon,
|
||||
_ (
|
||||
"MHD_OPTION_HTTPS_CERT_CALLBACK requires building MHD with GnuTLS >= 3.0\n"));
|
||||
"MHD_OPTION_HTTPS_CERT_CALLBACK requires building MHD with GnuTLS >= 3.0.\n"));
|
||||
#endif
|
||||
return MHD_NO;
|
||||
#else
|
||||
@@ -5301,7 +5301,7 @@ parse_options_va (struct MHD_Daemon *daemon,
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (daemon,
|
||||
_ (
|
||||
"MHD HTTPS option %d passed to MHD but MHD_USE_TLS not set\n"),
|
||||
"MHD HTTPS option %d passed to MHD but MHD_USE_TLS not set.\n"),
|
||||
opt);
|
||||
#endif
|
||||
break;
|
||||
@@ -5311,7 +5311,7 @@ parse_options_va (struct MHD_Daemon *daemon,
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (daemon,
|
||||
_ (
|
||||
"MHD_OPTION_HTTPS_CERT_CALLBACK2 requires building MHD with GnuTLS >= 3.6.3\n"));
|
||||
"MHD_OPTION_HTTPS_CERT_CALLBACK2 requires building MHD with GnuTLS >= 3.6.3.\n"));
|
||||
#endif
|
||||
return MHD_NO;
|
||||
#else
|
||||
@@ -5323,7 +5323,7 @@ parse_options_va (struct MHD_Daemon *daemon,
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (daemon,
|
||||
_ (
|
||||
"MHD HTTPS option %d passed to MHD but MHD_USE_TLS not set\n"),
|
||||
"MHD HTTPS option %d passed to MHD but MHD_USE_TLS not set.\n"),
|
||||
opt);
|
||||
#endif
|
||||
break;
|
||||
@@ -5382,7 +5382,7 @@ parse_options_va (struct MHD_Daemon *daemon,
|
||||
#else /* ! TCP_FASTOPEN */
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (daemon,
|
||||
_ ("TCP fastopen is not supported on this platform\n"));
|
||||
_ ("TCP fastopen is not supported on this platform.\n"));
|
||||
return MHD_NO;
|
||||
#endif /* HAVE_MESSAGES */
|
||||
#endif /* ! TCP_FASTOPEN */
|
||||
@@ -5536,7 +5536,7 @@ parse_options_va (struct MHD_Daemon *daemon,
|
||||
#else
|
||||
MHD_DLOG (daemon,
|
||||
_ (
|
||||
"MHD HTTPS option %d passed to MHD compiled without GNUtls >= 3\n"),
|
||||
"MHD HTTPS option %d passed to MHD compiled without GNUtls >= 3.\n"),
|
||||
opt);
|
||||
return MHD_NO;
|
||||
#endif
|
||||
@@ -5550,14 +5550,14 @@ parse_options_va (struct MHD_Daemon *daemon,
|
||||
{
|
||||
MHD_DLOG (daemon,
|
||||
_ (
|
||||
"MHD HTTPS option %d passed to MHD compiled without HTTPS support\n"),
|
||||
"MHD HTTPS option %d passed to MHD compiled without HTTPS support.\n"),
|
||||
opt);
|
||||
}
|
||||
else
|
||||
{
|
||||
MHD_DLOG (daemon,
|
||||
_ (
|
||||
"Invalid option %d! (Did you terminate the list with MHD_OPTION_END?)\n"),
|
||||
"Invalid option %d! (Did you terminate the list with MHD_OPTION_END?).\n"),
|
||||
opt);
|
||||
}
|
||||
#endif
|
||||
@@ -5928,7 +5928,7 @@ MHD_start_daemon_va (unsigned int flags,
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (daemon,
|
||||
_ (
|
||||
"file descriptor for inter-thread communication channel exceeds maximum value\n"));
|
||||
"file descriptor for inter-thread communication channel exceeds maximum value.\n"));
|
||||
#endif
|
||||
MHD_itc_destroy_chk_ (daemon->itc);
|
||||
#ifdef HTTPS_SUPPORT
|
||||
@@ -5948,7 +5948,7 @@ MHD_start_daemon_va (unsigned int flags,
|
||||
{
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (daemon,
|
||||
_ ("Specified value for NC_SIZE too large\n"));
|
||||
_ ("Specified value for NC_SIZE too large.\n"));
|
||||
#endif
|
||||
#ifdef HTTPS_SUPPORT
|
||||
if (0 != (*pflags & MHD_USE_TLS))
|
||||
@@ -5979,7 +5979,7 @@ MHD_start_daemon_va (unsigned int flags,
|
||||
{
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (daemon,
|
||||
_ ("MHD failed to initialize nonce-nc mutex\n"));
|
||||
_ ("MHD failed to initialize nonce-nc mutex.\n"));
|
||||
#endif
|
||||
#ifdef HTTPS_SUPPORT
|
||||
if (0 != (*pflags & MHD_USE_TLS))
|
||||
@@ -6000,7 +6000,7 @@ MHD_start_daemon_va (unsigned int flags,
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (daemon,
|
||||
_ (
|
||||
"MHD thread polling only works with MHD_USE_INTERNAL_POLLING_THREAD\n"));
|
||||
"MHD thread polling only works with MHD_USE_INTERNAL_POLLING_THREAD.\n"));
|
||||
#endif
|
||||
goto free_and_fail;
|
||||
}
|
||||
@@ -6098,7 +6098,7 @@ MHD_start_daemon_va (unsigned int flags,
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (daemon,
|
||||
_ (
|
||||
"Cannot allow listening address reuse: SO_REUSEPORT not defined\n"));
|
||||
"Cannot allow listening address reuse: SO_REUSEPORT not defined.\n"));
|
||||
#endif
|
||||
goto free_and_fail;
|
||||
#endif /* !MHD_WINSOCK_SOCKETS && !SO_REUSEPORT */
|
||||
@@ -6134,7 +6134,7 @@ MHD_start_daemon_va (unsigned int flags,
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (daemon,
|
||||
_ (
|
||||
"Cannot disallow listening address reuse: SO_EXCLUSIVEADDRUSE not defined\n"));
|
||||
"Cannot disallow listening address reuse: SO_EXCLUSIVEADDRUSE not defined.\n"));
|
||||
#endif
|
||||
goto free_and_fail;
|
||||
#endif /* MHD_WINSOCK_SOCKETS */
|
||||
@@ -6287,7 +6287,7 @@ MHD_start_daemon_va (unsigned int flags,
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (daemon,
|
||||
_ (
|
||||
"Failed to get listen port number (`struct sockaddr_storage` too small!?)\n"));
|
||||
"Failed to get listen port number (`struct sockaddr_storage` too small!?).\n"));
|
||||
#endif /* HAVE_MESSAGES */
|
||||
}
|
||||
#ifndef __linux__
|
||||
@@ -6398,7 +6398,7 @@ MHD_start_daemon_va (unsigned int flags,
|
||||
{
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (daemon,
|
||||
_ ("MHD failed to initialize IP connection limit mutex\n"));
|
||||
_ ("MHD failed to initialize IP connection limit mutex.\n"));
|
||||
#endif
|
||||
if (MHD_INVALID_SOCKET != listen_fd)
|
||||
MHD_socket_close_chk_ (listen_fd);
|
||||
@@ -6408,7 +6408,7 @@ MHD_start_daemon_va (unsigned int flags,
|
||||
{
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (daemon,
|
||||
_ ("MHD failed to initialize IP connection limit mutex\n"));
|
||||
_ ("MHD failed to initialize IP connection limit mutex.\n"));
|
||||
#endif
|
||||
#if defined(MHD_USE_POSIX_THREADS) || defined(MHD_USE_W32_THREADS)
|
||||
MHD_mutex_destroy_chk_ (&daemon->cleanup_connection_mutex);
|
||||
@@ -6426,7 +6426,7 @@ MHD_start_daemon_va (unsigned int flags,
|
||||
{
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (daemon,
|
||||
_ ("Failed to initialize TLS support\n"));
|
||||
_ ("Failed to initialize TLS support.\n"));
|
||||
#endif
|
||||
if (MHD_INVALID_SOCKET != listen_fd)
|
||||
MHD_socket_close_chk_ (listen_fd);
|
||||
@@ -6514,7 +6514,7 @@ MHD_start_daemon_va (unsigned int flags,
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (daemon,
|
||||
_ (
|
||||
"File descriptor for worker inter-thread communication channel exceeds maximum value\n"));
|
||||
"File descriptor for worker inter-thread communication channel exceeds maximum value.\n"));
|
||||
#endif
|
||||
MHD_itc_destroy_chk_ (d->itc);
|
||||
goto thread_failed;
|
||||
@@ -6539,7 +6539,7 @@ MHD_start_daemon_va (unsigned int flags,
|
||||
{
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (daemon,
|
||||
_ ("MHD failed to initialize cleanup connection mutex\n"));
|
||||
_ ("MHD failed to initialize cleanup connection mutex.\n"));
|
||||
#endif
|
||||
goto thread_failed;
|
||||
}
|
||||
@@ -6609,7 +6609,7 @@ free_and_fail:
|
||||
EPOLL_CTL_DEL,
|
||||
daemon->epoll_upgrade_fd,
|
||||
NULL))
|
||||
MHD_PANIC (_ ("Failed to remove FD from epoll set\n"));
|
||||
MHD_PANIC (_ ("Failed to remove FD from epoll set.\n"));
|
||||
daemon->upgrade_fd_in_epoll = false;
|
||||
}
|
||||
#endif /* HTTPS_SUPPORT && UPGRADE_SUPPORT */
|
||||
@@ -6751,7 +6751,7 @@ close_all_connections (struct MHD_Daemon *daemon)
|
||||
(MHD_ITC_IS_VALID_ (daemon->itc)) &&
|
||||
(! MHD_itc_activate_ (daemon->itc, "e")) )
|
||||
MHD_PANIC (_ (
|
||||
"Failed to signal shutdown via inter-thread communication channel"));
|
||||
"Failed to signal shutdown via inter-thread communication channel.\n"));
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -6766,7 +6766,7 @@ close_all_connections (struct MHD_Daemon *daemon)
|
||||
{
|
||||
MHD_mutex_unlock_chk_ (&daemon->cleanup_connection_mutex);
|
||||
if (! MHD_join_thread_ (pos->pid.handle))
|
||||
MHD_PANIC (_ ("Failed to join a thread\n"));
|
||||
MHD_PANIC (_ ("Failed to join a thread.\n"));
|
||||
MHD_mutex_lock_chk_ (&daemon->cleanup_connection_mutex);
|
||||
pos->thread_joined = true;
|
||||
/* The thread may have concurrently modified the DLL,
|
||||
@@ -6798,7 +6798,7 @@ close_all_connections (struct MHD_Daemon *daemon)
|
||||
#if defined(MHD_USE_POSIX_THREADS) || defined(MHD_USE_W32_THREADS)
|
||||
if ( (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) &&
|
||||
(! pos->thread_joined) )
|
||||
MHD_PANIC (_ ("Failed to join a thread\n"));
|
||||
MHD_PANIC (_ ("Failed to join a thread.\n"));
|
||||
#endif
|
||||
close_connection (pos);
|
||||
}
|
||||
@@ -6844,7 +6844,7 @@ MHD_stop_daemon (struct MHD_Daemon *daemon)
|
||||
if (! MHD_itc_activate_ (daemon->worker_pool[i].itc,
|
||||
"e"))
|
||||
MHD_PANIC (_ (
|
||||
"Failed to signal shutdown via inter-thread communication channel."));
|
||||
"Failed to signal shutdown via inter-thread communication channel.\n"));
|
||||
}
|
||||
else
|
||||
mhd_assert (MHD_INVALID_SOCKET != fd);
|
||||
@@ -6882,7 +6882,7 @@ MHD_stop_daemon (struct MHD_Daemon *daemon)
|
||||
if (! MHD_itc_activate_ (daemon->itc,
|
||||
"e"))
|
||||
MHD_PANIC (_ (
|
||||
"Failed to signal shutdown via inter-thread communication channel"));
|
||||
"Failed to signal shutdown via inter-thread communication channel.\n"));
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -6900,7 +6900,7 @@ MHD_stop_daemon (struct MHD_Daemon *daemon)
|
||||
|
||||
if (! MHD_join_thread_ (daemon->pid.handle))
|
||||
{
|
||||
MHD_PANIC (_ ("Failed to join a thread\n"));
|
||||
MHD_PANIC (_ ("Failed to join a thread.\n"));
|
||||
}
|
||||
/* close_all_connections() was called in daemon thread. */
|
||||
}
|
||||
@@ -7320,10 +7320,10 @@ MHD_init (void)
|
||||
|
||||
#if defined(MHD_WINSOCK_SOCKETS)
|
||||
if (0 != WSAStartup (MAKEWORD (2, 2), &wsd))
|
||||
MHD_PANIC (_ ("Failed to initialize winsock\n"));
|
||||
MHD_PANIC (_ ("Failed to initialize winsock.\n"));
|
||||
mhd_winsock_inited_ = 1;
|
||||
if ((2 != LOBYTE (wsd.wVersion)) && (2 != HIBYTE (wsd.wVersion)))
|
||||
MHD_PANIC (_ ("Winsock version 2.2 is not available\n"));
|
||||
MHD_PANIC (_ ("Winsock version 2.2 is not available.\n"));
|
||||
#endif /* MHD_WINSOCK_SOCKETS */
|
||||
#ifdef HTTPS_SUPPORT
|
||||
#ifdef MHD_HTTPS_REQUIRE_GRYPT
|
||||
@@ -7331,17 +7331,17 @@ MHD_init (void)
|
||||
#if defined(MHD_USE_POSIX_THREADS)
|
||||
if (0 != gcry_control (GCRYCTL_SET_THREAD_CBS,
|
||||
&gcry_threads_pthread))
|
||||
MHD_PANIC (_ ("Failed to initialise multithreading in libgcrypt\n"));
|
||||
MHD_PANIC (_ ("Failed to initialise multithreading in libgcrypt.\n"));
|
||||
#elif defined(MHD_W32_MUTEX_)
|
||||
if (0 != gcry_control (GCRYCTL_SET_THREAD_CBS,
|
||||
&gcry_threads_w32))
|
||||
MHD_PANIC (_ ("Failed to initialise multithreading in libgcrypt\n"));
|
||||
MHD_PANIC (_ ("Failed to initialise multithreading in libgcrypt.\n"));
|
||||
#endif /* defined(MHD_W32_MUTEX_) */
|
||||
gcry_check_version (NULL);
|
||||
#else
|
||||
if (NULL == gcry_check_version ("1.6.0"))
|
||||
MHD_PANIC (_ (
|
||||
"libgcrypt is too old. MHD was compiled for libgcrypt 1.6.0 or newer\n"));
|
||||
"libgcrypt is too old. MHD was compiled for libgcrypt 1.6.0 or newer.\n"));
|
||||
#endif
|
||||
#endif /* MHD_HTTPS_REQUIRE_GRYPT */
|
||||
gnutls_global_init ();
|
||||
|
||||
@@ -83,8 +83,8 @@
|
||||
* Check that @a n is below #MAX_NONCE
|
||||
*/
|
||||
#define VLA_CHECK_LEN_DIGEST(n) do { if ((n) > MAX_DIGEST) mhd_panic ( \
|
||||
mhd_panic_cls, __FILE__, __LINE__, \
|
||||
"VLA too big"); } while (0)
|
||||
mhd_panic_cls, __FILE__, __LINE__, \
|
||||
"VLA too big.\n"); } while (0)
|
||||
|
||||
|
||||
/**
|
||||
@@ -804,7 +804,7 @@ check_argument_match (struct MHD_Connection *connection,
|
||||
{
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (connection->daemon,
|
||||
_ ("Failed to allocate memory for copy of URI arguments\n"));
|
||||
_ ("Failed to allocate memory for copy of URI arguments.\n"));
|
||||
#endif /* HAVE_MESSAGES */
|
||||
return MHD_NO;
|
||||
}
|
||||
@@ -1041,7 +1041,7 @@ digest_auth_check_all (struct MHD_Connection *connection,
|
||||
{
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (daemon,
|
||||
_ ("Failed to allocate memory for auth header processing\n"));
|
||||
_ ("Failed to allocate memory for auth header processing.\n"));
|
||||
#endif /* HAVE_MESSAGES */
|
||||
return MHD_NO;
|
||||
}
|
||||
@@ -1278,7 +1278,7 @@ MHD_digest_auth_check_digest2 (struct MHD_Connection *connection,
|
||||
|
||||
mhd_assert (NULL != digest);
|
||||
if (da.digest_size != digest_size)
|
||||
MHD_PANIC (_ ("digest size mismatch")); /* API violation! */
|
||||
MHD_PANIC (_ ("Digest size mismatch.\n")); /* API violation! */
|
||||
return digest_auth_check_all (connection,
|
||||
&da,
|
||||
realm,
|
||||
@@ -1396,7 +1396,7 @@ MHD_queue_auth_fail_response2 (struct MHD_Connection *connection,
|
||||
{
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (connection->daemon,
|
||||
_ ("Failed to allocate memory for auth response header\n"));
|
||||
_ ("Failed to allocate memory for auth response header.\n"));
|
||||
#endif /* HAVE_MESSAGES */
|
||||
return MHD_NO;
|
||||
}
|
||||
@@ -1438,7 +1438,7 @@ MHD_queue_auth_fail_response2 (struct MHD_Connection *connection,
|
||||
{
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (connection->daemon,
|
||||
_ ("Failed to add Digest auth header\n"));
|
||||
_ ("Failed to add Digest auth header.\n"));
|
||||
#endif /* HAVE_MESSAGES */
|
||||
}
|
||||
return ret;
|
||||
|
||||
@@ -1073,7 +1073,7 @@ MHD_response_execute_upgrade_ (struct MHD_Response *response,
|
||||
EPOLL_CTL_DEL,
|
||||
connection->socket_fd,
|
||||
&event))
|
||||
MHD_PANIC (_ ("Error cleaning up while handling epoll error"));
|
||||
MHD_PANIC (_ ("Error cleaning up while handling epoll error.\n"));
|
||||
#ifdef HAVE_MESSAGES
|
||||
MHD_DLOG (daemon,
|
||||
_ ("Call to epoll_ctl failed: %s\n"),
|
||||
|
||||
@@ -143,14 +143,14 @@ testExternalRun ()
|
||||
{
|
||||
MHD_stop_daemon (d);
|
||||
fprintf (stderr,
|
||||
"Failed in MHD_get_fdset()\n");
|
||||
"Failed in MHD_get_fdset().\n");
|
||||
return 256;
|
||||
}
|
||||
if (MHD_run (d) == MHD_NO)
|
||||
{
|
||||
MHD_stop_daemon (d);
|
||||
fprintf (stderr,
|
||||
"Failed in MHD_run()\n");
|
||||
"Failed in MHD_run().\n");
|
||||
return 8;
|
||||
}
|
||||
i++;
|
||||
@@ -174,14 +174,14 @@ testThread ()
|
||||
if (NULL == d)
|
||||
{
|
||||
fprintf (stderr,
|
||||
"Failed to start daemon on port %u\n",
|
||||
"Failed to start daemon on port %u.\n",
|
||||
1082);
|
||||
exit (77);
|
||||
}
|
||||
if (MHD_run (d) != MHD_NO)
|
||||
{
|
||||
fprintf (stderr,
|
||||
"Failed in MHD_run()\n");
|
||||
"Failed in MHD_run().\n");
|
||||
return 32;
|
||||
}
|
||||
MHD_stop_daemon (d);
|
||||
@@ -211,7 +211,7 @@ testMultithread ()
|
||||
if (MHD_run (d) != MHD_NO)
|
||||
{
|
||||
fprintf (stderr,
|
||||
"Failed in MHD_run()\n");
|
||||
"Failed in MHD_run().\n");
|
||||
return 128;
|
||||
}
|
||||
MHD_stop_daemon (d);
|
||||
|
||||
Reference in New Issue
Block a user