From 30b007dc26437c25d404a0430cea8a2e95e5b7d1 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@pivotal.io>
Date: Wed, 20 Jan 2016 18:01:32 -0500
Subject: [PATCH] Based on fix in core for SPR-13876

---
 .../server/reactive/ServletServerHttpRequest.java     | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ServletServerHttpRequest.java b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ServletServerHttpRequest.java
index ae570046f9..89a3dbc3b4 100644
--- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ServletServerHttpRequest.java
+++ b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ServletServerHttpRequest.java
@@ -69,11 +69,12 @@ public class ServletServerHttpRequest extends AbstractServerHttpRequest {
 
 	@Override
 	protected URI initUri() throws URISyntaxException {
-		return new URI(getServletRequest().getScheme(), null,
-				getServletRequest().getServerName(),
-				getServletRequest().getServerPort(),
-				getServletRequest().getRequestURI(),
-				getServletRequest().getQueryString(), null);
+		StringBuffer url = this.request.getRequestURL();
+		String query = this.request.getQueryString();
+		if (StringUtils.hasText(query)) {
+			url.append('?').append(query);
+		}
+		return new URI(url.toString());
 	}
 
 	@Override