author | Junio C Hamano <gitster@pobox.com> | |
Sat, 21 Nov 2009 07:51:23 +0000 (23:51 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sat, 21 Nov 2009 07:51:23 +0000 (23:51 -0800) | ||
commit | 905bf7742cf5f4a6dea2e75ba2dbd89d5dfaa793 | |
tree | 4f6173217f109d96e31b47805c945222a7ee5171 | tree | snapshot |
parent | 7dacc6c0681203bb24b74c7b3318b1e6d5d16ee5 | commit | diff |
parent | 354870171bc98dfef7dfa037b3fe9ac9454c94a2 | commit | diff |
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
* 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 | diff1 | | diff2 | | blob | history |
Documentation/config.txt | diff1 | | diff2 | | blob | history |
Makefile | diff1 | | diff2 | | blob | history |
builtin-fetch.c | diff1 | | diff2 | | blob | history |
builtin-receive-pack.c | diff1 | | diff2 | | blob | history |
builtin-send-pack.c | diff1 | | diff2 | | blob | history |
cache.h | diff1 | | diff2 | | blob | history |
commit.c | diff1 | | diff2 | | blob | history |
commit.h | diff1 | | diff2 | | blob | history |
http-push.c | diff1 | | diff2 | | blob | history |
remote-curl.c | diff1 | | diff2 | | blob | history |
transport.c | diff1 | | diff2 | | blob | history |
upload-pack.c | diff1 | | diff2 | | blob | history |