diff --git a/r2/r2/config/middleware.py b/r2/r2/config/middleware.py index 9a21d9d70..aa0085a97 100644 --- a/r2/r2/config/middleware.py +++ b/r2/r2/config/middleware.py @@ -288,7 +288,11 @@ class RewriteMiddleware(object): qs = environ.get('QUERY_STRING') if qs: environ['FULLPATH'] += '?' + qs - + environ['FULLURL'] = "%s://%s%s" % ( + environ['wsgi.url_scheme'], + environ['HTTP_HOST'], + environ['FULLPATH'] + ) return self.app(environ, start_response) class StaticTestMiddleware(object): diff --git a/r2/r2/lib/base.py b/r2/r2/lib/base.py index 7ee4dab14..d37cf9b8a 100644 --- a/r2/r2/lib/base.py +++ b/r2/r2/lib/base.py @@ -101,6 +101,7 @@ class BaseController(WSGIController): request.referer = environ.get('HTTP_REFERER') request.user_agent = environ.get('HTTP_USER_AGENT') request.fullpath = environ.get('FULLPATH', request.path) + request.fullurl = environ.get('FULLURL', request.url) request.port = environ.get('request_port') if_modified_since = environ.get('HTTP_IF_MODIFIED_SINCE')