Fix parsing web commits from ipv6 addresses.

I weakended the regexp, so this matches ipv6 addresses too. It does not
ensure that the address is valid, but that should not matter here.

Note that addresses ending in "::" are not matched, so eg, the unspecified
address will not match -- but should never appear here anyway.

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 2f11069c691acb8d1bc3e43d1bfec915aa618898..187d40a3aa7107df352080a7c9811d574628d852 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -364,7 +364,7 @@ sub getsetup () {
        },
        web_commit_regexp => {
                type => "internal",
-               default => qr/^web commit (by (.*?(?=: |$))|from (\d+\.\d+\.\d+\.\d+)):?(.*)/,
+               default => qr/^web commit (by (.*?(?=: |$))|from ([0-9a-fA-F:.]+[0-9a-fA-F])):?(.*)/,
                description => "regexp to parse web commits from logs",
                safe => 0,
                rebuild => 0,

diff --git a/debian/changelog b/debian/changelog
index de165e4ff9cb7ab15733975184767ac2f111bd9a..2e178171349e37fbb85f7890fb37c4eeb6dd724f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ ikiwiki (3.14159265) UNRELEASED; urgency=low
     allows banning by IP address.
   * underlay: Also allow configuring additional directories to search 
     for template files in.
+  * Fix parsing web commits from ipv6 addresses.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 02 Sep 2009 15:01:27 -0400