From 0863e3289fab8fa7052fdcdb671d351b9b0f0fcf Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Fri, 14 Dec 2007 12:28:24 +0000
Subject: [PATCH] Removed unnecessary session_start()-statements.

git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@110 44740490-163a-0410-bde0-09ae8108e29a
---
 www/auth/login-ldapmulti.php               | 2 --
 www/auth/login-radius.php                  | 2 --
 www/auth/login.php                         | 2 --
 www/example-simple/hostnames.php           | 2 --
 www/example-simple/saml2-example.php       | 3 ---
 www/example-simple/shib13-example.php      | 1 -
 www/saml2/idp/SSOService.php               | 2 --
 www/saml2/idp/SingleLogoutService.php      | 2 --
 www/saml2/idp/metadata.php                 | 2 --
 www/saml2/sp/AssertionConsumerService.php  | 2 --
 www/saml2/sp/SingleLogoutService.php       | 2 --
 www/saml2/sp/idpdisco.php                  | 2 --
 www/saml2/sp/initSLO.php                   | 2 --
 www/saml2/sp/initSSO.php                   | 2 --
 www/saml2/sp/metadata.php                  | 2 --
 www/shib13/idp/SSOService.php              | 2 --
 www/shib13/sp/AssertionConsumerService.php | 2 --
 www/shib13/sp/idpdisco.php                 | 2 --
 www/shib13/sp/initSSO.php                  | 2 --
 19 files changed, 38 deletions(-)

diff --git a/www/auth/login-ldapmulti.php b/www/auth/login-ldapmulti.php
index f95b29be4..40ab188ed 100644
--- a/www/auth/login-ldapmulti.php
+++ b/www/auth/login-ldapmulti.php
@@ -9,8 +9,6 @@ require_once('SimpleSAML/Logger.php');
 require_once('SimpleSAML/XML/MetaDataStore.php');
 require_once('SimpleSAML/XHTML/Template.php');
 
-session_start();
-
 $config = SimpleSAML_Configuration::getInstance();
 $metadata = new SimpleSAML_XML_MetaDataStore($config);
 $session = SimpleSAML_Session::getInstance();
diff --git a/www/auth/login-radius.php b/www/auth/login-radius.php
index 990b6788b..47dc0efff 100644
--- a/www/auth/login-radius.php
+++ b/www/auth/login-radius.php
@@ -8,8 +8,6 @@ require_once('SimpleSAML/Logger.php');
 require_once('SimpleSAML/XML/MetaDataStore.php');
 require_once('SimpleSAML/XHTML/Template.php');
 
-session_start();
-
 $config = SimpleSAML_Configuration::getInstance();
 $metadata = new SimpleSAML_XML_MetaDataStore($config);
 $session = SimpleSAML_Session::getInstance();
diff --git a/www/auth/login.php b/www/auth/login.php
index 9cdb15382..fda493bb8 100644
--- a/www/auth/login.php
+++ b/www/auth/login.php
@@ -12,8 +12,6 @@ require_once('SimpleSAML/Bindings/SAML20/HTTPRedirect.php');
 require_once('SimpleSAML/XHTML/Template.php');
 require_once('SimpleSAML/Logger.php');
 
-session_start();
-
 $config = SimpleSAML_Configuration::getInstance();
 $metadata = new SimpleSAML_XML_MetaDataStore($config);	
 $session = SimpleSAML_Session::getInstance();
diff --git a/www/example-simple/hostnames.php b/www/example-simple/hostnames.php
index cb245a232..e3fd751a0 100644
--- a/www/example-simple/hostnames.php
+++ b/www/example-simple/hostnames.php
@@ -11,8 +11,6 @@ require_once('SimpleSAML/Bindings/SAML20/HTTPRedirect.php');
 require_once('SimpleSAML/Bindings/SAML20/HTTPPost.php');
 require_once('SimpleSAML/XHTML/Template.php');
 
-session_start();
-
 /* Load simpleSAMLphp, configuration and metadata */
 $config = SimpleSAML_Configuration::getInstance();
 $metadata = new SimpleSAML_XML_MetaDataStore($config);
diff --git a/www/example-simple/saml2-example.php b/www/example-simple/saml2-example.php
index f59bccc9b..141cd31c3 100644
--- a/www/example-simple/saml2-example.php
+++ b/www/example-simple/saml2-example.php
@@ -12,9 +12,6 @@ require_once('SimpleSAML/Bindings/SAML20/HTTPPost.php');
 require_once('SimpleSAML/XHTML/Template.php');
 
 
-session_start();
-
-
 /* Load simpleSAMLphp, configuration and metadata */
 $config = SimpleSAML_Configuration::getInstance();
 $metadata = new SimpleSAML_XML_MetaDataStore($config);
