Index: lams_central/src/java/org/lamsfoundation/lams/web/tag/WebAppURLTag.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/tag/WebAppURLTag.java,v
diff -u -r1.5 -r1.5.18.1
--- lams_central/src/java/org/lamsfoundation/lams/web/tag/WebAppURLTag.java	17 Sep 2006 06:12:05 -0000	1.5
+++ lams_central/src/java/org/lamsfoundation/lams/web/tag/WebAppURLTag.java	25 Apr 2011 01:58:35 -0000	1.5.18.1
@@ -61,8 +61,8 @@
 		if ( HttpServletRequest.class.isInstance(sr) ) {
 			HttpServletRequest request = (HttpServletRequest) sr;
 			
-			String protocol = request.getProtocol();
-			if(protocol.startsWith("HTTPS")){
+			String protocol;
+			if(request.isSecure()){
 				protocol = "https://";
 			}else{
 				protocol = "http://";
Index: lams_monitoring/web/errorbox.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/errorbox.jsp,v
diff -u -r1.4.16.1 -r1.4.16.2
--- lams_monitoring/web/errorbox.jsp	16 Nov 2009 02:25:14 -0000	1.4.16.1
+++ lams_monitoring/web/errorbox.jsp	25 Apr 2011 01:59:24 -0000	1.4.16.2
@@ -2,8 +2,8 @@
 <%@ taglib uri="tags-logic" prefix="logic" %>
 <%@ page import="org.apache.struts.Globals" %>
 <%
-String cprotocol = request.getProtocol();
-if(cprotocol.startsWith("HTTPS")){
+String cprotocol;
+if(request.isSecure()){
 	cprotocol = "https://";
 }else{
 	cprotocol = "http://";