projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove cooltechzone.com from the sponsor list
[privoxy.git]
/
filters.c
diff --git
a/filters.c
b/filters.c
index
2aa658e
..
0d36485
100644
(file)
--- a/
filters.c
+++ b/
filters.c
@@
-1,4
+1,3
@@
-const char filters_rcs[] = "$Id: filters.c,v 1.206 2017/06/04 14:43:10 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/filters.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/filters.c,v $
@@
-6,7
+5,7
@@
const char filters_rcs[] = "$Id: filters.c,v 1.206 2017/06/04 14:43:10 fabiankei
* Purpose : Declares functions to parse/crunch headers and pages.
*
* Copyright : Written by and Copyright (C) 2001-2016 the
* 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. http
s
://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
* by and Copyright (C) 1997 Anonymous Coders and
*
* Based on the Internet Junkbuster originally written
* by and Copyright (C) 1997 Anonymous Coders and
@@
-78,8
+77,6
@@
const char filters_rcs[] = "$Id: filters.c,v 1.206 2017/06/04 14:43:10 fabiankei
#include "win32.h"
#endif
#include "win32.h"
#endif
-const char filters_h_rcs[] = FILTERS_H_VERSION;
-
typedef char *(*filter_function_ptr)();
static filter_function_ptr get_filter_function(const struct client_state *csp);
static jb_err prepare_for_filtering(struct client_state *csp);
typedef char *(*filter_function_ptr)();
static filter_function_ptr get_filter_function(const struct client_state *csp);
static jb_err prepare_for_filtering(struct client_state *csp);
@@
-1058,7
+1055,7
@@
char *get_last_url(char *subject, const char *redirect_mode)
}
if (0 == strcmpic(redirect_mode, "check-decoded-url") && strchr(subject, '%'))
}
if (0 == strcmpic(redirect_mode, "check-decoded-url") && strchr(subject, '%'))
- {
+ {
char *url_segment = NULL;
char **url_segments;
size_t max_segments;
char *url_segment = NULL;
char **url_segments;
size_t max_segments;
@@
-2469,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];
}
@@
-2490,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);