Fix high_memory_warning parsing

The squid.conf parser does not accept whitespace in the IFDEF: parameter
values. This was hiding parse issues when high_memory_warning was used
without gnumalloc.h availability.

Also, sort the cf_gen_defines array alphabetically by IFDEF: value for
easier maintenance.

diff --git a/src/cf.data.pre b/src/cf.data.pre
index d5931c3328c972a34e84a78356d2722ffc26df8a..c0c296d9ebfdd25146ebd8b00fa4b053657ba8b0 100644 (file)
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -9036,7 +9036,7 @@ DOC_END
 NAME: high_memory_warning
 TYPE: b_size_t
 LOC: Config.warnings.high_memory
-IFDEF: HAVE_MSTATS && HAVE_GNUMALLOC_H
+IFDEF: HAVE_MSTATS&&HAVE_GNUMALLOC_H
 DEFAULT: 0 KB
 DEFAULT_DOC: disabled.
 DOC_START

diff --git a/src/cf_gen_defines b/src/cf_gen_defines
index 7896b76a0ba31579e7802909d700b4cbb27684f9..5b8ddc1539f23fbcaabf8e07d6a98b3f4b6911f6 100644 (file)
--- a/src/cf_gen_defines
+++ b/src/cf_gen_defines
@@ -5,33 +5,34 @@ BEGIN {
        print "*/"
        print "#include \"autoconf.h\""
        print "static struct { const char *name; const char *enable; int defined;} defines[] = {"
-       define["USE_DELAY_POOLS"]="--enable-delay-pools"
+       define["_SQUID_WINDOWS_"]="MS Windows"
        define["FOLLOW_X_FORWARDED_FOR"]="--enable-follow-x-forwarded-for"
-       define["FOLLOW_X_FORWARDED_FOR&&USE_DELAY_POOLS"]="--enable-follow-x-forwarded-for and --enable-delay-pools"
-       define["FOLLOW_X_FORWARDED_FOR&&USE_ADAPTATION"]="--enable-follow-x-forwarded-for and (--enable-icap-client and/or --enable-ecap)"
        define["FOLLOW_X_FORWARDED_FOR&&LINUX_NETFILTER"]="--enable-follow-x-forwarded-for and --enable-linux-netfilter"
-       define["USE_HTTP_VIOLATIONS"]="--enable-http-violations"
+       define["FOLLOW_X_FORWARDED_FOR&&USE_ADAPTATION"]="--enable-follow-x-forwarded-for and (--enable-icap-client and/or --enable-ecap)"
+       define["FOLLOW_X_FORWARDED_FOR&&USE_DELAY_POOLS"]="--enable-follow-x-forwarded-for and --enable-delay-pools"
+       define["HAVE_MSTATS&&HAVE_GNUMALLOC_H"]="GNU Malloc with mstats()"
        define["ICAP_CLIENT"]="--enable-icap-client"
+       define["SO_MARK&&USE_LIBCAP"]="Packet MARK (Linux)"
        define["SQUID_SNMP"]="--enable-snmp"
        define["USE_ADAPTATION"]="--enable-ecap or --enable-icap-client"
        define["USE_AUTH"]="--enable-auth"
        define["USE_CACHE_DIGESTS"]="--enable-cache-digests"
+       define["USE_DELAY_POOLS"]="--enable-delay-pools"
        define["USE_ECAP"]="--enable-ecap"
        define["USE_ERR_LOCALES"]="--enable-auto-locale"
        define["USE_HTCP"]="--enable-htcp"
+       define["USE_HTTP_VIOLATIONS"]="--enable-http-violations"
        define["USE_ICMP"]="--enable-icmp"
        define["USE_IDENT"]="--enable-ident-lookups"
        define["USE_LOADABLE_MODULES"]="--enable-loadable-modules"
+       define["USE_OPENSSL"]="--with-openssl"
+       define["USE_QOS_TOS"]="--enable-zph-qos"
        define["USE_SQUID_ESI"]="--enable-esi"
        define["USE_SQUID_EUI"]="--enable-eui"
        define["USE_SSL_CRTD"]="--enable-ssl-crtd"
-       define["USE_OPENSSL"]="--with-openssl"
        define["USE_UNLINKD"]="--enable-unlinkd"
        define["USE_WCCP"]="--enable-wccp"
        define["USE_WCCPv2"]="--enable-wccpv2"
-       define["USE_QOS_TOS"]="--enable-zph-qos"
-       define["_SQUID_WINDOWS_"]="MS Windows"
-       define["SO_MARK&&USE_LIBCAP"]="Packet MARK (Linux)"
 }
 /^IFDEF:/ {
        if (define[$2] != "")