Merge branch 'sp/smart-http-content-type-check'
authorJunio C Hamano <gitster@pobox.com>
Mon, 11 Feb 2013 04:35:23 +0000 (10 20:35 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 11 Feb 2013 04:35:23 +0000 (10 20:35 -0800)
The smart HTTP clients forgot to verify the content-type that comes
back from the server side to make sure that the request is being
handled properly.

* sp/smart-http-content-type-check:
  http_request: reset "type" strbuf before adding
  t5551: fix expected error output
  Verify Content-Type from smart HTTP servers

1  2 
http-push.c

diff --cc http-push.c
Simple merge