From e145c0fd4c995f66dd132c5619745a5c4c219b02 Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Tue, 30 Nov 2010 10:06:30 +0000
Subject: [PATCH] SAMLParser: HTTP proxy support.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@2662 44740490-163a-0410-bde0-09ae8108e29a
---
lib/SimpleSAML/Metadata/SAMLParser.php | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/lib/SimpleSAML/Metadata/SAMLParser.php b/lib/SimpleSAML/Metadata/SAMLParser.php
index 22557766d..e5d1bf9a8 100644
--- a/lib/SimpleSAML/Metadata/SAMLParser.php
+++ b/lib/SimpleSAML/Metadata/SAMLParser.php
@@ -174,7 +174,9 @@ class SimpleSAML_Metadata_SAMLParser {
public static function parseFile($file) {
$doc = new DOMDocument();
- $res = $doc->load($file);
+ $data = SimpleSAML_Utilities::fetch($file);
+
+ $res = $doc->loadXML($data);
if($res !== TRUE) {
throw new Exception('Failed to read XML from file: ' . $file);
}
@@ -242,9 +244,10 @@ class SimpleSAML_Metadata_SAMLParser {
if ($file === NULL) throw new Exception('Cannot open file NULL. File name not specified.');
- $doc = new DOMDocument();
+ $data = SimpleSAML_Utilities::fetch($file);
- $res = $doc->load($file);
+ $doc = new DOMDocument();
+ $res = $doc->loadXML($data);
if($res !== TRUE) {
throw new Exception('Failed to read XML from file: ' . $file);
}
--
GitLab