* Purpose : Declares functions to parse/crunch headers and pages.
*
* Copyright : Written by and Copyright (C) 2001-2016 the
- * Privoxy team. http://www.privoxy.org/
+ * Privoxy team. https://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
* by and Copyright (C) 1997 Anonymous Coders and
struct url_actions *b;
int i;
- init_current_action(csp->action);
+#ifdef FEATURE_HTTPS_INSPECTION
+ if (!csp->http->client_ssl)
+#endif
+ {
+ /*
+ * When filtering TLS traffic this function gets called a
+ * second time after the encrypted headers have been received.
+ *
+ * Only initialize the first time. The second time we apply
+ * the newly set actions on top of the ones that were set
+ * the first time.
+ */
+ init_current_action(csp->action);
+ }
for (i = 0; i < MAX_AF_FILES; i++)
{
if (NULL != socks_proxy)
{
- /* Parse the SOCKS proxy host[:port] */
+ /* Parse the SOCKS proxy [user:pass@]host[:port] */
fwd->gateway_port = 1080;
parse_forwarder_address(socks_proxy,
- &fwd->gateway_host, &fwd->gateway_port);
+ &fwd->gateway_host, &fwd->gateway_port,
+ &fwd->auth_username, &fwd->auth_password);
http_parent = vec[2];
}
{
fwd->forward_port = 8000;
parse_forwarder_address(http_parent,
- &fwd->forward_host, &fwd->forward_port);
+ &fwd->forward_host, &fwd->forward_port,
+ NULL, NULL);
}
assert (NULL != fwd);