From 3aafcffec03c5f1771264896623a620ec29fe191 Mon Sep 17 00:00:00 2001
From: Graham Eames <grahamje@users.sourceforge.net>
Date: Sat, 17 Jun 2006 13:40:58 +0000
Subject: [PATCH] #2277

git-svn-id: file:///svn/phpbb/trunk@6088 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/install/install_install.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 27fcaa5d97..bdd718ab1a 100755
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -833,6 +833,12 @@ class install_install extends module
 
 		$s_hidden_fields = ($img_imagick) ? '<input type="hidden" name="img_imagick" value="' . addslashes($img_imagick) . '" />' : '';
 		$email_enable = ($email_enable !== '') ? $email_enable : true;
+
+		$server_name = ($server_name !== '') ? $server_name : ((!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : getenv('SERVER_NAME'));
+		$server_port = ($server_port !== '') ? $server_port : ((!empty($_SERVER['SERVER_PORT'])) ? (int) $_SERVER['SERVER_PORT'] : (int) getenv('SERVER_PORT'));
+		$server_protocol = ($server_protocol !== '') ? $server_protocol : (isset($_SERVER['HTTPS']) ? 'https://' : 'http://');
+		$cookie_secure = ($cookie_secure !== '') ? $cookie_secure : (isset($_SERVER['HTTPS']) ? true : false);
+
 		
 		foreach ($this->advanced_config_options as $config_key => $vars)
 		{