X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=ssl_common.c;h=c7bd538aab8b8fc9c05ed33ce0676f4210e60e1c;hp=20c1b24fc5310de0030c104e49733840fee971c0;hb=36bed44da8971c4b75627ec86cc41163bfde81ae;hpb=07d3ffdfb75d55d07fa8fc9e79f7829d9e8e476f diff --git a/ssl_common.c b/ssl_common.c index 20c1b24f..c7bd538a 100644 --- a/ssl_common.c +++ b/ssl_common.c @@ -323,6 +323,7 @@ extern void ssl_send_certificate_error(struct client_state *csp) size_t message_len = 0; int ret = 0; struct certs_chain *cert = NULL; + const size_t head_length = 63; /* Header of message with certificate information */ const char message_begin[] = @@ -333,7 +334,7 @@ extern void ssl_send_certificate_error(struct client_state *csp) "Server certificate verification failed\n" "

Server certificate verification failed

\n" "

Privoxy was unable " - "to securely connnect to the destination server.

" + "to securely connect to the destination server.

" "

Reason: "; const char message_end[] = "\r\n\r\n"; char reason[INVALID_CERT_INFO_BUF_SIZE]; @@ -409,6 +410,17 @@ extern void ssl_send_certificate_error(struct client_state *csp) ssl_send_data(ssl_attr, (const unsigned char *)message, strlen(message)); free_certificate_chain(csp); + + log_error(LOG_LEVEL_CRUNCH, "Certificate error: %s: https://%s%s", + reason, csp->http->hostport, csp->http->path); + log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s https://%s%s %s\" 200 %lu", + csp->ip_addr_str, csp->http->gpc, csp->http->hostport, csp->http->path, + csp->http->version, message_len-head_length); + +#ifdef FEATURE_CONNECTION_KEEP_ALIVE + csp->flags &= ~CSP_FLAG_CLIENT_CONNECTION_KEEP_ALIVE; + csp->flags |= CSP_FLAG_SERVER_SOCKET_TAINTED; +#endif } @@ -475,12 +487,12 @@ extern char *make_certs_path(const char *conf_dir, const char *file_name, + strlen(file_name) + strlen(suffix) + 2; /* Setting delimiter and editing path length */ -#if defined(_WIN32) || defined(__OS2__) +#if defined(_WIN32) char delim[] = "\\"; path_size += 1; -#else /* ifndef _WIN32 || __OS2__ */ +#else /* ifndef _WIN32 */ char delim[] = "/"; -#endif /* ifndef _WIN32 || __OS2__ */ +#endif /* ifndef _WIN32 */ /* * Building up path from many parts