Index: trunk/core/kernel/application.php
===================================================================
diff -u -r2681 -r2685
--- trunk/core/kernel/application.php	(.../application.php)	(revision 2681)
+++ trunk/core/kernel/application.php	(.../application.php)	(revision 2685)
@@ -675,7 +675,7 @@
 				$target_url = $this->ConfigValue('SSL_URL');
 			}
 			else {
-				$target_url = 'http://'.$this->RecallVar('HTTP_SERVER_NAME').$this->RecallVar('HTTP_BASE_PATH');
+				$target_url = 'http://'.DOMAIN.$this->ConfigValue('Site_Path');
 			}
 
 			if (!preg_match('#'.preg_quote($cookie_url).'#', $target_url)) {
@@ -810,14 +810,10 @@
 		}
 		else {
 			if ($ssl) {
-				if (PROTOCOL == 'http://') {
-					$this->StoreVar('HTTP_SERVER_NAME', SERVER_NAME);
-					$this->StoreVar('HTTP_BASE_PATH', BASE_PATH);
-				}
 				return $this->ConfigValue('SSL_URL').$prefix.'/';
 			}
 			else {
-				return 'http://'.$this->RecallVar('HTTP_SERVER_NAME').(defined('PORT')?':'.PORT : '').$this->RecallVar('HTTP_BASE_PATH').$prefix.'/';
+				return 'http://'.DOMAIN.(defined('PORT')?':'.PORT : '').$this->ConfigValue('Site_Path').$prefix.'/';
 			}
 		}
 	}