--enable-extended-host-patterns as it's not really PCRE syntax.
*
* Revisions :
* $Log: acconfig.h,v $
+ * Revision 1.34 2008/04/06 14:54:26 fabiankeil
+ * Use PCRE syntax in host patterns when configured
+ * with --enable-pcre-host-patterns.
+ *
* Revision 1.33 2006/12/17 19:15:26 fabiankeil
* Added ./configure switch for FEATURE_GRACEFUL_TERMINATION.
*
/*
* Allow PCRE syntax in host patterns.
*/
-#undef FEATURE_PCRE_HOST_PATTERNS
+#undef FEATURE_EXTENDED_HOST_PATTERNS
/*
* Use POSIX threads instead of native threads.
dnl Process this file with autoconf to produce a configure script.
dnl
-dnl $Id: configure.in,v 1.112 2008/03/27 18:27:22 fabiankeil Exp $
+dnl $Id: configure.in,v 1.113 2008/04/06 14:54:26 fabiankeil Exp $
dnl
dnl Written by and Copyright (C) 2001 - 2007 the SourceForge
dnl Privoxy team. http://www.privoxy.org/
dnl Temple Place - Suite 330, Boston, MA 02111-1307, USA.
dnl
dnl $Log: configure.in,v $
+dnl Revision 1.113 2008/04/06 14:54:26 fabiankeil
+dnl Use PCRE syntax in host patterns when configured
+dnl with --enable-pcre-host-patterns.
+dnl
dnl Revision 1.112 2008/03/27 18:27:22 fabiankeil
dnl Remove kill-popups action.
dnl
dnl AutoConf Initialization
dnl =================================================================
-AC_REVISION($Revision: 1.112 $)
+AC_REVISION($Revision: 1.113 $)
AC_INIT(jcc.c)
if test ! -f config.h.in; then
AC_DEFINE(FEATURE_GRACEFUL_TERMINATION)
fi])
-AC_ARG_ENABLE(pcre-host-patterns,
-[ --enable-pcre-host-patterns Allow PCRE syntax in host patterns.],
+AC_ARG_ENABLE(extended-host-patterns,
+[ --enable-extended-host-patterns Allow extended regular expressions in host patterns.],
[if test $enableval = yes; then
- AC_DEFINE(FEATURE_PCRE_HOST_PATTERNS)
+ AC_DEFINE(FEATURE_EXTENDED_HOST_PATTERNS)
fi])
dnl pcre/pcrs is needed for CGI anyway, so
#ifndef PROJECT_H_INCLUDED
#define PROJECT_H_INCLUDED
/** Version string. */
-#define PROJECT_H_VERSION "$Id: project.h,v 1.110 2008/03/29 12:13:46 fabiankeil Exp $"
+#define PROJECT_H_VERSION "$Id: project.h,v 1.111 2008/04/06 14:54:26 fabiankeil Exp $"
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/project.h,v $
*
* Revisions :
* $Log: project.h,v $
+ * Revision 1.111 2008/04/06 14:54:26 fabiankeil
+ * Use PCRE syntax in host patterns when configured
+ * with --enable-pcre-host-patterns.
+ *
* Revision 1.110 2008/03/29 12:13:46 fabiankeil
* Remove send-wafer and send-vanilla-wafer actions.
*
Used for debugging or display only. */
char *spec;
-#ifdef FEATURE_PCRE_HOST_PATTERNS
+#ifdef FEATURE_EXTENDED_HOST_PATTERNS
regex_t *host_regex;/**< Regex for host matching */
#else
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_PCRE_HOST_PATTERNS */
+#endif /* defined FEATURE_EXTENDED_HOST_PATTERNS */
char *port_list; /**< List of acceptable ports, or NULL to match all ports */
/**
* If you declare a static url_spec, this is the value to initialize it to zero.
*/
-#ifndef FEATURE_PCRE_HOST_PATTERNS
+#ifndef FEATURE_EXTENDED_HOST_PATTERNS
#define URL_SPEC_INITIALIZER { NULL, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL }
#else
#define URL_SPEC_INITIALIZER { NULL, NULL, NULL, NULL, NULL, NULL }
-#endif /* def FEATURE_PCRE_HOST_PATTERNS */
+#endif /* def FEATURE_EXTENDED_HOST_PATTERNS */
/**
* Constant for host part matching in URLs. If set, indicates that the start of
-const char urlmatch_rcs[] = "$Id: urlmatch.c,v 1.23 2008/04/05 12:19:20 fabiankeil Exp $";
+const char urlmatch_rcs[] = "$Id: urlmatch.c,v 1.24 2008/04/06 14:54:26 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/urlmatch.c,v $
*
* Revisions :
* $Log: urlmatch.c,v $
+ * Revision 1.24 2008/04/06 14:54:26 fabiankeil
+ * Use PCRE syntax in host patterns when configured
+ * with --enable-pcre-host-patterns.
+ *
* Revision 1.23 2008/04/05 12:19:20 fabiankeil
* Factor compile_host_pattern() out of create_url_spec().
*
}
-#ifdef FEATURE_PCRE_HOST_PATTERNS
+#ifdef FEATURE_EXTENDED_HOST_PATTERNS
/*********************************************************************
*
* Function : compile_host_pattern
}
}
-#endif /* def FEATURE_PCRE_HOST_PATTERNS */
+#endif /* def FEATURE_EXTENDED_HOST_PATTERNS */
/*********************************************************************
if (url == NULL) return;
freez(url->spec);
-#ifdef FEATURE_PCRE_HOST_PATTERNS
+#ifdef FEATURE_EXTENDED_HOST_PATTERNS
if (url->host_regex)
{
regfree(url->host_regex);
#else
freez(url->dbuffer);
freez(url->dvec);
-#endif /* ndef FEATURE_PCRE_HOST_PATTERNS */
+#endif /* ndef FEATURE_EXTENDED_HOST_PATTERNS */
freez(url->path);
freez(url->port_list);
if (url->preg)
{
/* XXX: these should probably be functions. */
#define PORT_MATCHES ((NULL == pattern->port_list) || match_portlist(pattern->port_list, url->port))
-#ifdef FEATURE_PCRE_HOST_PATTERNS
+#ifdef FEATURE_EXTENDED_HOST_PATTERNS
#define DOMAIN_MATCHES ((NULL == pattern->host_regex) || (0 == regexec(pattern->host_regex, url->host, 0, NULL, 0)))
#else
#define DOMAIN_MATCHES ((NULL == pattern->dbuffer) || (0 == domain_match(pattern, url)))