X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=filters.c;h=9a8f1312317121be26b3e84f8b1bc1e913dbeed6;hp=d45ff949b90c4c6f95ecdd07a4b7995bf5f9174c;hb=8544684b8acfab273ee2c89b7236334833938fa2;hpb=5ca53f92bc634c20fed90f338ac41561f87b834c diff --git a/filters.c b/filters.c index d45ff949..9a8f1312 100644 --- a/filters.c +++ b/filters.c @@ -1055,7 +1055,7 @@ char *get_last_url(char *subject, const char *redirect_mode) } if (0 == strcmpic(redirect_mode, "check-decoded-url") && strchr(subject, '%')) - { + { char *url_segment = NULL; char **url_segments; size_t max_segments; @@ -2466,10 +2466,11 @@ static const struct forward_spec *get_forward_override_settings(struct client_st 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]; } @@ -2487,7 +2488,8 @@ static const struct forward_spec *get_forward_override_settings(struct client_st { 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);