X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=loaders.c;h=2a42b0ddb9f8bc550010c1aeef94530a55ce9785;hp=69febbcf758365d665077a76a6e98e27bd8d7781;hb=1697624e4d6f524920a8b7290ce468cc2db7b7f4;hpb=e85a421e7af292c4304d5010d8ecd335b24356fc diff --git a/loaders.c b/loaders.c index 69febbcf..2a42b0dd 100644 --- a/loaders.c +++ b/loaders.c @@ -1,4 +1,4 @@ -const char loaders_rcs[] = "$Id: loaders.c,v 1.91 2012/06/19 12:50:22 fabiankeil Exp $"; +const char loaders_rcs[] = "$Id: loaders.c,v 1.94 2012/12/07 12:43:05 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/loaders.c,v $ @@ -182,6 +182,7 @@ unsigned int sweep(void) last_active->next = client_list->next; freez(csp->ip_addr_str); + freez(csp->client_iob->buf); freez(csp->iob->buf); freez(csp->error_message); @@ -1445,18 +1446,50 @@ static int file_has_been_modified(const char *filename, time_t last_know_modific * FALSE otherwise. * *********************************************************************/ -int any_loaded_file_changed(const struct file_list *files_to_check) +int any_loaded_file_changed(const struct client_state *csp) { - const struct file_list *file_to_check = files_to_check; + const struct file_list *file_to_check = csp->config->config_file_list; + int i; + + if (file_has_been_modified(file_to_check->filename, file_to_check->lastmodified)) + { + return TRUE; + } - while (file_to_check != NULL) + for (i = 0; i < MAX_AF_FILES; i++) { - if (file_has_been_modified(file_to_check->filename, file_to_check->lastmodified)) + if (csp->actions_list[i]) + { + file_to_check = csp->actions_list[i]; + if (file_has_been_modified(file_to_check->filename, file_to_check->lastmodified)) + { + return TRUE; + } + } + } + + for (i = 0; i < MAX_AF_FILES; i++) + { + if (csp->rlist[i]) + { + file_to_check = csp->rlist[i]; + if (file_has_been_modified(file_to_check->filename, file_to_check->lastmodified)) + { + return TRUE; + } + } + } + +#ifdef FEATURE_TRUST + if (csp->tlist) + { + if (file_has_been_modified(csp->tlist->filename, csp->tlist->lastmodified)) { return TRUE; } - file_to_check = file_to_check->next; } +#endif /* def FEATURE_TRUST */ + return FALSE; }