diff --git a/www/example-simple/shib13-example.php b/www/example-simple/shib13-example.php
index d16d6c686..7ff181079 100644
--- a/www/example-simple/shib13-example.php
+++ b/www/example-simple/shib13-example.php
@@ -6,7 +6,6 @@ require_once('SimpleSAML/Utilities.php');
 require_once('SimpleSAML/Session.php');
 require_once('SimpleSAML/XML/MetaDataStore.php');
 require_once('SimpleSAML/XHTML/Template.php');
-session_start();
 
 
 $config = SimpleSAML_Configuration::getInstance();
diff --git a/www/saml2/idp/SSOService.php b/www/saml2/idp/SSOService.php
index 35d6f55ec..2eeb41c5f 100644
--- a/www/saml2/idp/SSOService.php
+++ b/www/saml2/idp/SSOService.php
@@ -16,8 +16,6 @@ require_once('SimpleSAML/Bindings/SAML20/HTTPPost.php');
 require_once('SimpleSAML/XHTML/Template.php');
 
 
-session_start();
-
 $config = SimpleSAML_Configuration::getInstance();
 $metadata = new SimpleSAML_XML_MetaDataStore($config);
 $session = SimpleSAML_Session::getInstance(true);
diff --git a/www/saml2/idp/SingleLogoutService.php b/www/saml2/idp/SingleLogoutService.php
index f797641d6..778608e54 100644
--- a/www/saml2/idp/SingleLogoutService.php
+++ b/www/saml2/idp/SingleLogoutService.php
@@ -14,8 +14,6 @@ require_once('SimpleSAML/Bindings/SAML20/HTTPRedirect.php');
 require_once('SimpleSAML/XHTML/Template.php');
 
 
-session_start();
-
 $config = SimpleSAML_Configuration::getInstance();
 $metadata = new SimpleSAML_XML_MetaDataStore($config);
 
diff --git a/www/saml2/idp/metadata.php b/www/saml2/idp/metadata.php
index c756cd672..2ddc42b52 100644
--- a/www/saml2/idp/metadata.php
+++ b/www/saml2/idp/metadata.php
@@ -7,8 +7,6 @@ require_once('SimpleSAML/Session.php');
 require_once('SimpleSAML/XML/MetaDataStore.php');
 require_once('SimpleSAML/XHTML/Template.php');
 
-session_start();
-
 /* Load simpleSAMLphp, configuration and metadata */
 $config = SimpleSAML_Configuration::getInstance();
 $metadata = new SimpleSAML_XML_MetaDataStore($config);
diff --git a/www/saml2/sp/AssertionConsumerService.php b/www/saml2/sp/AssertionConsumerService.php
index 6a1a3f4a1..a9dce52a3 100644
--- a/www/saml2/sp/AssertionConsumerService.php
+++ b/www/saml2/sp/AssertionConsumerService.php
@@ -11,8 +11,6 @@ require_once('SimpleSAML/XML/SAML20/AuthnRequest.php');
 require_once('SimpleSAML/Bindings/SAML20/HTTPPost.php');
 require_once('SimpleSAML/XHTML/Template.php');
 
-session_start();
-
 $session = SimpleSAML_Session::getInstance();
 
 $logger = new SimpleSAML_Logger();
diff --git a/www/saml2/sp/SingleLogoutService.php b/www/saml2/sp/SingleLogoutService.php
index fdc99c0f4..23d711b0b 100644
--- a/www/saml2/sp/SingleLogoutService.php
+++ b/www/saml2/sp/SingleLogoutService.php
@@ -11,8 +11,6 @@ require_once('SimpleSAML/XML/SAML20/LogoutRequest.php');
 require_once('SimpleSAML/XML/SAML20/LogoutResponse.php');
 require_once('SimpleSAML/Bindings/SAML20/HTTPPost.php');
 
-session_start();
-
 $config = SimpleSAML_Configuration::getInstance();
 $metadata = new SimpleSAML_XML_MetaDataStore($config);
 
diff --git a/www/saml2/sp/idpdisco.php b/www/saml2/sp/idpdisco.php
index d7af8c2fd..d95629665 100644
--- a/www/saml2/sp/idpdisco.php
+++ b/www/saml2/sp/idpdisco.php
@@ -12,8 +12,6 @@ require_once('SimpleSAML/XML/SAML20/AuthnRequest.php');
 require_once('SimpleSAML/Bindings/SAML20/HTTPRedirect.php');
 //require_once('SimpleSAML/Bindings/SAML20/HTTPPost.php');
 
