----- Original Message ----- > Updated Branches: > refs/heads/master 8390de26b -> d82dc8e4d > > > TS-2074 Remove proxy.config.http.server_port remnants > > > Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo > Commit: > http://git-wip-us.apache.org/repos/asf/trafficserver/commit/f913827a > Tree: > http://git-wip-us.apache.org/repos/asf/trafficserver/tree/f913827a > Diff: > http://git-wip-us.apache.org/repos/asf/trafficserver/diff/f913827a > > Branch: refs/heads/master > Commit: f913827a01f2b96deeb81cd13cfd32b3f691be93 > Parents: 610df9f > Author: Leif Hedstrom <zw...@apache.org> > Authored: Fri Jul 26 10:04:43 2013 -0600 > Committer: Leif Hedstrom <zw...@apache.org> > Committed: Mon Jul 29 21:52:05 2013 +0200 > > ---------------------------------------------------------------------- > proxy/http/HttpConfig.cc | 2 -- > proxy/http/HttpConfig.h | 2 -- > proxy/http/HttpTransact.cc | 22 ++++++++-------------- > 3 files changed, 8 insertions(+), 18 deletions(-) > ---------------------------------------------------------------------- > > > http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f913827a/proxy/http/HttpConfig.cc > ---------------------------------------------------------------------- > diff --git a/proxy/http/HttpConfig.cc b/proxy/http/HttpConfig.cc > index cf7eedc..55fe3f4 100644 > --- a/proxy/http/HttpConfig.cc > +++ b/proxy/http/HttpConfig.cc > @@ -1170,7 +1170,6 @@ HttpConfig::startup() > c.proxy_response_via_string_len = -1; > > HttpEstablishStaticConfigStringAlloc(c.url_expansions_string, > "proxy.config.dns.url_expansions"); > - HttpEstablishStaticConfigLongLong(c.proxy_server_port, > "proxy.config.http.server_port"); > HttpEstablishStaticConfigByte(c.oride.keep_alive_enabled_in, > "proxy.config.http.keep_alive_enabled_in"); > HttpEstablishStaticConfigByte(c.oride.keep_alive_enabled_out, > "proxy.config.http.keep_alive_enabled_out"); > HttpEstablishStaticConfigByte(c.oride.chunking_enabled, > "proxy.config.http.chunking_enabled"); > @@ -1443,7 +1442,6 @@ HttpConfig::reconfigure() > params->url_expansions_string = > ats_strdup(m_master.url_expansions_string); > params->url_expansions = > parse_url_expansions(params->url_expansions_string, > ¶ms->num_url_expansions); > > - params->proxy_server_port = m_master.proxy_server_port; > params->oride.keep_alive_enabled_in = > INT_TO_BOOL(m_master.oride.keep_alive_enabled_in); > params->oride.keep_alive_enabled_out = > INT_TO_BOOL(m_master.oride.keep_alive_enabled_out); > params->oride.chunking_enabled = > INT_TO_BOOL(m_master.oride.chunking_enabled); > > http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f913827a/proxy/http/HttpConfig.h > ---------------------------------------------------------------------- > diff --git a/proxy/http/HttpConfig.h b/proxy/http/HttpConfig.h > index e2f9ddb..659bbe7 100644 > --- a/proxy/http/HttpConfig.h > +++ b/proxy/http/HttpConfig.h > @@ -648,7 +648,6 @@ public: > /////////////////////////////////////////////////// > // connection variables. timeouts are in seconds // > /////////////////////////////////////////////////// > - MgmtInt proxy_server_port; > MgmtByte session_auth_cache_keep_alive_enabled; > MgmtInt origin_server_pipeline; > MgmtInt user_agent_pipeline; > @@ -907,7 +906,6 @@ HttpConfigParams::HttpConfigParams() > url_expansions_string(0), > url_expansions(0), > num_url_expansions(0), > - proxy_server_port(0), > session_auth_cache_keep_alive_enabled(0), > origin_server_pipeline(0), > user_agent_pipeline(0), > > http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f913827a/proxy/http/HttpTransact.cc > ---------------------------------------------------------------------- > diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc > index 43d78f2..f31a8bc 100644 > --- a/proxy/http/HttpTransact.cc > +++ b/proxy/http/HttpTransact.cc > @@ -6217,20 +6217,14 @@ HttpTransact::is_request_valid(State* s, > HTTPHdr* incoming_request) > // Transparent client side, but client did not provide any HOST > information > // (neither in the URL nor a HOST header). > if (s->http_config_param->client_transparency_enabled) { > - build_error_response( > - s, > - HTTP_STATUS_BAD_REQUEST, > - "Host Header Required", > - "interception#no_host", > - // This is all one long string > - "An attempt was made to transparently proxy your request, " > - "but this attempt failed because your browser did not " > - "send an HTTP 'Host' header.<p>Please manually configure " > - "your browser to use 'http://%s:%d' as an HTTP proxy. " > - "Please refer to your browser's documentation for details. > ", > - s->http_config_param->proxy_hostname, > - s->http_config_param->proxy_server_port > - ); > + build_error_response(s, HTTP_STATUS_BAD_REQUEST, "Host Header > Required", > + "interception#no_host", > + "An attempt was made to transparently > proxy your request, " > + "but this attempt failed because your > browser did not " > + "send an HTTP 'Host' header.<p>Please > manually configure " > + "your browser to use 'http://%s' as an > HTTP proxy. " > + "Please refer to your browser's > documentation for details. ", > + s->http_config_param->proxy_hostname); > } else if (s->http_config_param->reverse_proxy_enabled) { //
my old eyes are a bit weary, are you mixing style and code changes in the same commit here? > host header missing, and transparency off but reverse > // proxy on > build_error_response(s, HTTP_STATUS_BAD_REQUEST, "Host Header > Required", "request#no_host", > > -- Igor Galić Tel: +43 (0) 664 886 22 883 Mail: i.ga...@brainsware.org URL: http://brainsware.org/ GPG: 6880 4155 74BD FD7C B515 2EA5 4B1D 9E08 A097 C9AE
