You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2014/06/05 15:58:50 UTC
svn commit: r1600665 - in /tomcat/tc7.0.x/trunk: ./
java/org/apache/tomcat/websocket/server/
test/org/apache/tomcat/websocket/server/ webapps/docs/
Author: markt
Date: Thu Jun 5 13:58:49 2014
New Revision: 1600665
URL: http://svn.apache.org/r1600665
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56573
Restore query string.
Add test cases.
Added:
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TestWsHandshakeRequest.java
- copied unchanged from r1600663, tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsHandshakeRequest.java
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TesterUriServer.java
- copied unchanged from r1600663, tomcat/trunk/test/org/apache/tomcat/websocket/server/TesterUriServer.java
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsHandshakeRequest.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1600663
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsHandshakeRequest.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsHandshakeRequest.java?rev=1600665&r1=1600664&r2=1600665&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsHandshakeRequest.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsHandshakeRequest.java Thu Jun 5 13:58:49 2014
@@ -81,6 +81,11 @@ public class WsHandshakeRequest implemen
sb.append(port);
}
sb.append(request.getRequestURI());
+ if (queryString != null) {
+ sb.append('?');
+ sb.append(queryString);
+ }
+
try {
requestUri = new URI(sb.toString());
} catch (URISyntaxException e) {
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1600665&r1=1600664&r2=1600665&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Jun 5 13:58:49 2014
@@ -111,12 +111,12 @@
<fix>
<bug>56573</bug>: Change the value returned by
<code>Session.getRequestURI()</code> from the value obtained from
- <code>HttpServletRequest.getRequestURI()</code> to the value obtained
- from <code>HttpServletRequest.getRequestURI()</code> with the scheme
- changed to ws or wss as appropriate. Note that the WebSocket Expert
- Group is expected to clarify the expected behaviour for
- <code>Session.getRequestURI()</code> which may result in further
- changes. (markt)
+ <code>HttpServletRequest.getRequestURI()</code> plus query string to the
+ value obtained from <code>HttpServletRequest.getRequestURI()</code> plus
+ query string with the scheme changed to ws or wss as appropriate. Note
+ that the WebSocket Expert Group is expected to clarify the expected
+ behaviour for <code>Session.getRequestURI()</code> which may result in
+ further changes. (markt)
</fix>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org