projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Regenerate homepage with new sponsor cooltechzone.com
[privoxy.git]
/
filters.c
diff --git
a/filters.c
b/filters.c
index
a0ddb93
..
9a8f131
100644
(file)
--- a/
filters.c
+++ b/
filters.c
@@
-2466,10
+2466,11
@@
static const struct forward_spec *get_forward_override_settings(struct client_st
if (NULL != socks_proxy)
{
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_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];
}
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_port = 8000;
parse_forwarder_address(http_parent,
- &fwd->forward_host, &fwd->forward_port);
+ &fwd->forward_host, &fwd->forward_port,
+ NULL, NULL);
}
assert (NULL != fwd);
}
assert (NULL != fwd);