projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Included fix to repair broken HTTP requests that
[privoxy.git]
/
loaders.c
diff --git
a/loaders.c
b/loaders.c
index
e6edc55
..
7752a97
100644
(file)
--- a/
loaders.c
+++ b/
loaders.c
@@
-1,4
+1,4
@@
-const char loaders_rcs[] = "$Id: loaders.c,v 1.1
5 2001/06/07 23:14:14 jongfoster
Exp $";
+const char loaders_rcs[] = "$Id: loaders.c,v 1.1
7 2001/06/29 13:31:51 oes
Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/loaders.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/loaders.c,v $
@@
-35,6
+35,12
@@
const char loaders_rcs[] = "$Id: loaders.c,v 1.15 2001/06/07 23:14:14 jongfoster
*
* Revisions :
* $Log: loaders.c,v $
*
* Revisions :
* $Log: loaders.c,v $
+ * Revision 1.17 2001/06/29 13:31:51 oes
+ * Various adaptions
+ *
+ * Revision 1.16 2001/06/09 10:55:28 jongfoster
+ * Changing BUFSIZ ==> BUFFER_SIZE
+ *
* Revision 1.15 2001/06/07 23:14:14 jongfoster
* Removing ACL and forward file loaders - these
* files have been merged into the config file.
* Revision 1.15 2001/06/07 23:14:14 jongfoster
* Removing ACL and forward file loaders - these
* files have been merged into the config file.
@@
-158,11
+164,6
@@
const char loaders_rcs[] = "$Id: loaders.c,v 1.15 2001/06/07 23:14:14 jongfoster
#include "gateway.h"
#include "actions.h"
#include "gateway.h"
#include "actions.h"
-#ifndef SPLIT_PROXY_ARGS
-/* For strsav */
-#include "showargs.h"
-#endif /* ndef SPLIT_PROXY_ARGS */
-
const char loaders_h_rcs[] = LOADERS_H_VERSION;
/* Fix a problem with Solaris. There should be no effect on other
const char loaders_h_rcs[] = LOADERS_H_VERSION;
/* Fix a problem with Solaris. There should be no effect on other
@@
-263,6
+264,9
@@
void sweep(void)
csp->next = ncsp->next;
freez(ncsp->ip_addr_str);
csp->next = ncsp->next;
freez(ncsp->ip_addr_str);
+ freez(ncsp->my_ip_addr_str);
+ freez(ncsp->my_hostname);
+
#ifdef TRUST_FILES
freez(ncsp->referrer);
#endif /* def TRUST_FILES */
#ifdef TRUST_FILES
freez(ncsp->referrer);
#endif /* def TRUST_FILES */
@@
-380,14
+384,13
@@
int create_url_spec(struct url_spec * url, char * buf)
(REG_EXTENDED|REG_NOSUB|REG_ICASE));
if (errcode)
{
(REG_EXTENDED|REG_NOSUB|REG_ICASE));
if (errcode)
{
- size_t errlen =
- regerror(errcode,
- url->preg, buf, sizeof(buf));
+ size_t errlen = regerror(errcode,
+ url->preg, buf, sizeof(buf));
buf[errlen] = '\0';
log_error(LOG_LEVEL_ERROR, "error compiling %s: %s",
buf[errlen] = '\0';
log_error(LOG_LEVEL_ERROR, "error compiling %s: %s",
-
url->spec, buf);
+ url->spec, buf);
freez(url->spec);
freez(url->path);
freez(url->spec);
freez(url->path);
@@
-426,6
+429,7
@@
int create_url_spec(struct url_spec * url, char * buf)
url->unanchored = tmp_url->unanchored;
return 0; /* OK */
url->unanchored = tmp_url->unanchored;
return 0; /* OK */
+
}
}
@@
-549,6
+553,7
@@
int check_file_changed(const struct file_list * current,
*newfl = fs;
return 1;
*newfl = fs;
return 1;
+
}
}
@@
-634,7
+639,7
@@
char *read_config_line(char *buf, int buflen, FILE *fp, struct file_list *fs)
if (contflag)
{
contflag = 0;
if (contflag)
{
contflag = 0;
-
continue;
+ continue;
}
/* Remove leading and trailing whitespace */
}
/* Remove leading and trailing whitespace */
@@
-670,7
+675,7
@@
static void unload_trustfile(void *f)
struct block_spec *b = (struct block_spec *)f;
if (b == NULL) return;
struct block_spec *b = (struct block_spec *)f;
if (b == NULL) return;
- unload_trustfile(b->next);
+ unload_trustfile(b->next);
/* Stack is cheap, isn't it? */
free_url(b->url);
free_url(b->url);
@@
-838,18
+843,15
@@
load_trustfile_error:
*********************************************************************/
static void unload_re_filterfile(void *f)
{
*********************************************************************/
static void unload_re_filterfile(void *f)
{
- pcrs_job *joblist;
struct re_filterfile_spec *b = (struct re_filterfile_spec *)f;
if (b == NULL) return;
destroy_list(b->patterns);
struct re_filterfile_spec *b = (struct re_filterfile_spec *)f;
if (b == NULL) return;
destroy_list(b->patterns);
-
- joblist = b->joblist;
- while ( NULL != (joblist = pcrs_free_job(joblist)) ) {}
-
+ pcrs_free_joblist(b->joblist);
freez(b);
freez(b);
+ return;
}
/*********************************************************************
}
/*********************************************************************
@@
-909,7
+911,7
@@
int load_re_filterfile(struct client_state *csp)
enlist( bl->patterns, buf );
/* We have a meaningful line -> make it a job */
enlist( bl->patterns, buf );
/* We have a meaningful line -> make it a job */
- if ((dummy = pcrs_
make_job
(buf, &error)) == NULL)
+ if ((dummy = pcrs_
compile
(buf, &error)) == NULL)
{
log_error(LOG_LEVEL_RE_FILTER,
"Adding re_filter job %s failed with error %d.", buf, error);
{
log_error(LOG_LEVEL_RE_FILTER,
"Adding re_filter job %s failed with error %d.", buf, error);