Index: wp-includes/pluggable.php
===================================================================
--- wp-includes/pluggable.php	(revision 11001)
+++ wp-includes/pluggable.php	(working copy)
@@ -726,7 +726,7 @@
 
 	// If https is required and request is http, redirect
 	if ( $secure && !is_ssl() && false !== strpos($_SERVER['REQUEST_URI'], 'wp-admin') ) {
-		if ( 0 === strpos($_SERVER['REQUEST_URI'], 'http') ) {
+		if ( preg_match('#^https?://#i', $_SERVER['REQUEST_URI']) ) {
 			wp_redirect(preg_replace('|^http://|', 'https://', $_SERVER['REQUEST_URI']));
 			exit();
 		} else {