-session_start();
-
 $config = SimpleSAML_Configuration::getInstance();
 $metadata = new SimpleSAML_XML_MetaDataStore($config);
 
diff --git a/www/saml2/sp/initSLO.php b/www/saml2/sp/initSLO.php
index 45e72ce9f..33e1a1780 100644
--- a/www/saml2/sp/initSLO.php
+++ b/www/saml2/sp/initSLO.php
@@ -12,8 +12,6 @@ require_once('SimpleSAML/Bindings/SAML20/HTTPRedirect.php');
 
 
 
-session_start();
-
 $config = SimpleSAML_Configuration::getInstance();
 $metadata = new SimpleSAML_XML_MetaDataStore($config);
 
diff --git a/www/saml2/sp/initSSO.php b/www/saml2/sp/initSSO.php
index a687ae62f..ac77f5184 100644
--- a/www/saml2/sp/initSSO.php
+++ b/www/saml2/sp/initSSO.php
@@ -13,8 +13,6 @@ require_once('SimpleSAML/XML/SAML20/AuthnRequest.php');
 require_once('SimpleSAML/Bindings/SAML20/HTTPRedirect.php');
 //require_once('SimpleSAML/Bindings/SAML20/HTTPPost.php');
 
-session_start();
-
 $config = SimpleSAML_Configuration::getInstance();
 $metadata = new SimpleSAML_XML_MetaDataStore($config);
 $session = SimpleSAML_Session::getInstance(true);
diff --git a/www/saml2/sp/metadata.php b/www/saml2/sp/metadata.php
index b560cd15c..037dbf5f9 100644
--- a/www/saml2/sp/metadata.php
+++ b/www/saml2/sp/metadata.php
@@ -7,8 +7,6 @@ require_once('SimpleSAML/Session.php');
 require_once('SimpleSAML/XML/MetaDataStore.php');
 require_once('SimpleSAML/XHTML/Template.php');
 
-session_start();
-
 /* Load simpleSAMLphp, configuration and metadata */
 $config = SimpleSAML_Configuration::getInstance();
 $metadata = new SimpleSAML_XML_MetaDataStore($config);
diff --git a/www/shib13/idp/SSOService.php b/www/shib13/idp/SSOService.php
index b7ccdd2b0..14ec85a25 100644
--- a/www/shib13/idp/SSOService.php
+++ b/www/shib13/idp/SSOService.php
@@ -15,8 +15,6 @@ require_once('SimpleSAML/Bindings/Shib13/HTTPPost.php');
 require_once('SimpleSAML/XHTML/Template.php');
 
 
-session_start();
-
 $config = SimpleSAML_Configuration::getInstance();
 $metadata = new SimpleSAML_XML_MetaDataStore($config);
 
diff --git a/www/shib13/sp/AssertionConsumerService.php b/www/shib13/sp/AssertionConsumerService.php
index 0d71ddf58..789021d05 100644
--- a/www/shib13/sp/AssertionConsumerService.php
+++ b/www/shib13/sp/AssertionConsumerService.php
@@ -10,8 +10,6 @@ require_once('SimpleSAML/XML/Shib13/AuthnRequest.php');
 require_once('SimpleSAML/Bindings/Shib13/HTTPPost.php');
 require_once('SimpleSAML/XHTML/Template.php');
 
-session_start();
-
 try {
 	
 	/*
diff --git a/www/shib13/sp/idpdisco.php b/www/shib13/sp/idpdisco.php
index 56783dd77..f6a2ab454 100644
--- a/www/shib13/sp/idpdisco.php
+++ b/www/shib13/sp/idpdisco.php
@@ -8,8 +8,6 @@ require_once('SimpleSAML/Session.php');
 require_once('SimpleSAML/XHTML/Template.php');
 require_once('SimpleSAML/XML/MetaDataStore.php');
 
-session_start();
-
 $config = SimpleSAML_Configuration::getInstance();
 $metadata = new SimpleSAML_XML_MetaDataStore($config);
 
diff --git a/www/shib13/sp/initSSO.php b/www/shib13/sp/initSSO.php
index fd7344a14..d81f5771d 100644
--- a/www/shib13/sp/initSSO.php
+++ b/www/shib13/sp/initSSO.php
@@ -12,8 +12,6 @@ require_once('SimpleSAML/XML/Shib13/AuthnRequest.php');
 //require_once('SimpleSAML/Bindings/SAML20/HTTPRedirect.php');
 //require_once('SimpleSAML/Bindings/SAML20/HTTPPost.php');
 
-session_start();
-
 $config = SimpleSAML_Configuration::getInstance();
 $metadata = new SimpleSAML_XML_MetaDataStore($config);
 
-- 
GitLab