* elsewhere failed or Privoxy is configured
* to only accept proxy requests.
*
- * An error response has already been send
+ * An error response has already been sent
* and we're done here.
*/
return JB_ERR_PARSE;
strlen(MESSED_UP_REQUEST_RESPONSE), get_write_delay(csp));
/* XXX: Use correct size */
log_error(LOG_LEVEL_CLF,
- "%s - - [%T] \"Invalid request generated\" 500 0", csp->ip_addr_str);
+ "%s - - [%T] \"Invalid request generated\" 400 0", csp->ip_addr_str);
log_error(LOG_LEVEL_ERROR,
"Invalid request line after applying header filters.");
free_http_request(http);
{
jb_err err;
char *original_host = csp->http->host;
+ int original_port = csp->http->port;
log_error(LOG_LEVEL_REDIRECTS, "Rewrite detected: %s",
csp->https_headers->first->str);
if (csp->http->host == NULL)
{
+ char port_string[10];
/*
* The rewritten request line did not specify a host
* which means we can use the original host specified
* by the client.
*/
csp->http->host = original_host;
+ csp->http->port = original_port;
log_error(LOG_LEVEL_REDIRECTS, "Keeping the original host: %s",
csp->http->host);
/*
* If the rewritten request line didn't contain a host
* it also didn't contain a port so we can reuse the host
- * and set the port to 443.
+ * port.
*/
freez(csp->http->hostport);
csp->http->hostport = strdup_or_die(csp->http->host);
- csp->http->port = 443;
+ snprintf(port_string, sizeof(port_string), ":%d", original_port);
+ err = string_append(&csp->http->hostport, port_string);
+ if (err != JB_ERR_OK)
+ {
+ log_error(LOG_LEVEL_ERROR, "Failed to rebuild hostport: %s.",
+ jb_err_to_string(err));
+ return err;
+ }
+
/*
* While the request line didn't mention it,
* we're https-inspecting and want to speak TLS
#ifdef FEATURE_GRACEFUL_TERMINATION
- log_error(LOG_LEVEL_INFO, "Graceful termination requested");
+ log_error(LOG_LEVEL_INFO, "Graceful termination requested.");
unload_current_config_file();
unload_current_actions_file();
freez(basedir);
#endif
+ log_error(LOG_LEVEL_INFO, "Exiting gracefully.");
+
#if defined(_WIN32) && !defined(_WIN_CONSOLE)
/* Cleanup - remove taskbar icon etc. */
TermLogWindow();