projects
/
privoxy.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3747654
)
Revert the last commit as there's a better way.
author
Fabian Keil
<fk@fabiankeil.de>
Wed, 18 Mar 2009 21:46:26 +0000
(21:46 +0000)
committer
Fabian Keil
<fk@fabiankeil.de>
Wed, 18 Mar 2009 21:46:26 +0000
(21:46 +0000)
loadcfg.c
patch
|
blob
|
history
diff --git
a/loadcfg.c
b/loadcfg.c
index
aeb409b
..
6282b31
100644
(file)
--- a/
loadcfg.c
+++ b/
loadcfg.c
@@
-1,4
+1,4
@@
-const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.9
1 2009/03/09 17:29:08
fabiankeil Exp $";
+const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.9
2 2009/03/18 20:43:19
fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/loadcfg.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/loadcfg.c,v $
@@
-35,6
+35,11
@@
const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.91 2009/03/09 17:29:08 fabiankeil
*
* Revisions :
* $Log: loadcfg.c,v $
*
* Revisions :
* $Log: loadcfg.c,v $
+ * Revision 1.92 2009/03/18 20:43:19 fabiankeil
+ * Don't enable LOG_LEVEL_INFO by default and don't apply the user's
+ * debug settings until the logfile has been opened (if there is one).
+ * Patch submitted by Roland in #2624120.
+ *
* Revision 1.91 2009/03/09 17:29:08 fabiankeil
* As of r1.88, the show-status page can use a single line for
* warnings about ignored directives and the names of the ignored
* Revision 1.91 2009/03/09 17:29:08 fabiankeil
* As of r1.88, the show-status page can use a single line for
* warnings about ignored directives and the names of the ignored
@@
-1775,6
+1780,8
@@
struct configuration_spec * load_config(void)
fclose(configfp);
fclose(configfp);
+ set_debug_level(config->debug);
+
freez(config->logfile);
if (!no_daemon)
freez(config->logfile);
if (!no_daemon)
@@
-1790,8
+1797,6
@@
struct configuration_spec * load_config(void)
}
}
}
}
- set_debug_level(config->debug);
-
#ifdef FEATURE_CONNECTION_KEEP_ALIVE
if (config->feature_flags & RUNTIME_FEATURE_CONNECTION_KEEP_ALIVE)
{
#ifdef FEATURE_CONNECTION_KEEP_ALIVE
if (config->feature_flags & RUNTIME_FEATURE_CONNECTION_KEEP_ALIVE)
{