projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
listen_loop(): Use a dedicated variable for the pthread_create() return code
[privoxy.git]
/
jcc.c
diff --git
a/jcc.c
b/jcc.c
index
f258544
..
8d92f65
100644
(file)
--- a/
jcc.c
+++ b/
jcc.c
@@
-881,8
+881,8
@@
static void send_crunch_response(struct client_state *csp, struct http_response
{
/* There is nothing we can do about it. */
log_error(LOG_LEVEL_CONNECT, "Couldn't deliver the error message "
{
/* There is nothing we can do about it. */
log_error(LOG_LEVEL_CONNECT, "Couldn't deliver the error message "
- "for %s through client socket %d using TLS/SSL",
- http->url, csp->cfd);
+ "for
https://%s
%s through client socket %d using TLS/SSL",
+ http->
hostport, http->
url, csp->cfd);
}
}
else
}
}
else
@@
-1201,6
+1201,7
@@
void save_connection_destination(jb_socket sfd,
}
server_connection->forward_port = fwd->forward_port;
}
}
server_connection->forward_port = fwd->forward_port;
}
+#endif /* FEATURE_CONNECTION_KEEP_ALIVE */
/*********************************************************************
/*********************************************************************
@@
-1301,7
+1302,6
@@
static void verify_request_length(struct client_state *csp)
log_error(LOG_LEVEL_CONNECT, "Complete client request received.");
}
}
log_error(LOG_LEVEL_CONNECT, "Complete client request received.");
}
}
-#endif /* FEATURE_CONNECTION_KEEP_ALIVE */
/*********************************************************************
/*********************************************************************
@@
-1922,6
+1922,7
@@
static jb_err parse_client_request(struct client_state *csp)
/* Assume persistence until further notice */
csp->flags |= CSP_FLAG_CLIENT_CONNECTION_KEEP_ALIVE;
}
/* Assume persistence until further notice */
csp->flags |= CSP_FLAG_CLIENT_CONNECTION_KEEP_ALIVE;
}
+#endif /* def FEATURE_CONNECTION_KEEP_ALIVE */
if (csp->http->ssl == 0)
{
if (csp->http->ssl == 0)
{
@@
-1948,7
+1949,6
@@
static jb_err parse_client_request(struct client_state *csp)
csp->flags |= CSP_FLAG_SERVER_SOCKET_TAINTED;
}
#endif
csp->flags |= CSP_FLAG_SERVER_SOCKET_TAINTED;
}
#endif
-#endif /* def FEATURE_CONNECTION_KEEP_ALIVE */
err = sed(csp, FILTER_CLIENT_HEADERS);
if (JB_ERR_OK != err)
err = sed(csp, FILTER_CLIENT_HEADERS);
if (JB_ERR_OK != err)
@@
-5604,10
+5604,11
@@
static void listen_loop(void)
#define SELECTED_ONE_OPTION
{
pthread_t the_thread;
#define SELECTED_ONE_OPTION
{
pthread_t the_thread;
+ int ret;
-
errno
= pthread_create(&the_thread, &attrs,
+
ret
= pthread_create(&the_thread, &attrs,
(void * (*)(void *))serve, csp);
(void * (*)(void *))serve, csp);
- child_id =
errno
? -1 : 0;
+ child_id =
ret
? -1 : 0;
}
#endif
}
#endif