* Purpose : Main file. Contains main() method, main loop, and
* the main connection-handling function.
*
- * Copyright : Written by and Copyright (C) 2001-2017 the
+ * Copyright : Written by and Copyright (C) 2001-2018 the
* Privoxy team. http://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
|| write_socket_delayed(csp->cfd, rsp->body, rsp->content_length, get_write_delay(csp)))
{
/* There is nothing we can do about it. */
- log_error(LOG_LEVEL_ERROR,
- "Couldn't deliver the error message through client socket %d: %E",
- csp->cfd);
+ log_error(LOG_LEVEL_CONNECT,
+ "Couldn't deliver the error message for %s through client socket %d: %E",
+ http->url, csp->cfd);
}
/* Clean up and return */
* Parameters :
* 1 : csp = Current client state (buffers, headers, etc...)
*
- * Returns : 0 on success, anything else is na error.
+ * Returns : 0 on success, anything else is an error.
*
*********************************************************************/
static int send_http_request(struct client_state *csp)
csp->http->hostport);
}
else if (((csp->flags & CSP_FLAG_PIPELINED_REQUEST_WAITING) == 0)
- && (flush_socket(csp->server_connection.sfd, csp->client_iob, 0) < 0))
+ && (flush_iob(csp->server_connection.sfd, csp->client_iob, 0) < 0))
{
write_failure = 1;
log_error(LOG_LEVEL_CONNECT, "Failed sending request body to: %s: %E",
hdrlen = strlen(hdr);
if (write_socket_delayed(csp->cfd, hdr, hdrlen, write_delay)
- || ((flushed = flush_socket(csp->cfd, csp->iob,
- write_delay) < 0)
+ || ((flushed = flush_iob(csp->cfd, csp->iob, write_delay) < 0)
|| (write_socket_delayed(csp->cfd, csp->receive_buffer,
(size_t)len, write_delay))))
{
*/
if (write_socket_delayed(csp->cfd, hdr, strlen(hdr), write_delay)
- || ((len = flush_socket(csp->cfd, csp->iob, write_delay)) < 0))
+ || ((len = flush_iob(csp->cfd, csp->iob, write_delay)) < 0))
{
log_error(LOG_LEVEL_CONNECT, "write header to client failed: %E");