projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pcrs.3: Change URL to https://
[privoxy.git]
/
loaders.c
diff --git
a/loaders.c
b/loaders.c
index
7683fa5
..
20f0888
100644
(file)
--- a/
loaders.c
+++ b/
loaders.c
@@
-8,7
+8,7
@@
* unload files that are no longer in use.
*
* Copyright : Written by and Copyright (C) 2001-2014 the
* unload files that are no longer in use.
*
* Copyright : Written by and Copyright (C) 2001-2014 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
@@
-112,7
+112,13
@@
void free_csp_resources(struct client_state *csp)
free_http_request(csp->http);
destroy_list(csp->headers);
free_http_request(csp->http);
destroy_list(csp->headers);
+#ifdef FEATURE_HTTPS_INSPECTION
+ destroy_list(csp->https_headers);
+#endif
destroy_list(csp->tags);
destroy_list(csp->tags);
+#ifdef FEATURE_CLIENT_TAGS
+ destroy_list(csp->client_tags);
+#endif
free_current_action(csp->action);
}
free_current_action(csp->action);
}
@@
-998,6
+1004,8
@@
void unload_forward_spec(struct forward_spec *fwd)
free_pattern_spec(fwd->url);
freez(fwd->gateway_host);
freez(fwd->forward_host);
free_pattern_spec(fwd->url);
freez(fwd->gateway_host);
freez(fwd->forward_host);
+ freez(fwd->auth_username);
+ freez(fwd->auth_password);
free(fwd);
return;
free(fwd);
return;
@@
-1097,7
+1105,6
@@
int load_one_re_filterfile(struct client_state *csp, int fileid)
struct file_list *fs;
char *buf = NULL;
struct file_list *fs;
char *buf = NULL;
- int error;
unsigned long linenum = 0;
pcrs_job *dummy, *lastjob = NULL;
unsigned long linenum = 0;
pcrs_job *dummy, *lastjob = NULL;
@@
-1204,7
+1211,7
@@
int load_one_re_filterfile(struct client_state *csp, int fileid)
/*
* If this is the first filter block, chain it
/*
* If this is the first filter block, chain it
- * to the file_list rather than its (nonexist
a
nt)
+ * to the file_list rather than its (nonexist
e
nt)
* predecessor
*/
if (fs->f == NULL)
* predecessor
*/
if (fs->f == NULL)
@@
-1227,6
+1234,7
@@
int load_one_re_filterfile(struct client_state *csp, int fileid)
#ifdef FEATURE_EXTERNAL_FILTERS
if ((bl != NULL) && (bl->type == FT_EXTERNAL_CONTENT_FILTER))
{
#ifdef FEATURE_EXTERNAL_FILTERS
if ((bl != NULL) && (bl->type == FT_EXTERNAL_CONTENT_FILTER))
{
+ jb_err jb_error;
/* Save the code as "pattern", but do not compile anything. */
if (bl->patterns->first != NULL)
{
/* Save the code as "pattern", but do not compile anything. */
if (bl->patterns->first != NULL)
{
@@
-1234,8
+1242,8
@@
int load_one_re_filterfile(struct client_state *csp, int fileid)
"Did you forget to escape a line break?",
bl->name);
}
"Did you forget to escape a line break?",
bl->name);
}
- error = enlist(bl->patterns, buf);
- if (JB_ERR_MEMORY == error)
+
jb_
error = enlist(bl->patterns, buf);
+ if (JB_ERR_MEMORY ==
jb_
error)
{
log_error(LOG_LEVEL_FATAL,
"Out of memory while enlisting external filter code \'%s\' for filter %s.",
{
log_error(LOG_LEVEL_FATAL,
"Out of memory while enlisting external filter code \'%s\' for filter %s.",
@@
-1247,17
+1255,19
@@
int load_one_re_filterfile(struct client_state *csp, int fileid)
#endif
if (bl != NULL)
{
#endif
if (bl != NULL)
{
+ int pcrs_error;
+ jb_err jb_error;
/*
* Save the expression, make it a pcrs_job
* and chain it into the current filter's joblist
*/
/*
* Save the expression, make it a pcrs_job
* and chain it into the current filter's joblist
*/
- error = enlist(bl->patterns, buf);
- if (JB_ERR_MEMORY == error)
+
jb_
error = enlist(bl->patterns, buf);
+ if (JB_ERR_MEMORY ==
jb_
error)
{
log_error(LOG_LEVEL_FATAL,
"Out of memory while enlisting re_filter job \'%s\' for filter %s.", buf, bl->name);
}
{
log_error(LOG_LEVEL_FATAL,
"Out of memory while enlisting re_filter job \'%s\' for filter %s.", buf, bl->name);
}
- assert(JB_ERR_OK == error);
+ assert(JB_ERR_OK ==
jb_
error);
if (pcrs_job_is_dynamic(buf))
{
if (pcrs_job_is_dynamic(buf))
{
@@
-1289,11
+1299,11
@@
int load_one_re_filterfile(struct client_state *csp, int fileid)
continue;
}
continue;
}
- if ((dummy = pcrs_compile_command(buf, &error)) == NULL)
+ if ((dummy = pcrs_compile_command(buf, &
pcrs_
error)) == NULL)
{
log_error(LOG_LEVEL_ERROR,
"Adding re_filter job \'%s\' to filter %s failed: %s",
{
log_error(LOG_LEVEL_ERROR,
"Adding re_filter job \'%s\' to filter %s failed: %s",
- buf, bl->name, pcrs_strerror(error));
+ buf, bl->name, pcrs_strerror(
pcrs_
error));
freez(buf);
continue;
}
freez(buf);
continue;
}