jaxws-ri X-Forwarded-Proto

diff --git a/jaxws-ri/servlet/src/main/java/com/sun/xml/ws/transport/http/servlet/ServletConnectionImpl.java b/jaxws-ri/servlet/src/main/java/com/sun/xml/ws/transport/http/servlet/ServletConnectionImpl.java
index 0520e17a8..48cc4ccb1 100644
--- a/jaxws-ri/servlet/src/main/java/com/sun/xml/ws/transport/http/servlet/ServletConnectionImpl.java
+++ b/jaxws-ri/servlet/src/main/java/com/sun/xml/ws/transport/http/servlet/ServletConnectionImpl.java
@@ -351,7 +351,14 @@ public class ServletConnectionImpl extends WSHTTPConnection implements WebServic

     static @NotNull String getBaseAddress(HttpServletRequest request) {
         StringBuilder buf = new StringBuilder();
-        buf.append(request.getScheme());
+        String proxyScheme = request.getHeader("X-Forwarded-Proto");
+        if (proxyScheme != null) {
+            // use scheme from proxy header
+            buf.append(proxyScheme);
+        } else {
+            // use scheme like in request
+            buf.append(request.getScheme());
+        }
         buf.append("://");
         buf.append(request.getServerName());
         buf.append(':');