X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FWebResponse.php;h=f14cf2289cc066f2e30fddfc39a0d700b3c68236;hb=2def4827c73d7448f566fec36c509c245823b191;hp=26fb20f331b2cc4fbb00d225b6af0c7a6adc2d35;hpb=04fdc78370dbc042116488d6826e19bf3910273b;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/WebResponse.php b/includes/WebResponse.php
index 26fb20f331..f14cf2289c 100644
--- a/includes/WebResponse.php
+++ b/includes/WebResponse.php
@@ -27,6 +27,11 @@
  */
 class WebResponse {
 
+	/** @var array Used to record set cookies, because PHP's setcookie() will
+	 * happily send an identical Set-Cookie to the client.
+	 */
+	protected static $setCookies = array();
+
 	/**
 	 * Output an HTTP header, wrapper for PHP's header()
 	 * @param string $string Header to output
@@ -62,6 +67,15 @@ class WebResponse {
 		HttpStatus::header( $code );
 	}
 
+	/**
+	 * Test if headers have been sent
+	 * @since 1.27
+	 * @return bool
+	 */
+	public function headersSent() {
+		return headers_sent();
+	}
+
 	/**
 	 * Set the browser cookie
 	 * @param string $name The name of the cookie.
@@ -115,25 +129,26 @@ class WebResponse {
 		$func = $options['raw'] ? 'setrawcookie' : 'setcookie';
 
 		if ( Hooks::run( 'WebResponseSetCookie', array( &$name, &$value, &$expire, $options ) ) ) {
-			wfDebugLog( 'cookie',
-				$func . ': "' . implode( '", "',
-					array(
-						$options['prefix'] . $name,
-						$value,
-						$expire,
-						$options['path'],
-						$options['domain'],
-						$options['secure'],
-						$options['httpOnly'] ) ) . '"' );
-
-			call_user_func( $func,
-				$options['prefix'] . $name,
-				$value,
-				$expire,
-				$options['path'],
-				$options['domain'],
-				$options['secure'],
-				$options['httpOnly'] );
+			$cookie = $options['prefix'] . $name;
+			$data = array(
+				(string)$cookie,
+				(string)$value,
+				(int)$expire,
+				(string)$options['path'],
+				(string)$options['domain'],
+				(bool)$options['secure'],
+				(bool)$options['httpOnly'],
+			);
+			if ( !isset( self::$setCookies[$cookie] ) ||
+				self::$setCookies[$cookie] !== array( $func, $data )
+			) {
+				wfDebugLog( 'cookie', $func . ': "' . implode( '", "', $data ) . '"' );
+				if ( call_user_func_array( $func, $data ) ) {
+					self::$setCookies[$cookie] = array( $func, $data );
+				}
+			} else {
+				wfDebugLog( 'cookie', 'already set ' . $func . ': "' . implode( '", "', $data ) . '"' );
+			}
 		}
 	}
 
@@ -156,7 +171,7 @@ class WebResponse {
  */
 class FauxResponse extends WebResponse {
 	private $headers;
-	private $cookies;
+	private $cookies = array();
 	private $code;
 
 	/**
@@ -192,6 +207,10 @@ class FauxResponse extends WebResponse {
 		$this->code = intval( $code );
 	}
 
+	public function headersSent() {
+		return false;
+	}
+
 	/**
 	 * @param string $key The name of the header to get (case insensitive).
 	 * @return string|null The header value (if set); null otherwise.