From 18c2ecdb59b75968a9323105537cf5adf889b4ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=85kre=20Solberg?= <andreas.solberg@uninett.no>
Date: Wed, 3 Dec 2008 10:18:56 +0000
Subject: [PATCH] In utilities: fix url resolution in modules and fix utf8 in
source code
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@1048 44740490-163a-0410-bde0-09ae8108e29a
---
lib/SimpleSAML/Utilities.php | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/lib/SimpleSAML/Utilities.php b/lib/SimpleSAML/Utilities.php
index 8e121d7cf..11bf5e30d 100644
--- a/lib/SimpleSAML/Utilities.php
+++ b/lib/SimpleSAML/Utilities.php
@@ -3,7 +3,7 @@
/**
* Misc static functions that is used several places.in example parsing and id generation.
*
- * @author Andreas Ĺkre Solberg, UNINETT AS. <andreas.solberg@uninett.no>
+ * @author Andreas Ă…kre Solberg, UNINETT AS. <andreas.solberg@uninett.no>
* @package simpleSAMLphp
* @version $Id$
*/
@@ -92,6 +92,8 @@ class SimpleSAML_Utilities {
if (preg_match('|^/.*?(/.*)$|', $_SERVER['SCRIPT_NAME'], $matches)) {
#$scriptname = $matches[1];
}
+ if (array_key_exists('PATH_INFO', $_SERVER)) $scriptname .= $_SERVER['PATH_INFO'];
+
return $scriptname;
}
@@ -680,7 +682,10 @@ class SimpleSAML_Utilities {
echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"' .
' "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">' . "\n";
echo '<html xmlns="http://www.w3.org/1999/xhtml">';
- echo '<head><title>Redirect</title></head>';
+ echo '<head>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8">
+ <title>Redirect</title>
+ </head>';
echo '<body>';
echo '<h1>Redirect</h1>';
echo '<p>';
--
GitLab