X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FWebRequest.php;h=03410ccc9f8889ad6bf8a57f9587c9fabec66262;hb=a2e0bf21864912f22350fc0bb5d67e896f53b6e6;hp=6bdcc8718629ccd8ed7a55e5da74cdab545cc971;hpb=a77c09c03baf8ee1dd7527db4c20c5be2cd2c298;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/WebRequest.php b/includes/WebRequest.php
index 6bdcc87186..03410ccc9f 100644
--- a/includes/WebRequest.php
+++ b/includes/WebRequest.php
@@ -176,6 +176,8 @@ class WebRequest {
 	 * @return string
 	 */
 	public static function detectServer() {
+		global $wgAssumeProxiesUseDefaultProtocolPorts;
+
 		$proto = self::detectProtocol();
 		$stdPort = $proto === 'https' ? 443 : 80;
 
@@ -186,13 +188,15 @@ class WebRequest {
 			if ( !isset( $_SERVER[$varName] ) ) {
 				continue;
 			}
+
 			$parts = IP::splitHostAndPort( $_SERVER[$varName] );
 			if ( !$parts ) {
 				// Invalid, do not use
 				continue;
 			}
+
 			$host = $parts[0];
-			if ( isset( $_SERVER['HTTP_X_FORWARDED_PROTO'] ) ) {
+			if ( $wgAssumeProxiesUseDefaultProtocolPorts && isset( $_SERVER['HTTP_X_FORWARDED_PROTO'] ) ) {
 				// Bug 70021: Assume that upstream proxy is running on the default
 				// port based on the protocol. We have no reliable way to determine
 				// the actual port in use upstream.
@@ -691,7 +695,7 @@ class WebRequest {
 			// This shouldn't happen!
 			throw new MWException( "Web server doesn't provide either " .
 				"REQUEST_URI, HTTP_X_ORIGINAL_URL or SCRIPT_NAME. Report details " .
-				"of your web server configuration to http://bugzilla.wikimedia.org/" );
+				"of your web server configuration to https://phabricator.wikimedia.org/" );
 		}
 		// User-agents should not send a fragment with the URI, but
 		// if they do, and the web server passes it on to us, we
@@ -774,7 +778,7 @@ class WebRequest {
 	 *
 	 * @param int $deflimit Limit to use if no input and the user hasn't set the option.
 	 * @param string $optionname To specify an option other than rclimit to pull from.
-	 * @return array First element is limit, second is offset
+	 * @return int[] First element is limit, second is offset
 	 */
 	public function getLimitOffset( $deflimit = 50, $optionname = 'rclimit' ) {
 		global $wgUser;
@@ -1293,6 +1297,7 @@ class FauxRequest extends WebRequest {
 	private $wasPosted = false;
 	private $session = array();
 	private $requestUrl;
+	protected $cookies = array();
 
 	/**
 	 * @param array $data Array of *non*-urlencoded key => value pairs, the
@@ -1367,7 +1372,38 @@ class FauxRequest extends WebRequest {
 	}
 
 	public function getCookie( $key, $prefix = null, $default = null ) {
-		return $default;
+		if ( $prefix === null ) {
+			global $wgCookiePrefix;
+			$prefix = $wgCookiePrefix;
+		}
+		$name = $prefix . $key;
+		return isset( $this->cookies[$name] ) ? $this->cookies[$name] : $default;
+	}
+
+	/**
+	 * @since 1.26
+	 * @param string $name Unprefixed name of the cookie to set
+	 * @param string|null $value Value of the cookie to set
+	 * @param string|null $prefix Cookie prefix. Defaults to $wgCookiePrefix
+	 */
+	public function setCookie( $key, $value, $prefix = null ) {
+		$this->setCookies( array( $key => $value ), $prefix );
+	}
+
+	/**
+	 * @since 1.26
+	 * @param array $cookies
+	 * @param string|null $prefix Cookie prefix. Defaults to $wgCookiePrefix
+	 */
+	public function setCookies( $cookies, $prefix = null ) {
+		if ( $prefix === null ) {
+			global $wgCookiePrefix;
+			$prefix = $wgCookiePrefix;
+		}
+		foreach ( $cookies as $key => $value ) {
+			$name = $prefix . $key;
+			$this->cookies[$name] = $value;
+		}
 	}
 
 	public function checkSessionCookie() {
@@ -1398,8 +1434,18 @@ class FauxRequest extends WebRequest {
 	 * @param string $val
 	 */
 	public function setHeader( $name, $val ) {
-		$name = strtoupper( $name );
-		$this->headers[$name] = $val;
+		$this->setHeaders( array( $name => $val ) );
+	}
+
+	/**
+	 * @since 1.26
+	 * @param array $headers
+	 */
+	public function setHeaders( $headers ) {
+		foreach ( $headers as $name => $val ) {
+			$name = strtoupper( $name );
+			$this->headers[$name] = $val;
+		}
 	}
 
 	/**