From 20414be38c51b53dbe43fce6ce8883952b05221d Mon Sep 17 00:00:00 2001
From: Fabian Keil <fk@fabiankeil.de>
Date: Thu, 10 Apr 2008 14:41:04 +0000
Subject: [PATCH] Ditch url_spec's path member now that it's no longer used.
---
project.h | 7 +++++--
urlmatch.c | 8 ++++++--
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/project.h b/project.h
index bfe08ae5..98717fda 100644
--- a/project.h
+++ b/project.h
@@ -1,7 +1,7 @@
#ifndef PROJECT_H_INCLUDED
#define PROJECT_H_INCLUDED
/** Version string. */
-#define PROJECT_H_VERSION "$Id: project.h,v 1.111 2008/04/06 14:54:26 fabiankeil Exp $"
+#define PROJECT_H_VERSION "$Id: project.h,v 1.112 2008/04/06 15:18:34 fabiankeil Exp $"
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/project.h,v $
@@ -37,6 +37,10 @@
*
* Revisions :
* $Log: project.h,v $
+ * Revision 1.112 2008/04/06 15:18:34 fabiankeil
+ * Oh well, rename the --enable-pcre-host-patterns option to
+ * --enable-extended-host-patterns as it's not really PCRE syntax.
+ *
* Revision 1.111 2008/04/06 14:54:26 fabiankeil
* Use PCRE syntax in host patterns when configured
* with --enable-pcre-host-patterns.
@@ -948,7 +952,6 @@ struct url_spec
char *port_list; /**< List of acceptable ports, or NULL to match all ports */
- char *path; /**< The source for the regex. */
regex_t *preg; /**< Regex for matching path part */
regex_t *tag_regex; /**< Regex for matching tags */
};
diff --git a/urlmatch.c b/urlmatch.c
index a5fbcf50..a031348a 100644
--- a/urlmatch.c
+++ b/urlmatch.c
@@ -1,4 +1,4 @@
-const char urlmatch_rcs[] = "$Id: urlmatch.c,v 1.29 2008/04/10 04:17:56 fabiankeil Exp $";
+const char urlmatch_rcs[] = "$Id: urlmatch.c,v 1.30 2008/04/10 04:24:24 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/urlmatch.c,v $
@@ -33,6 +33,11 @@ const char urlmatch_rcs[] = "$Id: urlmatch.c,v 1.29 2008/04/10 04:17:56 fabianke
*
* Revisions :
* $Log: urlmatch.c,v $
+ * Revision 1.30 2008/04/10 04:24:24 fabiankeil
+ * Stop duplicating the plain text representation of the path regex
+ * (and keeping the copy around). Once the regex is compiled it's no
+ * longer useful.
+ *
* Revision 1.29 2008/04/10 04:17:56 fabiankeil
* In url_match(), check the right member for NULL when determining
* whether there's a path regex to execute. Looking for a plain-text
@@ -1090,7 +1095,6 @@ void free_url_spec(struct url_spec *url)
freez(url->dvec);
url->dcount = 0;
#endif /* ndef FEATURE_EXTENDED_HOST_PATTERNS */
- freez(url->path);
freez(url->port_list);
if (url->preg)
{
--
2.49.0