From c7972ad1adac172a4b0deea25ff3a7edfbca6791 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20G=C3=B3mez?= <sergio@uco.es>
Date: Fri, 16 Oct 2015 16:05:55 +0200
Subject: [PATCH] Required simplesamlphp/saml2 ~1.7 than fix #241 issue
---
composer.json | 2 +-
composer.lock | 15 +++++++--------
www/_include.php | 3 ---
3 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/composer.json b/composer.json
index 63ea892ef..cc805567a 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,7 @@
},
"require": {
"php": ">=5.3",
- "simplesamlphp/saml2": "~1.6.1",
+ "simplesamlphp/saml2": "~1.7",
"robrichards/xmlseclibs": "~1.4.1",
"whitehat101/apr1-md5": "~1.0"
},
diff --git a/composer.lock b/composer.lock
index e0b80cab9..7edbe6ced 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "71490cffa1b80de46763a342a15b55af",
- "content-hash": "1adf316fa698b60b8e8563dca982f107",
+ "hash": "b4170f6ef1aa19cf7299c56a91332fff",
+ "content-hash": "37c3a3afccac2b94a358d00516a2a3a8",
"packages": [
{
"name": "psr/log",
@@ -88,21 +88,20 @@
},
{
"name": "simplesamlphp/saml2",
- "version": "v1.6.1",
+ "version": "v1.7.0",
"source": {
"type": "git",
"url": "https://github.com/simplesamlphp/saml2.git",
- "reference": "da4f356dfee6eaabac4fb8afb0de045e571c476b"
+ "reference": "f89856e2afe6ab6758c7f34c1fbe4ed8c952a623"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/simplesamlphp/saml2/zipball/da4f356dfee6eaabac4fb8afb0de045e571c476b",
- "reference": "da4f356dfee6eaabac4fb8afb0de045e571c476b",
+ "url": "https://api.github.com/repos/simplesamlphp/saml2/zipball/f89856e2afe6ab6758c7f34c1fbe4ed8c952a623",
+ "reference": "f89856e2afe6ab6758c7f34c1fbe4ed8c952a623",
"shasum": ""
},
"require": {
"ext-dom": "*",
- "ext-mcrypt": "*",
"ext-openssl": "*",
"php": ">=5.3.3",
"psr/log": "~1.0",
@@ -134,7 +133,7 @@
}
],
"description": "SAML2 PHP library from SimpleSAMLphp",
- "time": "2015-07-13 10:00:26"
+ "time": "2015-10-06 09:55:13"
},
{
"name": "whitehat101/apr1-md5",
diff --git a/www/_include.php b/www/_include.php
index 7b65e92dc..9127d461b 100644
--- a/www/_include.php
+++ b/www/_include.php
@@ -91,6 +91,3 @@ if (!file_exists($configdir.'/config.php')) {
// set the timezone
SimpleSAML\Utils\Time::initTimezone();
-
-// disable XML external entity loading explicitly
-libxml_disable_entity_loader();
--
GitLab