Code

Merge branch 'sp/smart-http'
authorJunio C Hamano <gitster@pobox.com>
Sat, 21 Nov 2009 07:51:23 +0000 (23:51 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 21 Nov 2009 07:51:23 +0000 (23:51 -0800)
commit905bf7742cf5f4a6dea2e75ba2dbd89d5dfaa793
tree4f6173217f109d96e31b47805c945222a7ee5171
parent7dacc6c0681203bb24b74c7b3318b1e6d5d16ee5
parent354870171bc98dfef7dfa037b3fe9ac9454c94a2
Merge branch 'sp/smart-http'

* sp/smart-http: (37 commits)
  http-backend: Let gcc check the format of more printf-type functions.
  http-backend: Fix access beyond end of string.
  http-backend: Fix bad treatment of uintmax_t in Content-Length
  t5551-http-fetch: Work around broken Accept header in libcurl
  t5551-http-fetch: Work around some libcurl versions
  http-backend: Protect GIT_PROJECT_ROOT from /../ requests
  Git-aware CGI to provide dumb HTTP transport
  http-backend: Test configuration options
  http-backend: Use http.getanyfile to disable dumb HTTP serving
  test smart http fetch and push
  http tests: use /dumb/ URL prefix
  set httpd port before sourcing lib-httpd
  t5540-http-push: remove redundant fetches
  Smart HTTP fetch: gzip requests
  Smart fetch over HTTP: client side
  Smart push over HTTP: client side
  Discover refs via smart HTTP server when available
  http-backend: more explict LocationMatch
  http-backend: add example for gitweb on same URL
  http-backend: use mod_alias instead of mod_rewrite
  ...

Conflicts:
.gitignore
remote-curl.c
13 files changed:
.gitignore
Documentation/config.txt
Makefile
builtin-fetch.c
builtin-receive-pack.c
builtin-send-pack.c
cache.h
commit.c
commit.h
http-push.c
remote-curl.c
transport.c
upload-pack.c