Remove some of unused url fields.

diff --git a/src/libserver/url.c b/src/libserver/url.c
index ca8e0d7dc7e8e5281b76a0cca0498e1e10390e45..345bd62a3c4079c4ee8bfc21d7b83f79b02156f1 100644 (file)
--- a/src/libserver/url.c
+++ b/src/libserver/url.c
@@ -953,7 +953,8 @@ rspamd_url_parse (struct rspamd_url *uri, gchar *uristring, gsize len,
                /* We have extra data at the end of uri, so we are ignoring it for now */
                p = rspamd_mempool_alloc (pool, end - uristring + 1);
                rspamd_strlcpy (p, uristring, end - uristring + 1);
-               len = end - uristring ;
+               len = end - uristring;
+               uri->urllen = len;
        }
 
        for (i = 0; i < UF_MAX; i ++) {

diff --git a/src/libserver/url.h b/src/libserver/url.h
index 1c76294cd23cd9f449a4cc9b116a95bc24bbfed8..664f1a945240bdcbd96ba465ced5a85f94197c2b 100644 (file)
--- a/src/libserver/url.h
+++ b/src/libserver/url.h
@@ -12,8 +12,6 @@ struct rspamd_url {
        gchar *string;
        gint protocol;
 
-       gint ip_family;
-
        gchar *user;
        gchar *password;
        gchar *host;
@@ -21,7 +19,6 @@ struct rspamd_url {
        gchar *data;
        gchar *query;
        gchar *fragment;
-       gchar *post;
        gchar *surbl;
 
        struct rspamd_url *phished_url;
@@ -30,15 +27,13 @@ struct rspamd_url {
        guint userlen;
        guint passwordlen;
        guint hostlen;
-       guint portlen;
        guint datalen;
        guint querylen;
        guint fragmentlen;
        guint surbllen;
 
-       /* Flags */
-       gboolean ipv6;  /* URI contains IPv6 host */
-       gboolean form;  /* URI originated from form */
+       guint urllen;
+
        gboolean is_phished; /* URI maybe phishing */
 };