| Index: trunk/phase3/includes/GlobalFunctions.php |
| — | — | @@ -2062,7 +2062,7 @@ |
| 2063 | 2063 | * Initialise php session |
| 2064 | 2064 | */ |
| 2065 | 2065 | function wfSetupSession() { |
| 2066 | | - global $wgSessionsInMemcached, $wgCookiePath, $wgCookieDomain; |
| | 2066 | + global $wgSessionsInMemcached, $wgCookiePath, $wgCookieDomain, $wgCookieSecure; |
| 2067 | 2067 | if( $wgSessionsInMemcached ) { |
| 2068 | 2068 | require_once( 'MemcachedSessions.php' ); |
| 2069 | 2069 | } elseif( 'files' != ini_get( 'session.save_handler' ) ) { |
| — | — | @@ -2070,7 +2070,7 @@ |
| 2071 | 2071 | # application, it will end up failing. Try to recover. |
| 2072 | 2072 | ini_set ( 'session.save_handler', 'files' ); |
| 2073 | 2073 | } |
| 2074 | | - session_set_cookie_params( 0, $wgCookiePath, $wgCookieDomain ); |
| | 2074 | + session_set_cookie_params( 0, $wgCookiePath, $wgCookieDomain, $wgCookieSecure); |
| 2075 | 2075 | session_cache_limiter( 'private, must-revalidate' ); |
| 2076 | 2076 | @session_start(); |
| 2077 | 2077 | } |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -145,6 +145,7 @@ |
| 146 | 146 | red when the user has no edits. Linker::userToolLinksRedContribs() is an |
| 147 | 147 | alias to that which should be used to make it more self documentating. |
| 148 | 148 | * (bug 8749) Bring MySQL 5 table defs back into sync |
| | 149 | +* (bug 8751) Set session cookies to HTTPS-only to match other cookies |
| 149 | 150 | |
| 150 | 151 | |
| 151 | 152 | == Languages updated == |