Ticket #16884: 16884.4.patch

wp-admin/setup-config.php

@@ -194 +194 @@
                  * @ignore
                  */
                 function get_bloginfo() {
-                        return ( ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . str_replace( $_SERVER['PHP_SELF'], '/wp-admin/setup-config.php', '' ) );
+                        return wp_guess_url();
                 }
                 /**#@-*/
                 $secret_keys = wp_remote_get( 'https://api.wordpress.org/secret-key/1.1/salt/' );