Author: igalic Date: Fri Jul 15 19:40:10 2011 New Revision: 1147294 URL: http://svn.apache.org/viewvc?rev=1147294&view=rev Log: backport TS-860 Modified: trafficserver/traffic/branches/3.0.x/ (props changed) trafficserver/traffic/branches/3.0.x/CHANGES trafficserver/traffic/branches/3.0.x/STATUS trafficserver/traffic/branches/3.0.x/proxy/http/HttpTransact.cc Propchange: trafficserver/traffic/branches/3.0.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Jul 15 19:40:10 2011 @@ -1,4 +1,4 @@ /incubator/trafficserver/traffic/branches/dev:891823-915885 /trafficserver/traffic/branches/ts-291:965529-991993 /trafficserver/traffic/branches/wccp:1021790-1040544 -/trafficserver/traffic/trunk:1129268,1131080,1131473,1133066,1133071,1133639,1135769-1135770,1137111,1137775,1137844,1137846,1144094,1144096,1144746,1146414 +/trafficserver/traffic/trunk:1129268,1131080,1131473,1133066,1133071,1133639,1135769-1135770,1137111,1137775,1137844,1137846,1143116,1144094,1144096,1144746,1146414 Modified: trafficserver/traffic/branches/3.0.x/CHANGES URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/CHANGES?rev=1147294&r1=1147293&r2=1147294&view=diff ============================================================================== --- trafficserver/traffic/branches/3.0.x/CHANGES (original) +++ trafficserver/traffic/branches/3.0.x/CHANGES Fri Jul 15 19:40:10 2011 @@ -1,6 +1,9 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 3.0.1 + *) [TS-860] Built in error for host not found looks like Internet Explorer + error. Author: William Bardwell + *) [TS-875]: TSFetchRestpGet(), TSFetchPageResptGet() and TSFetchUrl() have incorrect asserts. Author: Manjesh Nilange Modified: trafficserver/traffic/branches/3.0.x/STATUS URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/STATUS?rev=1147294&r1=1147293&r2=1147294&view=diff ============================================================================== --- trafficserver/traffic/branches/3.0.x/STATUS (original) +++ trafficserver/traffic/branches/3.0.x/STATUS Fri Jul 15 19:40:10 2011 @@ -49,12 +49,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: Jira: https://issues.apache.org/jira/browse/TS-868 +1: igalic, zwoop, amc - * HTTP: Built in error for host not found looks like Internet Explorer - error. - Trunk patch: http://svn.apache.org/viewvc?rev=1143116&view=rev - Jira: https://issues.apache.org/jira/browse/TS-860 - +1: zwoop, igalic, amc - RELEASE PROCESS The Traffic Server release process is documented at Modified: trafficserver/traffic/branches/3.0.x/proxy/http/HttpTransact.cc URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/proxy/http/HttpTransact.cc?rev=1147294&r1=1147293&r2=1147294&view=diff ============================================================================== --- trafficserver/traffic/branches/3.0.x/proxy/http/HttpTransact.cc (original) +++ trafficserver/traffic/branches/3.0.x/proxy/http/HttpTransact.cc Fri Jul 15 19:40:10 2011 @@ -1480,33 +1480,14 @@ HttpTransact::ReDNSRoundRobin(State* s) //"the server does not have a DNS entry. Perhaps there is " //"a misspelling in the server name, or the server no " //"longer exists. Double-check the name and try again."), - ("" - "" - "Cannot find server
" - "

" - "The page cannot be displayed

The page you are looking " - "for is currently unavailable. The Web site might be experiencing technical difficulties, " - "or you may need to adjust your browser settings.
" - "

Please try the following:

    " - "
  • Click the Refresh button, or try again later.
  • If you typed the page address in the Address bar, make sure that it is " - "spelled correctly.
  • To check your connection settings, click the" - "Tools " - "menu, and then click Internet Options. On the Connections tab, click Settings." - " The settings should match those provided by your local area network (LAN) administrator or " - "Internet service provider (ISP).
  • Some sites require 128-bit " - "connection security. Click the Help menu and then click About Internet Explorer " - " to determine what strength security you have installed.
  • " - "If you are trying to reach a secure site, make sure your Security settings can support it. " - "Click the Tools menu, and then click Internet Options. On the Advanced tab, " - "scroll to the Security section and check settings for SSL 2.0, SSL 3.0, TLS 1.0, PCT 1.0.
  • " - "
  • Click the Back button to try another link.


502 - Cannot find server or DNS Error [reDNS]

" - "
"), s->server_info.name); + ("" + "Unknown Host" + "

Unknown Host


" + "" + "Description: Unable to locate the server named \"%s\" --- " + "the server does not have a DNS entry. Perhaps there is a misspelling " + "in the server name, or the server no longer exists. Double-check the " + "name and try again.
"), s->server_info.name); s->cache_info.action = CACHE_DO_NO_ACTION; s->next_action = PROXY_SEND_ERROR_CACHE_NOOP; // s->next_action = PROXY_INTERNAL_CACHE_NOOP; @@ -1599,33 +1580,15 @@ HttpTransact::OSDNSLookup(State* s) //"the server does not have a DNS entry. Perhaps there is " //"a misspelling in the server name, or the server no " //"longer exists. Double-check the name and try again."), - ("" - "" - "Cannot find server
" - "

" - "The page cannot be displayed

The page you are looking " - "for is currently unavailable. The Web site might be experiencing technical difficulties, " - "or you may need to adjust your browser settings.
" - "

Please try the following:

    " - "
  • Click the Refresh button, or try again later.
  • If you typed the page address in the Address bar, make sure that it is " - "spelled correctly.
  • To check your connection settings, click the" - "Tools " - "menu, and then click Internet Options. On the Connections tab, click Settings." - " The settings should match those provided by your local area network (LAN) administrator or " - "Internet service provider (ISP).
  • Some sites require 128-bit " - "connection security. Click the Help menu and then click About Internet Explorer " - " to determine what strength security you have installed.
  • " - "If you are trying to reach a secure site, make sure your Security settings can support it. " - "Click the Tools menu, and then click Internet Options. On the Advanced tab, " - "scroll to the Security section and check settings for SSL 2.0, SSL 3.0, TLS 1.0, PCT 1.0.
  • " - "
  • Click the Back button to try another link.


502 - Cannot find server or DNS Error [%s:%d]

" - "
"), s->server_info.name, host_name_expansion); + ("" + "Unknown Host" + "

Unknown Host


" + "" + "Description: Unable to locate the server named \"%s (%d)\" --- " + "the server does not have a DNS entry. Perhaps there is a misspelling " + "in the server name, or the server no longer exists. Double-check the " + "name and try again.
") + , s->server_info.name, host_name_expansion); // s->cache_info.action = CACHE_DO_NO_ACTION; TRANSACT_RETURN(PROXY_SEND_ERROR_CACHE_NOOP, NULL); break;