projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix typo in macro name.
[privoxy.git]
/
loadcfg.c
diff --git
a/loadcfg.c
b/loadcfg.c
index
904110a
..
59a3890
100644
(file)
--- a/
loadcfg.c
+++ b/
loadcfg.c
@@
-1,4
+1,4
@@
-const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.7
6 2008/05/10 09:03:16
fabiankeil Exp $";
+const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.7
7 2008/05/26 16:13:22
fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/loadcfg.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/loadcfg.c,v $
@@
-35,6
+35,9
@@
const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.76 2008/05/10 09:03:16 fabiankeil
*
* Revisions :
* $Log: loadcfg.c,v $
*
* Revisions :
* $Log: loadcfg.c,v $
+ * Revision 1.77 2008/05/26 16:13:22 fabiankeil
+ * Reuse directive_hash and don't hash the same directive twice.
+ *
* Revision 1.76 2008/05/10 09:03:16 fabiankeil
* - Merge three string_append() calls.
* - Remove useless assertion.
* Revision 1.76 2008/05/10 09:03:16 fabiankeil
* - Merge three string_append() calls.
* - Remove useless assertion.
@@
-1039,10
+1042,10
@@
struct configuration_spec * load_config(void)
continue;
/* *************************************************************************
continue;
/* *************************************************************************
- *
hash_enforce_
blocks 0|1
+ *
enforce-
blocks 0|1
* *************************************************************************/
* *************************************************************************/
-#ifdef FEATURE_FORCE_LOAD
case hash_enforce_blocks:
case hash_enforce_blocks:
+#ifdef FEATURE_FORCE_LOAD
if ((*arg != '\0') && (0 != atoi(arg)))
{
config->feature_flags |= RUNTIME_FEATURE_ENFORCE_BLOCKS;
if ((*arg != '\0') && (0 != atoi(arg)))
{
config->feature_flags |= RUNTIME_FEATURE_ENFORCE_BLOCKS;
@@
-1051,8
+1054,11
@@
struct configuration_spec * load_config(void)
{
config->feature_flags &= ~RUNTIME_FEATURE_ENFORCE_BLOCKS;
}
{
config->feature_flags &= ~RUNTIME_FEATURE_ENFORCE_BLOCKS;
}
- continue;
+#else
+ log_error(LOG_LEVEL_ERROR, "Ignoring directive 'enforce-blocks'. "
+ "FEATURE_FORCE_LOAD is disabled, blocks will always be enforced.");
#endif /* def FEATURE_FORCE_LOAD */
#endif /* def FEATURE_FORCE_LOAD */
+ continue;
/* *************************************************************************
* filterfile file-name
/* *************************************************************************
* filterfile file-name