Browse Source

[trac547] removed unexpected HTTP redirection

Naoki Kambe 14 years ago
parent
commit
d7cf894e55
2 changed files with 5 additions and 17 deletions
  1. 2 12
      src/bin/stats/stats_httpd.py.in
  2. 3 5
      src/bin/stats/tests/b10-stats-httpd_test.py

+ 2 - 12
src/bin/stats/stats_httpd.py.in

@@ -79,18 +79,8 @@ class HttpHandler(http.server.BaseHTTPRequestHandler):
             elif self.path == XSL_URL_PATH:
                 body = self.server.xsl_handler()
             else:
-                if 'Host' in self.headers.keys():
-                    # redirect to XML URL
-                    self.send_response(302)
-                    self.send_header(
-                        "Location",
-                        "http://" + self.headers.get('Host') + XML_URL_PATH)
-                    self.end_headers()
-                    return None
-                else:
-                    # Couldn't find HOST
-                    self.send_error(404)
-                    return None
+                self.send_error(404)
+                return None
         except StatsHttpdError as err:
             self.send_error(500)
             if self.server.verbose:

+ 3 - 5
src/bin/stats/tests/b10-stats-httpd_test.py

@@ -115,15 +115,13 @@ class TestHttpHandler(unittest.TestCase):
         for (k, v) in DUMMY_DATA.items():
             self.assertRegexpMatches(handler.response.body, str(k))
 
-        # 302 redirect
+        # 404 NotFound with Host header
         handler.path = '/'
         handler.headers = {'Host': 'my.host.domain'}
         handler.do_GET()
-        self.assertEqual(handler.response.code, 302)
-        self.assertEqual(handler.response.headers["Location"],
-                         "http://my.host.domain%s" % stats_httpd.XML_URL_PATH)
+        self.assertEqual(handler.response.code, 404)
 
-        # 404 NotFound
+        # 404 NotFound without Host header
         handler.path = '/path/to/foo/bar'
         handler.headers = {}
         handler.do_GET()