-const char jcc_rcs[] = "$Id: jcc.c,v 1.333 2010/12/26 16:13:47 fabiankeil Exp $";
+const char jcc_rcs[] = "$Id: jcc.c,v 1.352 2011/05/27 11:34:39 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jcc.c,v $
{
/*
* We were able to read a complete
- * header and can finaly enlist it.
+ * header and can finally enlist it.
*/
enlist(headers, p);
freez(p);
* this function is called (via serve()) to handle the
* main business of the communication. This function
* returns after dealing with a single request. It can
- * be called multiple times witht the same client socket
+ * be called multiple times with the same client socket
* if the client is keeping the connection alive.
*
* The decision whether or not a client connection will
int server_body;
int ms_iis5_hack = 0;
unsigned long long byte_count = 0;
- int forwarded_connect_retries = 0;
- int max_forwarded_connect_retries = csp->config->forwarded_connect_retries;
const struct forward_spec *fwd;
struct http_request *http;
long len = 0; /* for buffer sizes (and negative error codes) */
csp->action->string[ACTION_STRING_LIMIT_CONNECT];
assert(NULL != acceptable_connect_ports);
log_error(LOG_LEVEL_INFO, "Request from %s marked for blocking. "
- "limit-connect{%s} doesn't allow CONNECT requests to port %d.",
- csp->ip_addr_str, acceptable_connect_ports, csp->http->port);
+ "limit-connect{%s} doesn't allow CONNECT requests to %s",
+ csp->ip_addr_str, acceptable_connect_ports, csp->http->hostport);
csp->action->flags |= ACTION_BLOCK;
http->ssl = 0;
}
}
#endif /* def FEATURE_CONNECTION_KEEP_ALIVE */
- while ((csp->server_connection.sfd = forwarded_connect(fwd, http, csp))
- && (errno == EINVAL)
- && (forwarded_connect_retries++ < max_forwarded_connect_retries))
- {
- log_error(LOG_LEVEL_ERROR,
- "failed request #%u to connect to %s. Trying again.",
- forwarded_connect_retries, http->hostport);
- }
+ csp->server_connection.sfd = forwarded_connect(fwd, http, csp);
if (csp->server_connection.sfd == JB_INVALID_SOCKET)
{
else
{
rsp = error_response(csp, "connect-failed");
- log_error(LOG_LEVEL_CONNECT, "connect to: %s failed: %E",
- http->hostport);
}
/* Write the answer to the client */
if (FD_ISSET(csp->server_connection.sfd, &rfds))
{
#ifdef FEATURE_CONNECTION_KEEP_ALIVE
- if (!socket_is_still_alive(csp->cfd))
+ /*
+ * If we are buffering content, we don't want to eat up to
+ * buffer-limit bytes if the client no longer cares about them.
+ * If we aren't buffering, however, a dead client socket will be
+ * noticed pretty much right away anyway, so we can reduce the
+ * overhead by skipping the check.
+ */
+ if (buffer_and_filter_content && !socket_is_still_alive(csp->cfd))
{
#ifdef _WIN32
log_error(LOG_LEVEL_CONNECT,
{
csp->content_length = (size_t)(csp->iob->eod - csp->iob->cur);
}
+#ifdef FEATURE_COMPRESSION
+ else if ((csp->flags & CSP_FLAG_CLIENT_SUPPORTS_DEFLATE)
+ && (csp->content_length > LOWER_LENGTH_LIMIT_FOR_COMRPESSION))
+ {
+ char *compressed_content = compress_buffer(p, (size_t *)&csp->content_length);
+ if (compressed_content != NULL)
+ {
+ freez(p);
+ p = compressed_content;
+ csp->flags |= CSP_FLAG_BUFFERED_CONTENT_DEFLATED;
+ }
+ }
+#endif
if (JB_ERR_OK != update_server_headers(csp))
{
if (csp->content_length == 0)
{
/*
- * If Privoxy didn't recalculate the Content-Lenght,
+ * If Privoxy didn't recalculate the Content-Length,
* byte_count is still correct.
*/
csp->content_length = byte_count;
do
{
unsigned int latency;
+ int config_file_change_detected = 0; /* Only used for debugging */
chat(csp);
&& (((csp->flags & CSP_FLAG_SERVER_CONNECTION_KEEP_ALIVE)
&& !(csp->flags & CSP_FLAG_SERVER_SOCKET_TAINTED))
|| (csp->flags & CSP_FLAG_CRUNCHED))
- && (csp->cfd != JB_INVALID_SOCKET);
+ && (csp->cfd != JB_INVALID_SOCKET)
+ && (csp->flags & CSP_FLAG_CLIENT_CONNECTION_KEEP_ALIVE);
if (continue_chatting && !(csp->flags & CSP_FLAG_CRUNCHED))
{
if (continue_chatting && any_loaded_file_changed(csp->config->config_file_list))
{
continue_chatting = 0;
+ config_file_change_detected = 1;
}
if (continue_chatting)
&& data_is_available(csp->cfd, (int)client_timeout)
&& socket_is_still_alive(csp->cfd))
{
- log_error(LOG_LEVEL_CONNECT, "Client request arrived in "
- "time or the client closed the connection on socket %d.",
- csp->cfd);
+ log_error(LOG_LEVEL_CONNECT,
+ "Client request arrived in time on socket %d.", csp->cfd);
prepare_csp_for_next_request(csp);
}
else
else if (csp->server_connection.sfd != JB_INVALID_SOCKET)
{
log_error(LOG_LEVEL_CONNECT,
- "The connection on server socket %d to %s isn't reusable. "
- "Closing. Server connection: keep-alive %u, tainted: %u, "
- "socket alive %u. Client connection: crunched: %u, "
- "socket alive: %u. Server timeout: %u",
+ "The connection on server socket %d to %s isn't reusable. Closing. "
+ "Server connection: keep-alive %u, tainted: %u, socket alive %u. "
+ "Client connection: socket alive: %u. Server timeout: %u. "
+ "Configuration file change detected: %u",
csp->server_connection.sfd, csp->server_connection.host,
0 != (csp->flags & CSP_FLAG_SERVER_CONNECTION_KEEP_ALIVE),
0 != (csp->flags & CSP_FLAG_SERVER_SOCKET_TAINTED),
socket_is_still_alive(csp->server_connection.sfd),
- 0 != (csp->flags & CSP_FLAG_CRUNCHED),
socket_is_still_alive(csp->cfd),
- csp->server_connection.keep_alive_timeout);
+ csp->server_connection.keep_alive_timeout,
+ config_file_change_detected);
}
} while (continue_chatting);
#ifdef unix
struct passwd *pw = NULL;
struct group *grp = NULL;
- char *p;
int do_chroot = 0;
char *pre_chroot_nslookup_to_load_resolver = NULL;
#endif
pName++;
exit( (install_service(pName)) ? 0 : 1 );
}
- else if (strncmp(argv[argc_pos], "--uninstall", + 11) == 0)
+ else if (strncmp(argv[argc_pos], "--uninstall", 11) == 0)
{
const char *pName = argv[argc_pos] + 11;
if (*pName == ':')
else if (strcmp(argv[argc_pos], "--user" ) == 0)
{
+ char *user_arg;
+ char *group_name;
+
if (++argc_pos == argc) usage(argv[argc_pos]);
- if ((NULL != (p = strchr(argv[argc_pos], '.'))) && *(p + 1) != '0')
+ user_arg = strdup(argv[argc_pos]);
+ if (NULL == user_arg)
{
- *p++ = '\0';
- if (NULL == (grp = getgrnam(p)))
+ log_error(LOG_LEVEL_FATAL,
+ "Out of memory splitting --user argument '%s'.", argv[argc_pos]);
+ }
+ group_name = strchr(user_arg, '.');
+ if (NULL != group_name)
+ {
+ /* Nul-terminate the user name */
+ *group_name = '\0';
+
+ /* Skip the former delimiter to actually reach the group name */
+ group_name++;
+
+ grp = getgrnam(group_name);
+ if (NULL == grp)
{
- log_error(LOG_LEVEL_FATAL, "Group %s not found.", p);
+ log_error(LOG_LEVEL_FATAL, "Group '%s' not found.", group_name);
}
}
-
- if (NULL == (pw = getpwnam(argv[argc_pos])))
+ pw = getpwnam(user_arg);
+ if (NULL == pw)
{
- log_error(LOG_LEVEL_FATAL, "User %s not found.", argv[argc_pos]);
+ log_error(LOG_LEVEL_FATAL, "User '%s' not found.", user_arg);
}
- if (p != NULL) *--p = '\0';
+ freez(user_arg);
}
else if (strcmp(argv[argc_pos], "--pre-chroot-nslookup" ) == 0)
}
csp = &csp_list->csp;
+ log_error(LOG_LEVEL_CONNECT, "Listening for new connections ... ");
+
+ if (!accept_connection(csp, bfd))
+ {
+ log_error(LOG_LEVEL_CONNECT, "accept failed: %E");
+
+#ifdef AMIGA
+ if(!childs)
+ {
+ exit(1);
+ }
+#endif
+ freez(csp_list);
+ continue;
+ }
+ else
+ {
+ log_error(LOG_LEVEL_CONNECT,
+ "accepted connection from %s on socket %d",
+ csp->ip_addr_str, csp->cfd);
+ }
+
csp->flags |= CSP_FLAG_ACTIVE;
csp->server_connection.sfd = JB_INVALID_SOCKET;
bfd = bind_port_helper(config);
}
- log_error(LOG_LEVEL_CONNECT, "Listening for new connections ... ");
-
- if (!accept_connection(csp, bfd))
- {
- log_error(LOG_LEVEL_CONNECT, "accept failed: %E");
-
-#ifdef AMIGA
- if(!childs)
- {
- exit(1);
- }
-#endif
- freez(csp_list);
- continue;
- }
- else
- {
- log_error(LOG_LEVEL_CONNECT,
- "accepted connection from %s on socket %d",
- csp->ip_addr_str, csp->cfd);
- }
-
#ifdef FEATURE_TOGGLE
if (global_toggle_state)
#endif /* def FEATURE_TOGGLE */
{
int child_id;
-/* this is a switch () statment in the C preprocessor - ugh */
+/* this is a switch () statement in the C preprocessor - ugh */
#undef SELECTED_ONE_OPTION
/* Use Pthreads in preference to native code */
#if defined(unix)
freez(basedir);
#endif
- freez(configfile);
#if defined(_WIN32) && !defined(_WIN_CONSOLE)
/* Cleanup - remove taskbar icon etc. */