Apply scheme patch from https://sourceforge.net/p/j2ep/feature-reques…

…ts/4/

src/net/sf/j2ep/ProxyFilter.java

@@ -91,7 +91,11 @@ public void doFilter(ServletRequest request, ServletResponse response,
             filterChain.doFilter(request, response);
         } else {
             String uri = server.getRule().process(getURI(httpRequest));
-            String url = request.getScheme() + "://" + server.getDomainName() + server.getPath() + uri;
+            String scheme = server.getScheme();
+            if (scheme == null) {
+                scheme = request.getScheme();
+            }
+            String url = scheme + "://" + server.getDomainName() + server.getPath() + uri;
             log.debug("Connecting to " + url);
 
             ResponseHandler responseHandler = null;

src/net/sf/j2ep/model/Server.java

@@ -61,6 +61,12 @@ public interface Server {
      */
     void setConnectionExceptionRecieved(Exception e);
 
+    /**
+     * Returns the scheme (ie. protocol) for this server or null if the original scheme from the request should be used.
+     * @return The scheme ("http" or "https") or null for any scheme
+     */
+    String getScheme();
+
     /**
      * Returns the host name and port for this server.
      * @return Host name and port

src/net/sf/j2ep/servers/BaseServer.java

@@ -42,6 +42,11 @@ public class BaseServer extends ServerContainerBase implements Server {
      */
     private boolean isRewriting;
 
+    /**
+     * The scheme for this server
+     */
+    private String scheme;
+
     /**
      * The host and port for this server
      */
@@ -84,6 +89,13 @@ public HttpServletResponse postExecute(HttpServletResponse response) {
         return response;
     }
 
+    /**
+     * @see net.sf.j2ep.model.Server#getScheme()
+     */
+    public String getScheme() {
+        return scheme;
+    }
+
     /**
      * @see net.sf.j2ep.model.Server#getDomainName()
      */
@@ -122,6 +134,15 @@ public void setIsRewriting(String rewrite) {
         }
     }   
 
+    /**
+     * Sets the scheme.
+     *
+     * @param scheme The scheme
+     */
+    public void setScheme(String scheme) {
+        this.scheme = scheme;
+    }
+
     /**
      * Sets the host and port we are mapping to.
      * 

src/net/sf/j2ep/servers/ClusterContainer.java

@@ -272,6 +272,13 @@ public void setConnectionExceptionRecieved(Exception e) {
             ClusterContainer.this.statusChecker.interrupt();
         }
 
+        /**
+         * @see net.sf.j2ep.model.Server#getScheme()
+         */
+        public String getScheme() {
+            return null;
+        }
+
         /**
          * @see net.sf.j2ep.model.Server#getDomainName()
          */