r82095 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r82094‎ | r82095 | r82096 >
Date:23:30, 13 February 2011
Author:aaron
Status:ok
Tags:
Comment:
Follow-up r82093: fixed comment :)
Modified paths:
  • /trunk/phase3/includes/IP.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/IP.php
@@ -48,7 +48,7 @@
4949 '|' . // contains no "::"
5050 RE_IPV6_WORD . '(?::' . RE_IPV6_WORD . '){7}' .
5151 ')'
52 - // NOTE: With PCRE 7.2+, we can combine the last two cases into one regex:
 52+ // NOTE: With PCRE 7.2+, we can combine the two '"::" in the middle' cases into:
5353 // RE_IPV6_WORD . '(?::((?(-1)|:))?' . RE_IPV6_WORD . '){1,6}(?(-2)|^)'
5454 // This also improves regex concatenation by using relative references.
5555 );

Follow-up revisions

RevisionCommit summaryAuthorDate
r85436MFT r82093, r82095 (dunno why they didn't merge cleanly before...)demon14:08, 5 April 2011

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r82093* (bug 27353) IPv6 address ending in "::WORD" was not recognized...aaron23:24, 13 February 2011

Status & tagging log