You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by de...@apache.org on 2018/08/27 14:03:40 UTC
svn commit: r1839329 -
/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerHttpRequestFilter.java
Author: degenaro
Date: Mon Aug 27 14:03:40 2018
New Revision: 1839329
URL: http://svn.apache.org/viewvc?rev=1839329&view=rev
Log:
UIMA-5855 DUCC Web Server (WS) http -> https redirect does not include query string
Modified:
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerHttpRequestFilter.java
Modified: uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerHttpRequestFilter.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerHttpRequestFilter.java?rev=1839329&r1=1839328&r2=1839329&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerHttpRequestFilter.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerHttpRequestFilter.java Mon Aug 27 14:03:40 2018
@@ -22,6 +22,7 @@ import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
+import java.net.URLDecoder;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicLong;
@@ -278,6 +279,11 @@ public class DuccHandlerHttpRequestFilte
String reqUri = request.getRequestURI();
if(isRestrictedUri(reqUri)) {
String url = request.getRequestURL().toString();
+ String encodedQS = request.getQueryString();
+ if(encodedQS != null) {
+ String qs = URLDecoder.decode(encodedQS, "UTF-8");
+ url = url+"?"+qs;
+ }
String portHttps = ""+ConfigValue.PortHttps.getInt(DuccPropertiesResolver.get(DuccPropertiesResolver.ducc_ws_port_ssl));
String portHttp = ""+ConfigValue.PortHttp.getInt(DuccPropertiesResolver.get(DuccPropertiesResolver.ducc_ws_port));
String s1Before = "http"+":";