[trafficserver] branch master updated: TS-5058: Fix CONNECT handling without parent proxying.

[jp...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jpeach pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/trafficserver.git

The following commit(s) were added to refs/heads/master by this push:
       new  b4dfc40   TS-5058: Fix CONNECT handling without parent proxying.
b4dfc40 is described below

commit b4dfc408d929e0b5a33b3930435a88f7ac885e93
Author: James Peach <jp...@apache.org>
AuthorDate: Sat Nov 19 16:16:24 2016 -0800

    TS-5058: Fix CONNECT handling without parent proxying.
    
    The change in TS-5040 broke direct CONNECT method handling by always
    attempting to forward the CONNECT request. In fact, we should only be
    forwarding the request if there is a parent specified or we have explicit
    configuration to do so.
---
 proxy/http/HttpTransact.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc
index c12a334..bb36440 100644
--- a/proxy/http/HttpTransact.cc
+++ b/proxy/http/HttpTransact.cc
@@ -469,7 +469,7 @@ how_to_open_connection(HttpTransact::State *s)
   // Setting up a direct CONNECT tunnel enters OriginServerRawOpen. We always do that if we
   // are not forwarding CONNECT and are not going to a parent proxy.
   if (s->method == HTTP_WKSIDX_CONNECT) {
-    if (s->txn_conf->forward_connect_method == 1 || s->parent_result.result != PARENT_SPECIFIED) {
+    if (s->txn_conf->forward_connect_method == 1 || s->parent_result.result == PARENT_SPECIFIED) {
       s->cdn_saved_next_action = HttpTransact::SM_ACTION_ORIGIN_SERVER_OPEN;
     } else {
       s->cdn_saved_next_action = HttpTransact::SM_ACTION_ORIGIN_SERVER_RAW_OPEN;

-- 
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>'].