diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2009-09-10 13:32:13 -0400 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2009-09-10 13:32:13 -0400 |
| commit | 98ed7cb1d7f99790821b99b3779d6685114fa662 (patch) | |
| tree | 2a0f61842bb198c2cf2a775c6f8e49bae5e433cc | |
| parent | 22f02603246f67117471f020a882dfa822849d18 (diff) | |
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.
| -rw-r--r-- | IkiWiki.pm | 2 | ||||
| -rw-r--r-- | debian/changelog | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm index 2f11069c6..187d40a3a 100644 --- 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 de165e4ff..2e1781713 100644 --- 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 |