Download Install Tutorial Docs FAQ Tools WikiLicense Team IRC Planet Involvement Shop Book

Changeset 998

Show
Ignore:
Timestamp:
03/03/06 18:26:01
Author:
fumanchu
Message:

Fix for #476 (BaseURLFilter doesn't use socket_port).

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/cherrypy/filters/baseurlfilter.py

    r856 r998  
    1414         
    1515        request = cherrypy.request 
    16         newBaseUrl = cherrypy.config.get('base_url_filter.base_url', 'http://localhost') 
     16         
     17        port = str(cherrypy.config.get('server.socket_port', '80')) 
     18        if port == "80": 
     19            defaultUrl = 'http://localhost' 
     20        else: 
     21            defaultUrl = 'http://localhost:%s' % port 
     22        newBaseUrl = cherrypy.config.get('base_url_filter.base_url', defaultUrl) 
     23         
    1724        if cherrypy.config.get('base_url_filter.use_x_forwarded_host', True): 
    1825            newBaseUrl = request.headers.get("X-Forwarded-Host", newBaseUrl) 

Hosted by WebFaction

Log in as guest/cpguest to create tickets