X-Git-Url: http://www.privoxy.org/gitweb/general.html?a=blobdiff_plain;f=jcc.c;h=37472c81f7a414def65f35e7ea8915b330f5bb5a;hb=61478413a02d7be37d44efb5c0c997a39a9da463;hp=d0f0b34bf545e7e0aa3f8bdaa14870d8e165a6bc;hpb=4b4f741402ad9b9d1bc3268a5e31d5f94141305b;p=privoxy.git diff --git a/jcc.c b/jcc.c index d0f0b34b..37472c81 100644 --- a/jcc.c +++ b/jcc.c @@ -3553,17 +3553,6 @@ static void chat(struct client_state *csp) { return; } -#ifdef FEATURE_HTTPS_INSPECTION - /* - * Log the request unless we're https inspecting - * in which case we don't have the path yet and - * will log the request later. - */ - if (!client_use_ssl(csp)) -#endif - { - log_error(LOG_LEVEL_REQUEST, "%s%s", http->hostport, http->path); - } /* decide how to route the HTTP request */ fwd = forward_url(csp, http); @@ -3648,6 +3637,18 @@ static void chat(struct client_state *csp) } #endif +#ifdef FEATURE_HTTPS_INSPECTION + /* + * Log the request unless we're https inspecting + * in which case we don't have the path yet and + * will log the request later. + */ + if (!client_use_ssl(csp)) +#endif + { + log_error(LOG_LEVEL_REQUEST, "%s%s", http->hostport, http->path); + } + if (http->ssl && connect_port_is_forbidden(csp)) { const char *acceptable_connect_ports = @@ -3889,8 +3890,9 @@ static void chat(struct client_state *csp) */ if (!tunnel_established_successfully(server_response, (unsigned int)len)) { - log_error(LOG_LEVEL_ERROR, "Forwarder hasn't established " - "connection with destination server."); + log_error(LOG_LEVEL_ERROR, + "The forwarder %s failed to establish a connection with %s", + fwd->forward_host, http->host); rsp = error_response(csp, "connect-failed"); if (rsp) {