From: Scott Cantor <cantor.2@osu.edu>
Date: Wed, 27 Oct 2004 20:35:40 +0000 (+0000)
Subject: Fixed broken scheme computation in extension
X-Git-Tag: 1.2.1~12
X-Git-Url: http://www.project-moonshot.org/gitweb/?a=commitdiff_plain;h=17717d16d4533f0eae306a15c499072f9949c641;p=shibboleth%2Fcpp-sp.git

Fixed broken scheme computation in extension
---

diff --git a/isapi_shib/isapi_shib.cpp b/isapi_shib/isapi_shib.cpp
index 4ceb1ce..e75f578 100644
--- a/isapi_shib/isapi_shib.cpp
+++ b/isapi_shib/isapi_shib.cpp
@@ -765,7 +765,7 @@ IRequestMapper::Settings map_request(
 {
     dynabuf ssl(5);
     GetServerVariable(lpECB,"HTTPS",ssl,5);
-    bool SSL=(ssl=="on");
+    bool SSL=(ssl=="on" || ssl=="ON");
 
     // URL path always come from IIS.
     dynabuf url(256);
@@ -782,8 +782,9 @@ IRequestMapper::Settings map_request(
 
     // Scheme may come from site def or be derived from IIS.
     const char* scheme=site.m_scheme.c_str();
-    if (!scheme || !*scheme || !g_bNormalizeRequest)
-        scheme=lpECB->lpszMethod;
+    if (!scheme || !*scheme || !g_bNormalizeRequest) {
+        scheme = SSL ? "https" : "http";
+    }
 
     // Start with scheme and hostname.
     if (g_bNormalizeRequest) {