From b5f4321439ddcceafb49069a48621452579bfbc6 Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Wed, 22 Apr 2009 08:02:27 +0000
Subject: [PATCH] Utilities: Fix getRequestURI() for absolute URIs.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@1472 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 d28987313..168e8648f 100644
--- a/lib/SimpleSAML/Utilities.php
+++ b/lib/SimpleSAML/Utilities.php
@@ -132,9 +132,14 @@ class SimpleSAML_Utilities {
public static function getRequestURI() {
$requesturi = $_SERVER['REQUEST_URI'];
- if (preg_match('|^/.*?(/.*)$|', $_SERVER['REQUEST_URI'], $matches)) {
- #$requesturi = $matches[1];
+
+ if ($requesturi[0] !== '/') {
+ /* We probably have an url on the form: http://server/. */
+ if (preg_match('#^https?://[^/]*(/.*)#i', $requesturi, $matches)) {
+ $requesturi = $matches[1];
+ }
}
+
return $requesturi;
}
--
GitLab