X-Git-Url: http://www.privoxy.org/gitweb/misc.html?a=blobdiff_plain;f=loaders.c;h=fe123aad160a1dcc0764f115a999bd26065ad699;hb=2414895d4ca61d56c3b5d1a9dbaa442a5112a4c6;hp=422b2aed3806544f72a564ff6467cc5b71a3adf8;hpb=22de1764b6460768a49d33328fe00e7320e7e618;p=privoxy.git
diff --git a/loaders.c b/loaders.c
index 422b2aed..fe123aad 100644
--- a/loaders.c
+++ b/loaders.c
@@ -1,4 +1,4 @@
-const char loaders_rcs[] = "$Id: loaders.c,v 1.60 2007/03/20 15:16:34 fabiankeil Exp $";
+const char loaders_rcs[] = "$Id: loaders.c,v 1.62 2007/04/30 15:02:18 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/loaders.c,v $
@@ -35,6 +35,14 @@ const char loaders_rcs[] = "$Id: loaders.c,v 1.60 2007/03/20 15:16:34 fabiankeil
*
* Revisions :
* $Log: loaders.c,v $
+ * Revision 1.62 2007/04/30 15:02:18 fabiankeil
+ * Introduce dynamic pcrs jobs that can resolve variables.
+ *
+ * Revision 1.61 2007/04/15 16:39:21 fabiankeil
+ * Introduce tags as alternative way to specify which
+ * actions apply to a request. At the moment tags can be
+ * created based on client and server headers.
+ *
* Revision 1.60 2007/03/20 15:16:34 fabiankeil
* Use dedicated header filter actions instead of abusing "filter".
* Replace "filter-client-headers" and "filter-client-headers"
@@ -496,7 +504,6 @@ void sweep(void)
destroy_list(csp->headers);
destroy_list(csp->tags);
- destroy_list(csp->cookie_list);
free_current_action(csp->action);
@@ -1377,6 +1384,7 @@ int load_re_filterfile(struct client_state *csp)
return 0;
}
+
/*********************************************************************
*
* Function : load_one_re_filterfile
@@ -1523,12 +1531,46 @@ int load_one_re_filterfile(struct client_state *csp, int fileid)
*/
if (bl != NULL)
{
- enlist(bl->patterns, buf);
+ error = enlist(bl->patterns, buf);
+ if (JB_ERR_MEMORY == 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);
+
+ if (pcrs_job_is_dynamic(buf))
+ {
+ /*
+ * Dynamic pattern that might contain variables
+ * and has to be recompiled for every request
+ */
+ if (bl->joblist != NULL)
+ {
+ pcrs_free_joblist(bl->joblist);
+ bl->joblist = NULL;
+ }
+ bl->dynamic = 1;
+ log_error(LOG_LEVEL_RE_FILTER,
+ "Adding dynamic re_filter job \'%s\' to filter %s succeeded.", buf, bl->name);
+ continue;
+ }
+ else if (bl->dynamic)
+ {
+ /*
+ * A previous job was dynamic and as we
+ * recompile the whole filter anyway, it
+ * makes no sense to compile this job now.
+ */
+ log_error(LOG_LEVEL_RE_FILTER,
+ "Adding static re_filter job \'%s\' to dynamic filter %s succeeded.", buf, bl->name);
+ continue;
+ }
if ((dummy = pcrs_compile_command(buf, &error)) == NULL)
{
log_error(LOG_LEVEL_ERROR,
- "Adding re_filter job %s to filter %s failed with error %d.", buf, bl->name, error);
+ "Adding re_filter job \'%s\' to filter %s failed with error %d.", buf, bl->name, error);
continue;
}
else
@@ -1542,7 +1584,7 @@ int load_one_re_filterfile(struct client_state *csp, int fileid)
lastjob->next = dummy;
}
lastjob = dummy;
- log_error(LOG_LEVEL_RE_FILTER, "Adding re_filter job %s to filter %s succeeded.", buf, bl->name);
+ log_error(LOG_LEVEL_RE_FILTER, "Adding re_filter job \'%s\' to filter %s succeeded.", buf, bl->name);
}
}
else