You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by sh...@apache.org on 2017/11/17 01:51:00 UTC
[trafficserver] branch master updated: corrects response reason
when failing to connect to origin
This is an automated email from the ASF dual-hosted git repository.
shinrich pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new e7534ac corrects response reason when failing to connect to origin
e7534ac is described below
commit e7534aca85957129dafcbe7037b97b0c7ecf42da
Author: Derek Dagit <de...@oath.com>
AuthorDate: Wed Nov 15 20:39:49 2017 +0000
corrects response reason when failing to connect to origin
---
proxy/http/HttpTransact.cc | 5 ++-
.../headers/general-connection-failure-502.gold | 21 +++++++++
.../headers/general-connection-failure-502.test.py | 52 ++++++++++++++++++++++
3 files changed, 76 insertions(+), 2 deletions(-)
diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc
index 54ba25f..c79b0f6 100644
--- a/proxy/http/HttpTransact.cc
+++ b/proxy/http/HttpTransact.cc
@@ -7359,8 +7359,9 @@ HttpTransact::handle_server_died(State *s)
body_type = "response#bad_response";
break;
case CONNECTION_ERROR:
- status = HTTP_STATUS_BAD_GATEWAY;
- reason = (char *)get_error_string(s->cause_of_death_errno);
+ status = HTTP_STATUS_BAD_GATEWAY;
+ reason =
+ static_cast<const char *>(get_error_string(s->cause_of_death_errno == 0 ? -ENET_CONNECT_FAILED : s->cause_of_death_errno));
body_type = "connect#failed_connect";
break;
case OPEN_RAW_ERROR:
diff --git a/tests/gold_tests/headers/general-connection-failure-502.gold b/tests/gold_tests/headers/general-connection-failure-502.gold
new file mode 100644
index 0000000..a5e2732
--- /dev/null
+++ b/tests/gold_tests/headers/general-connection-failure-502.gold
@@ -0,0 +1,21 @@
+HTTP/1.1 502 connect failed
+Connection: keep-alive
+Cache-Control: no-store
+Content-Type: text/html
+Content-Language: en
+Content-Length: 247
+
+<HTML>
+<HEAD>
+<TITLE>Could Not Connect</TITLE>
+</HEAD>
+
+<BODY BGCOLOR="white" FGCOLOR="black">
+<H1>Could Not Connect</H1>
+<HR>
+
+<FONT FACE="Helvetica,Arial"><B>
+Description: Could not connect to the requested server host.
+</B></FONT>
+<HR>
+</BODY>
diff --git a/tests/gold_tests/headers/general-connection-failure-502.test.py b/tests/gold_tests/headers/general-connection-failure-502.test.py
new file mode 100644
index 0000000..839190a
--- /dev/null
+++ b/tests/gold_tests/headers/general-connection-failure-502.test.py
@@ -0,0 +1,52 @@
+'''
+Test response when connection to origin fails
+'''
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import os
+
+Test.Summary = '''
+Test response when connection to origin fails
+'''
+
+Test.ContinueOnFail = True
+
+ts = Test.MakeATSProcess("ts")
+
+HOST = 'www.connectfail502.test'
+
+ARBITRARY_LOOPBACK_IP='127.220.59.101' # This should fail to connect.
+ts.Disk.remap_config.AddLine(
+ 'map http://{0} http://{1}'.format(HOST, ARBITRARY_LOOPBACK_IP)
+)
+
+Test.Setup.Copy(os.path.join(Test.Variables['AtsTestToolsDir'], 'tcp_client.py'))
+
+TEST_DATA_PATH=os.path.join(Test.TestDirectory, 'www.connectfail502.test-get.txt')
+with open(TEST_DATA_PATH, 'w') as f:
+ f.write("GET / HTTP/1.1\r\nHost: {}\r\n\r\n".format(HOST))
+Test.Setup.Copy(TEST_DATA_PATH)
+
+GOLD_FILE_PATH=os.path.join(Test.TestDirectory, 'general-connection-failure-502.gold')
+Test.Setup.Copy(GOLD_FILE_PATH)
+
+tr = Test.AddTestRun()
+tr.Processes.Default.StartBefore(Test.Processes.ts)
+tr.Processes.Default.Command = "python tcp_client.py 127.0.0.1 {0} {1} | egrep -v '^(Date: |Server: ATS/)'"\
+ .format(ts.Variables.port, os.path.basename(TEST_DATA_PATH))
+tr.Processes.Default.ReturnCode = 0
+tr.Processes.Default.Streams.stdout = os.path.basename(GOLD_FILE_PATH)
--
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>'].