56c56,63
<         url = urlparse.urljoin(self.registry_url, path)
---
>         if self.endpoint:
>             # already seen a header with endpoint specified (this might be a tags query)
>             # endpoint doesn't have proto; use https://
>             base_url = 'https://' + self.endpoint
>         else:
>             # a header with endpoint not seen yet --- use registry
>             base_url = self.registry_url
>         url = urlparse.urljoin(base_url, path)
57a65
>         self.add_auth_header(request)
119,124c127
<         raw_data = self._get_single_path(path)
<         # raw_data will sometimes be a list of dicts, and sometimes just a dict,
<         # depending on what version of the API we're talking to.
<         if isinstance(raw_data, list):
<             return dict((tag['name'], tag['layer']) for tag in raw_data)
<         return raw_data
---
>         return self._get_single_path(path)