Revision 5ad8eca1 snf-django-lib/snf_django/lib/api/proxy/__init__.py

b/snf-django-lib/snf_django/lib/api/proxy/__init__.py
35 35

  
36 36
from objpool.http import PooledHTTPConnection
37 37

  
38
from synnefo.lib import join_urls
39

  
38 40
from .utils import fix_header, forward_header
39 41

  
40 42
import urllib
......
74 76
    kwargs['body'] = request.raw_post_data
75 77

  
76 78
    p = urlparse.urlparse(target)
79
    path = join_urls(p.path, request.path)
77 80
    with PooledHTTPConnection(p.netloc, p.scheme) as conn:
78 81
        conn.request(
79 82
            request.method,
80
            '?'.join([request.path, urllib.urlencode(request.GET)]),
81
            **kwargs)
83
            '?'.join([path, urllib.urlencode(request.GET)]), **kwargs)
82 84
        response = conn.getresponse()
83 85

  
84 86
        # turn httplib.HttpResponse to django.http.Response

Also available in: Unified diff