From d9022f63880ce039446fba8364f68e656b7bf4cb Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Thu, 3 May 2012 13:01:35 +0200
Subject: Update to MediaWiki 1.19.0

---
 includes/IP.php | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

(limited to 'includes/IP.php')

diff --git a/includes/IP.php b/includes/IP.php
index 1da7cd07..e3f61214 100644
--- a/includes/IP.php
+++ b/includes/IP.php
@@ -18,7 +18,7 @@
  * http://www.gnu.org/copyleft/gpl.html
  *
  * @file
- * @author Ashar Voultoiz <hashar at free dot fr>, Aaron Schulz
+ * @author Antoine Musso <hashar at free dot fr>, Aaron Schulz
  */
 
 // Some regex definition to "play" with IP address and IP address blocks
@@ -186,14 +186,14 @@ class IP {
 	}
 
 	/**
-	 * Given a host/port string, like one might find in the host part of a URL 
-	 * per RFC 2732, split the hostname part and the port part and return an 
-	 * array with an element for each. If there is no port part, the array will 
-	 * have false in place of the port. If the string was invalid in some way, 
+	 * Given a host/port string, like one might find in the host part of a URL
+	 * per RFC 2732, split the hostname part and the port part and return an
+	 * array with an element for each. If there is no port part, the array will
+	 * have false in place of the port. If the string was invalid in some way,
 	 * false is returned.
 	 *
-	 * This was easy with IPv4 and was generally done in an ad-hoc way, but 
-	 * with IPv6 it's somewhat more complicated due to the need to parse the 
+	 * This was easy with IPv4 and was generally done in an ad-hoc way, but
+	 * with IPv6 it's somewhat more complicated due to the need to parse the
 	 * square brackets and colons.
 	 *
 	 * A bare IPv6 address is accepted despite the lack of square brackets.
@@ -241,8 +241,13 @@ class IP {
 	/**
 	 * Given a host name and a port, combine them into host/port string like
 	 * you might find in a URL. If the host contains a colon, wrap it in square
-	 * brackets like in RFC 2732. If the port matches the default port, omit 
+	 * brackets like in RFC 2732. If the port matches the default port, omit
 	 * the port specification
+	 *
+	 * @param $host string
+	 * @param $port int
+	 * @param $defaultPort bool|int
+	 * @return string
 	 */
 	public static function combineHostAndPort( $host, $port, $defaultPort = false ) {
 		if ( strpos( $host, ':' ) !== false ) {
@@ -449,6 +454,10 @@ class IP {
 		return $n;
 	}
 
+	/**
+	 * @param $ip
+	 * @return String
+	 */
 	private static function toUnsigned6( $ip ) {
 		return wfBaseConvert( self::IPv6ToRawHex( $ip ), 16, 10 );
 	}
@@ -548,6 +557,8 @@ class IP {
 	 * Convert a network specification in IPv6 CIDR notation to an
 	 * integer network and a number of bits
 	 *
+	 * @param $range
+	 *
 	 * @return array(string, int)
 	 */
 	private static function parseCIDR6( $range ) {
@@ -585,6 +596,9 @@ class IP {
 	 *     2001:0db8:85a3::7344/96          			 CIDR
 	 *     2001:0db8:85a3::7344 - 2001:0db8:85a3::7344   Explicit range
 	 *     2001:0db8:85a3::7344/96             			 Single IP
+	 *
+	 * @param $range
+	 *
 	 * @return array(string, string)
 	 */
 	private static function parseRange6( $range ) {
-- 
cgit v1.2.2