@@ -128,7 +128,7 @@ RUN git clone https://github.com/golang/lint.git /go/src/github.com/golang/lint

 RUN gem install --no-rdoc --no-ri fpm --version 1.3.2

 # Install registry

-ENV REGISTRY_COMMIT 2317f721a3d8428215a2b65da4ae85212ed473b4

+ENV REGISTRY_COMMIT ec87e9b6971d831f0eff752ddb54fb64693e51cd

 RUN set -x \

 	&& export GOPATH="$(mktemp -d)" \

 	&& git clone https://github.com/docker/distribution.git "$GOPATH/src/github.com/docker/distribution" \

@@ -35,7 +35,7 @@ clone git github.com/coreos/go-etcd v2.0.0

 clone git github.com/hashicorp/consul v0.5.2

 # get graph and distribution packages

-clone git github.com/docker/distribution 7dc8d4a26b689bd4892f2f2322dbce0b7119d686

+clone git github.com/docker/distribution ec87e9b6971d831f0eff752ddb54fb64693e51cd # docker/1.8 branch

 clone git github.com/vbatts/tar-split v0.9.6

 clone git github.com/docker/notary 8e8122eb5528f621afcd4e2854c47302f17392f7

@@ -359,25 +359,18 @@ type blobs struct {

 	distribution.BlobDeleter

 }

-func sanitizeLocation(location, source string) (string, error) {

-	locationURL, err := url.Parse(location)

+func sanitizeLocation(location, base string) (string, error) {

+	baseURL, err := url.Parse(base)

 	if err != nil {

 		return "", err

 	}

-	if locationURL.Scheme == "" {

-		sourceURL, err := url.Parse(source)

-		if err != nil {

-			return "", err

-		}

-		locationURL = &url.URL{

-			Scheme: sourceURL.Scheme,

-			Host:   sourceURL.Host,

-			Path:   location,

-		}

-		location = locationURL.String()

+	locationURL, err := url.Parse(location)

+	if err != nil {

+		return "", err

 	}

-	return location, nil

+

+	return baseURL.ResolveReference(locationURL).String(), nil

 }

 func (bs *blobs) Stat(ctx context.Context, dgst digest.Digest) (distribution.Descriptor, error) {