bughz/tinyproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[BB#89] Don't recompile regular expressions

Browse Source 
This is a modification of a patch originally written by
John van der Kamp <john@kirika.demon.nl> at
<http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=579427#12>

The modification was done by the committer.
This commit is contained in:
John van der Kamp 2010-06-01 07:54:25 +05:30 committed by Mukund Sivaraman
parent 50e3a0f6d9
commit a7933bdd36
3 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/conf.c
View File

@ -163,6 +163,8 @@ static HANDLE_FUNC (handle_upstream);
static HANDLE_FUNC (handle_upstream_no);
#endif
static void config_free_regex (void);
/*
* This macro can be used to make standard directives in the form:
* directive arguments [arguments ...]
@ -317,7 +319,8 @@ static void free_config (struct config_s *conf)
*
* Returns 0 on success; negative upon failure.
*/
static int config_compile (void)
int
config_compile_regex (void)
{
unsigned int i, r;
@ -335,9 +338,30 @@ static int config_compile (void)
if (r)
return r;
}
atexit (config_free_regex);
return 0;
}
/*
* Frees pre-compiled regular expressions used by the configuration
* file. This function is registered to be automatically called at exit.
*/
static void
config_free_regex (void)
{
unsigned int i;
for (i = 0; i < ndirectives; i++) {
if (directives[i].cre) {
regfree (directives[i].cre);
safefree (directives[i].cre);
directives[i].cre = NULL;
}
}
}
/*
* Attempt to match the supplied line with any of the configuration
* regexes defined above. If a match is found, call the handler
@ -397,7 +421,7 @@ static int load_config_file (const char *config_fname, struct config_s *conf)
goto done;
}
if (config_compile () || config_parse (conf, config_file)) {
if (config_parse (conf, config_file)) {
fprintf (stderr, "Unable to parse config file. "
"Not starting.\n");
goto done;

2
src/conf.h
View File

@ -115,4 +115,6 @@ struct config_s {
extern int reload_config_file (const char *config_fname, struct config_s *conf,
struct config_s *defaults);
int config_compile_regex (void);
#endif

5
src/main.c
View File

@ -383,6 +383,11 @@ main (int argc, char **argv)
log_message (LOG_INFO, "Initializing " PACKAGE " ...");
ret = config_compile_regex();
if (ret != 0) {
exit (EX_SOFTWARE);
}
initialize_config_defaults (&config_defaults);
process_cmdline (argc, argv, &config_defaults);