Changeset 1788
- Timestamp:
- 10/27/07 21:49:11
- Files:
-
- trunk/cherrypy/test/test_proxy.py (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/cherrypy/test/test_proxy.py
r1688 r1788 12 12 'environment': 'test_suite', 13 13 'tools.proxy.on': True, 14 'tools.proxy.base': 'www.mydomain. com',14 'tools.proxy.base': 'www.mydomain.test', 15 15 }) 16 16 … … 62 62 self.getPage("/") 63 63 self.assertHeader('Location', 64 "%s://www.mydomain. com%s/dummy" %64 "%s://www.mydomain.test%s/dummy" % 65 65 (self.scheme, self.prefix())) 66 66 67 67 # Test X-Forwarded-Host (Apache 1.3.33+ and Apache 2) 68 self.getPage("/", headers=[('X-Forwarded-Host', 'http://www.example. com')])69 self.assertHeader('Location', "http://www.example. com/dummy")70 self.getPage("/", headers=[('X-Forwarded-Host', 'www.example. com')])71 self.assertHeader('Location', "%s://www.example. com/dummy" % self.scheme)68 self.getPage("/", headers=[('X-Forwarded-Host', 'http://www.example.test')]) 69 self.assertHeader('Location', "http://www.example.test/dummy") 70 self.getPage("/", headers=[('X-Forwarded-Host', 'www.example.test')]) 71 self.assertHeader('Location', "%s://www.example.test/dummy" % self.scheme) 72 72 73 73 # Test X-Forwarded-For (Apache2) … … 80 80 81 81 # Test X-Host (lighttpd; see https://trac.lighttpd.net/trac/ticket/418) 82 self.getPage("/xhost", headers=[('X-Host', 'www.example. com')])83 self.assertHeader('Location', "%s://www.example. com/blah" % self.scheme)82 self.getPage("/xhost", headers=[('X-Host', 'www.example.test')]) 83 self.assertHeader('Location', "%s://www.example.test/blah" % self.scheme) 84 84 85 85 # Test X-Forwarded-Proto (lighttpd) 86 86 self.getPage("/base", headers=[('X-Forwarded-Proto', 'https')]) 87 self.assertBody("https://www.mydomain. com")87 self.assertBody("https://www.mydomain.test") 88 88 89 89 # Test cherrypy.url() … … 91 91 # Test the value inside requests 92 92 self.getPage(sn + "/newurl") 93 self.assertBody("Browse to <a href='%s://www.mydomain. com" % self.scheme93 self.assertBody("Browse to <a href='%s://www.mydomain.test" % self.scheme 94 94 + sn + "/this/new/page'>this page</a>.") 95 95 self.getPage(sn + "/newurl", headers=[('X-Forwarded-Host', 96 'http://www.example. com')])97 self.assertBody("Browse to <a href='http://www.example. com"96 'http://www.example.test')]) 97 self.assertBody("Browse to <a href='http://www.example.test" 98 98 + sn + "/this/new/page'>this page</a>.") 99 99 … … 114 114 115 115 # Test trailing slash (see http://www.cherrypy.org/ticket/562). 116 self.getPage("/xhost/", headers=[('X-Host', 'www.example. com')])117 self.assertHeader('Location', "%s://www.example. com/xhost"116 self.getPage("/xhost/", headers=[('X-Host', 'www.example.test')]) 117 self.assertHeader('Location', "%s://www.example.test/xhost" 118 118 % self.scheme) 119 119
