You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by us...@apache.org on 2015/08/04 13:12:06 UTC

trafficserver git commit: TS-3817: Assertion on non (HTTP/S WS/S) request scheme in debug mode

Repository: trafficserver
Updated Branches:
  refs/heads/master 679006e2e -> d308606fb


TS-3817: Assertion on non (HTTP/S WS/S) request scheme in debug mode


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/d308606f
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/d308606f
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/d308606f

Branch: refs/heads/master
Commit: d308606fb9ec615c1f53dcbd27a48af6aaf0d64d
Parents: 679006e
Author: Uri Shachar <us...@apache.org>
Authored: Tue Aug 4 14:09:28 2015 +0300
Committer: Uri Shachar <us...@apache.org>
Committed: Tue Aug 4 14:09:28 2015 +0300

----------------------------------------------------------------------
 proxy/http/HttpTransact.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d308606f/proxy/http/HttpTransact.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc
index ff82c09..3fb42fa 100644
--- a/proxy/http/HttpTransact.cc
+++ b/proxy/http/HttpTransact.cc
@@ -5280,7 +5280,7 @@ HttpTransact::check_request_validity(State *s, HTTPHdr *incoming_hdr)
 
   if (!((scheme == URL_WKSIDX_HTTP) && (method == HTTP_WKSIDX_GET))) {
     if (scheme != URL_WKSIDX_HTTP && scheme != URL_WKSIDX_HTTPS && method != HTTP_WKSIDX_CONNECT &&
-        ((scheme == URL_WKSIDX_WS || scheme == URL_WKSIDX_WSS) && !s->is_websocket)) {
+        !((scheme == URL_WKSIDX_WS || scheme == URL_WKSIDX_WSS) && s->is_websocket)) {
       if (scheme < 0) {
         return NO_REQUEST_SCHEME;
       } else {