From d63a0b9255a0865dca5fedab6f351a060e4d1f26 Mon Sep 17 00:00:00 2001
From: Joseba Urkiri Badiola <jurkiri@indaba.es>
Date: Tue, 30 Apr 2019 12:50:46 +0200
Subject: [PATCH 1/2] Fix #1 - Propagate X-Fordwarded-Proto if present in the
 request

---
 src/main/java/org/mitre/dsmiley/httpproxy/ProxyServlet.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/org/mitre/dsmiley/httpproxy/ProxyServlet.java b/src/main/java/org/mitre/dsmiley/httpproxy/ProxyServlet.java
index 3e55f282..dcb86383 100644
--- a/src/main/java/org/mitre/dsmiley/httpproxy/ProxyServlet.java
+++ b/src/main/java/org/mitre/dsmiley/httpproxy/ProxyServlet.java
@@ -489,6 +489,10 @@ private void setXForwardedForHeader(HttpServletRequest servletRequest,
 
       String protoHeaderName = "X-Forwarded-Proto";
       String protoHeader = servletRequest.getScheme();
+      String existingProtoHeader = servletRequest.getHeader(protoHeaderName);
+      if (existingProtoHeader != null) {
+        protoHeader = existingProtoHeader;
+      }
       proxyRequest.setHeader(protoHeaderName, protoHeader);
     }
   }

From cd68b0d31dcde57672b137e1fe04adb829ff0c6f Mon Sep 17 00:00:00 2001
From: Joseba Urkiri Badiola <jurkiri@indaba.es>
Date: Tue, 30 Apr 2019 15:27:34 +0200
Subject: [PATCH 2/2] v1.12

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index bb8449c9..a3519f2b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>org.mitre.dsmiley.httpproxy</groupId>
   <artifactId>smiley-http-proxy-servlet</artifactId>
-  <version>1.12-SNAPSHOT</version>
+  <version>1.12</version>
   <packaging>jar</packaging>
 
   <name>Smiley's HTTP Proxy Servlet</name>