Merge branch 'sp/smart-http-content-type-check'
authorJunio C Hamano <gitster@pobox.com>
Mon, 11 Feb 2013 04:35:23 +0000 (20:35 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 11 Feb 2013 04:35:23 +0000 (20:35 -0800)
commit271cd23527c851ec5dd31a8603a8b25f936eb9e1
tree9a90a3545a77c50ce8d58c10ce4f203b227f225f
parentb3310b5e2f576ef807f90eab0e6e178b65bbfb55
parent3443db51a0f2a43061d4badc6a0065672386eae5
Merge branch 'sp/smart-http-content-type-check'

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
http-push.c