X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=project.h;h=4a278cfa216ed8ef0b0283dd45a735acd5fdc265;hp=e241360a610b19649e26a38eea6dcbb8dc7ac14b;hb=8ff919206b9740c46e7fe93e01d62f594d14262e;hpb=d119cac814d19b58c0a299ebaeed7f58edf887d5 diff --git a/project.h b/project.h index e241360a..4a278cfa 100644 --- a/project.h +++ b/project.h @@ -331,11 +331,9 @@ struct http_request char *host_ip_addr_str; /**< String with dotted decimal representation of host's IP. NULL before connect_to() */ -#ifndef FEATURE_EXTENDED_HOST_PATTERNS char *dbuffer; /**< Buffer with '\0'-delimited domain name. */ char **dvec; /**< List of pointers to the strings in dbuffer. */ int dcount; /**< How many parts to this domain? (length of dvec) */ -#endif /* ndef FEATURE_EXTENDED_HOST_PATTERNS */ #ifdef FEATURE_HTTPS_INSPECTION int client_ssl; /**< Flag if we should communicate with client over ssl */ @@ -398,12 +396,12 @@ struct url_spec { #ifdef FEATURE_EXTENDED_HOST_PATTERNS regex_t *host_regex;/**< Regex for host matching */ -#else + enum host_regex_type { VANILLA_HOST_PATTERN, EXTENDED_HOST_PATTERN } host_regex_type; +#endif /* defined FEATURE_EXTENDED_HOST_PATTERNS */ char *dbuffer; /**< Buffer with '\0'-delimited domain name, or NULL to match all hosts. */ char **dvec; /**< List of pointers to the strings in dbuffer. */ int dcount; /**< How many parts to this domain? (length of dvec) */ int unanchored; /**< Bitmap - flags are ANCHOR_LEFT and ANCHOR_RIGHT. */ -#endif /* defined FEATURE_EXTENDED_HOST_PATTERNS */ char *port_list; /**< List of acceptable ports, or NULL to match all ports */