diff options
| author | Rick Harris <rick.harris@rackspace.com> | 2011-02-28 16:25:01 +0000 |
|---|---|---|
| committer | Rick Harris <rick.harris@rackspace.com> | 2011-02-28 16:25:01 +0000 |
| commit | d6215666fa28a1dd7368aa32bc1ae9f3ca872fab (patch) | |
| tree | 211ee849cddca17f4eebf0bf1ee151b4b0bbd1cc /bin/nova-ajax-console-proxy | |
| parent | 7ae64e06643025e4945ae0ef056f9fb2184904ff (diff) | |
| parent | edf5da85648659b1a7ad105248d69ef9f8c977e4 (diff) | |
| download | nova-d6215666fa28a1dd7368aa32bc1ae9f3ca872fab.tar.gz nova-d6215666fa28a1dd7368aa32bc1ae9f3ca872fab.tar.xz nova-d6215666fa28a1dd7368aa32bc1ae9f3ca872fab.zip | |
Merging trunk
Diffstat (limited to 'bin/nova-ajax-console-proxy')
| -rwxr-xr-x | bin/nova-ajax-console-proxy | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/bin/nova-ajax-console-proxy b/bin/nova-ajax-console-proxy index 1e11c6d58..bbd60bade 100755 --- a/bin/nova-ajax-console-proxy +++ b/bin/nova-ajax-console-proxy @@ -63,10 +63,16 @@ class AjaxConsoleProxy(object): def __call__(self, env, start_response): try: - req_url = '%s://%s%s?%s' % (env['wsgi.url_scheme'], - env['HTTP_HOST'], - env['PATH_INFO'], - env['QUERY_STRING']) + if 'QUERY_STRING' in env: + req_url = '%s://%s%s?%s' % (env['wsgi.url_scheme'], + env['HTTP_HOST'], + env['PATH_INFO'], + env['QUERY_STRING']) + else: + req_url = '%s://%s%s' % (env['wsgi.url_scheme'], + env['HTTP_HOST'], + env['PATH_INFO']) + if 'HTTP_REFERER' in env: auth_url = env['HTTP_REFERER'] else: |