-const char jcc_rcs[] = "$Id: jcc.c,v 1.246 2009/05/10 10:12:30 fabiankeil Exp $";
+const char jcc_rcs[] = "$Id: jcc.c,v 1.248 2009/05/10 10:25:19 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jcc.c,v $
*
* Revisions :
* $Log: jcc.c,v $
+ * Revision 1.248 2009/05/10 10:25:19 fabiankeil
+ * Change wait_for_alive_connection() prototype to use (void).
+ *
+ * Revision 1.247 2009/05/10 10:19:23 fabiankeil
+ * Reenable server-side-only keep-alive support, but only share
+ * outgoing connections if the connection-sharing option is set.
+ *
* Revision 1.246 2009/05/10 10:12:30 fabiankeil
* Initial keep-alive support for the client socket.
* Temporarily disable the server-side-only keep-alive code.
* Returns : N/A
*
*********************************************************************/
-static void wait_for_alive_connections()
+static void wait_for_alive_connections(void)
{
int connections_alive = close_unusable_connections();
}
#ifdef FEATURE_CONNECTION_KEEP_ALIVE
save_connection_destination(csp->sfd, http, fwd, &csp->server_connection);
+ csp->server_connection.keep_alive_timeout = (unsigned)csp->config->keep_alive_timeout;
}
#endif /* def FEATURE_CONNECTION_KEEP_ALIVE */
csp->sfd, csp->server_connection.host);
if ((csp->flags & CSP_FLAG_CLIENT_CONNECTION_KEEP_ALIVE)
- && data_is_available(csp->cfd, csp->config->keep_alive_timeout)
+ && data_is_available(csp->cfd, (int)csp->server_connection.keep_alive_timeout)
&& socket_is_still_usable(csp->cfd))
{
log_error(LOG_LEVEL_CONNECT, "Client request arrived in "
if ((csp->config->feature_flags & RUNTIME_FEATURE_CONNECTION_SHARING))
{
remember_connection(csp->sfd, csp->http,
- forward_url(csp, csp->http));
+ forward_url(csp, csp->http),
+ csp->server_connection.keep_alive_timeout);
csp->sfd = JB_INVALID_SOCKET;
close_socket(csp->cfd);
csp->cfd = JB_INVALID_SOCKET;