(bug 33471) Changed detection of secure cookies.

Changed code in Setup.php that checks whether or
not to use secure cookies. Previously it just
looked at $wgServer, which doesn't work with
protocol-relative URLs. Now it uses WebRequest::detectProtocol(),
which in turn checks $_SERVER.

Change-Id: I6adc7e3e9bd224608b13cbb748bdd2b61edaa764
Signed-off-by: Tyler Romeo <tylerromeo@gmail.com>

diff --git a/includes/Setup.php b/includes/Setup.php
index 518ef6d..baf7b35 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -372,7 +372,7 @@ if ( $wgNewUserLog ) {
 }
 
 if ( $wgCookieSecure === 'detect' ) {
-       $wgCookieSecure = ( substr( $wgServer, 0, 6 ) === 'https:' );
+       $wgCookieSecure = ( WebRequest::detectProtocol() === 'https:' );
 }
 
 // Disable MWDebug for command line mode, this prevents MWDebug from eating up