X-Git-Url: http://www.privoxy.org/gitweb/gpl.html?a=blobdiff_plain;f=loaders.c;h=471229545e9ccbed2f54f71caf6b85b9e7ebb43d;hb=fc08096890d3188ac599d8043ce8ad4a2d08d7eb;hp=16529e0fdbd0e43ff219de070a938091534c3e9f;hpb=8abd1cc33f1b39e5618ecc883024de0ef6aa9c09;p=privoxy.git
diff --git a/loaders.c b/loaders.c
index 16529e0f..47122954 100644
--- a/loaders.c
+++ b/loaders.c
@@ -1,4 +1,3 @@
-const char loaders_rcs[] = "$Id: loaders.c,v 1.107 2017/06/26 12:17:43 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/loaders.c,v $
@@ -9,7 +8,7 @@ const char loaders_rcs[] = "$Id: loaders.c,v 1.107 2017/06/26 12:17:43 fabiankei
* 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. https://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
* by and Copyright (C) 1997 Anonymous Coders and
@@ -47,7 +46,7 @@ const char loaders_rcs[] = "$Id: loaders.c,v 1.107 2017/06/26 12:17:43 fabiankei
#include
#include
-#if !defined(_WIN32) && !defined(__OS2__)
+#if !defined(_WIN32)
#include
#endif
@@ -63,8 +62,6 @@ const char loaders_rcs[] = "$Id: loaders.c,v 1.107 2017/06/26 12:17:43 fabiankei
#include "urlmatch.h"
#include "encode.h"
-const char loaders_h_rcs[] = LOADERS_H_VERSION;
-
/*
* Currently active files.
* These are also entered in the main linked list of files.
@@ -115,7 +112,13 @@ void free_csp_resources(struct client_state *csp)
free_http_request(csp->http);
destroy_list(csp->headers);
+#ifdef FEATURE_HTTPS_INSPECTION
+ destroy_list(csp->https_headers);
+#endif
destroy_list(csp->tags);
+#ifdef FEATURE_CLIENT_TAGS
+ destroy_list(csp->client_tags);
+#endif
free_current_action(csp->action);
}
@@ -313,12 +316,6 @@ int check_file_changed(const struct file_list * current,
fs->filename = strdup_or_die(filename);
fs->lastmodified = statbuf->st_mtime;
- if (fs->filename == NULL)
- {
- /* Out of memory error */
- freez (fs);
- return 1;
- }
*newfl = fs;
return 1;
}
@@ -1007,6 +1004,8 @@ void unload_forward_spec(struct forward_spec *fwd)
free_pattern_spec(fwd->url);
freez(fwd->gateway_host);
freez(fwd->forward_host);
+ freez(fwd->auth_username);
+ freez(fwd->auth_password);
free(fwd);
return;
@@ -1106,7 +1105,6 @@ int load_one_re_filterfile(struct client_state *csp, int fileid)
struct file_list *fs;
char *buf = NULL;
- int error;
unsigned long linenum = 0;
pcrs_job *dummy, *lastjob = NULL;
@@ -1213,7 +1211,7 @@ int load_one_re_filterfile(struct client_state *csp, int fileid)
/*
* If this is the first filter block, chain it
- * to the file_list rather than its (nonexistant)
+ * to the file_list rather than its (nonexistent)
* predecessor
*/
if (fs->f == NULL)
@@ -1228,7 +1226,9 @@ int load_one_re_filterfile(struct client_state *csp, int fileid)
bl = new_bl;
log_error(LOG_LEVEL_RE_FILTER, "Reading in filter \"%s\" (\"%s\")", bl->name, bl->description);
-
+#ifdef FEATURE_EXTENDED_STATISTICS
+ register_filter_for_statistics(bl->name);
+#endif
freez(buf);
continue;
}
@@ -1236,15 +1236,16 @@ int load_one_re_filterfile(struct client_state *csp, int fileid)
#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)
{
- log_error(LOG_LEVEL_FATAL, "External filter '%s' contains several jobss. "
+ log_error(LOG_LEVEL_FATAL, "External filter '%s' contains several jobs. "
"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.",
@@ -1256,17 +1257,19 @@ int load_one_re_filterfile(struct client_state *csp, int fileid)
#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
*/
- 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);
}
- assert(JB_ERR_OK == error);
+ assert(JB_ERR_OK == jb_error);
if (pcrs_job_is_dynamic(buf))
{
@@ -1298,11 +1301,11 @@ int load_one_re_filterfile(struct client_state *csp, int fileid)
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",
- buf, bl->name, pcrs_strerror(error));
+ buf, bl->name, pcrs_strerror(pcrs_error));
freez(buf);
continue;
}
@@ -1322,7 +1325,8 @@ int load_one_re_filterfile(struct client_state *csp, int fileid)
}
else
{
- log_error(LOG_LEVEL_ERROR, "Ignoring job %s outside filter block in %s, line %d",
+ log_error(LOG_LEVEL_ERROR,
+ "Ignoring job %s outside filter block in %s, line %lu",
buf, csp->config->re_filterfile[fileid], linenum);
}
freez(buf);