diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2010-01-12 17:54:04 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-12 21:09:44 (GMT) |
| commit | 8efa5f629efb9a8af48619ee90dee02343e0f19d (patch) | |
| tree | 4703d591026c949487f232c13a28a473aa1b3a05 | |
| parent | fbb9971aca1fef66e622d64418121f6077f05c57 (diff) | |
| download | git-8efa5f629efb9a8af48619ee90dee02343e0f19d.zip git-8efa5f629efb9a8af48619ee90dee02343e0f19d.tar.gz git-8efa5f629efb9a8af48619ee90dee02343e0f19d.tar.bz2 | |
remote-curl: Fix Accept header for smart HTTP connections
We actually expect to see an application/x-git-upload-pack-result
but we lied and said we Accept *-response. This was a typo on my
part when I was writing the code.
Fortunately the wrong Accept header had no real impact, as the
deployed git-http-backend servers were not testing the Accept
header before they returned their content.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | remote-curl.c | 2 | ||||
| -rwxr-xr-x | t/t5551-http-fetch.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/remote-curl.c b/remote-curl.c index a331bae..8f169dd 100644 --- a/remote-curl.c +++ b/remote-curl.c @@ -480,7 +480,7 @@ static int rpc_service(struct rpc_state *rpc, struct discovery *heads) strbuf_addf(&buf, "Content-Type: application/x-%s-request", svc); rpc->hdr_content_type = strbuf_detach(&buf, NULL); - strbuf_addf(&buf, "Accept: application/x-%s-response", svc); + strbuf_addf(&buf, "Accept: application/x-%s-result", svc); rpc->hdr_accept = strbuf_detach(&buf, NULL); while (!err) { diff --git a/t/t5551-http-fetch.sh b/t/t5551-http-fetch.sh index c0505ec..7faa31a 100755 --- a/t/t5551-http-fetch.sh +++ b/t/t5551-http-fetch.sh @@ -38,7 +38,7 @@ cat >exp <<EOF > POST /smart/repo.git/git-upload-pack HTTP/1.1 > Accept-Encoding: deflate, gzip > Content-Type: application/x-git-upload-pack-request -> Accept: application/x-git-upload-pack-response +> Accept: application/x-git-upload-pack-result > Content-Length: xxx < HTTP/1.1 200 OK < Pragma: no-cache |