Merge branch 'sp/smart-http-content-type-check' into maint
commit7927f510f70e2405417859896ddeef1e82c6c810
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 Feb 2013 16:03:54 +0000 (25 08:03 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Feb 2013 16:03:54 +0000 (25 08:03 -0800)
tree2d1a6fe7a0c7c4cbcb4cc1b8c6521b37c039cc42
parentd49f9f178b7efbe45cdd4288a9a7a6a0f023c9e3
parent3443db51a0f2a43061d4badc6a0065672386eae5
Merge branch 'sp/smart-http-content-type-check' into maint

* 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