Allow to use extended host patterns and vanilla host patterns at the same time

[privoxy.git] / jcc.c

diff --git a/jcc.c b/jcc.c
index 69c0180..d29b511 100644 (file)
--- a/jcc.c
+++ b/jcc.c
@@ -587,10 +587,8 @@ static jb_err get_request_destination_elsewhere(struct client_state *csp, struct
    }
    else if (JB_ERR_OK == get_destination_from_headers(headers, csp->http))
    {
    }
    else if (JB_ERR_OK == get_destination_from_headers(headers, csp->http))
    {

-#ifndef FEATURE_EXTENDED_HOST_PATTERNS

       /* Split the domain we just got for pattern matching */
       init_domain_components(csp->http);
       /* Split the domain we just got for pattern matching */
       init_domain_components(csp->http);

-#endif

 
       return JB_ERR_OK;
    }
 
       return JB_ERR_OK;
    }


@@ -2357,10 +2355,8 @@ static jb_err process_encrypted_request(struct client_state *csp)
       return JB_ERR_PARSE;
    }
 
       return JB_ERR_PARSE;
    }
 

-#ifndef FEATURE_EXTENDED_HOST_PATTERNS

    /* Split the domain we just got for pattern matching */
    init_domain_components(csp->http);
    /* Split the domain we just got for pattern matching */
    init_domain_components(csp->http);

-#endif

 
 #ifdef FEATURE_TOGGLE
    if ((csp->flags & CSP_FLAG_TOGGLED_ON) != 0)
 
 #ifdef FEATURE_TOGGLE
    if ((csp->flags & CSP_FLAG_TOGGLED_ON) != 0)