-const char jcc_rcs[] = "$Id: jcc.c,v 1.223 2009/02/09 21:21:16 fabiankeil Exp $";
+const char jcc_rcs[] = "$Id: jcc.c,v 1.224 2009/02/14 15:32:04 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jcc.c,v $
*
* Revisions :
* $Log: jcc.c,v $
+ * Revision 1.224 2009/02/14 15:32:04 fabiankeil
+ * Add the request URL to the timeout message in chat().
+ * Suggested by Lee.
+ *
* Revision 1.223 2009/02/09 21:21:16 fabiankeil
* Now that init_log_module() is called earlier, call show_version()
* later on from main() directly so it doesn't get called for --help
return (content_length_known && ((0 == csp->expected_content_length)
|| (csp->expected_content_length <= content_length)));
}
+
+
+/*********************************************************************
+ *
+ * Function : wait_for_alive_connections
+ *
+ * Description : Waits for alive connections to timeout.
+ *
+ * Parameters : N/A
+ *
+ * Returns : N/A
+ *
+ *********************************************************************/
+static void wait_for_alive_connections()
+{
+ int connections_alive = close_unusable_connections();
+
+ while (0 < connections_alive)
+ {
+ log_error(LOG_LEVEL_CONNECT,
+ "Waiting for %d connections to timeout.",
+ connections_alive);
+ sleep(60);
+ connections_alive = close_unusable_connections();
+ }
+
+ log_error(LOG_LEVEL_CONNECT, "No connections to wait for left.");
+
+}
#endif /* FEATURE_CONNECTION_KEEP_ALIVE */
+
/*********************************************************************
*
* Function : mark_server_socket_tainted
csp->content_length = byte_count;
}
+#ifdef FEATURE_CONNECTION_KEEP_ALIVE
if ((csp->flags & CSP_FLAG_CONTENT_LENGTH_SET)
&& (csp->expected_content_length != byte_count))
{
byte_count, csp->expected_content_length);
mark_server_socket_tainted(csp);
}
+#endif
log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 200 %d",
csp->ip_addr_str, http->ocmd, csp->content_length);
}
-/*********************************************************************
- *
- * Function : wait_for_alive_connections
- *
- * Description : Waits for alive connections to timeout.
- *
- * Parameters : N/A
- *
- * Returns : N/A
- *
- *********************************************************************/
-static void wait_for_alive_connections()
-{
- int connections_alive = close_unusable_connections();
-
- while (0 < connections_alive)
- {
- log_error(LOG_LEVEL_CONNECT,
- "Waiting for %d connections to timeout.",
- connections_alive);
- sleep(60);
- connections_alive = close_unusable_connections();
- }
-
- log_error(LOG_LEVEL_CONNECT, "No connections to wait for left.");
-
-}
-
/*********************************************************************
*
* Function : serve