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.
master
Joey Hess 2009-09-10 13:32:13 -04:00
parent 22f0260324
commit 98ed7cb1d7
2 changed files with 2 additions and 1 deletions

View File

@ -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,

1
debian/changelog vendored
View File

@ -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