development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-30 04:01:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'jk/smart-http-switch'

Browse source 
Allows users to turn off smart-http when talking to dumb-only
servers.

* jk/smart-http-switch:
  remote-curl: let users turn off smart http
  remote-curl: rename is_http variable
This commit is contained in:
Junio C Hamano 2012-09-29 22:28:24 -07:00
commit fb1e4a85bf
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
remote-curl.c
View file

@ -95,15 +95,16 @@ static struct discovery* discover_refs(const char *service)
struct strbuf buffer = STRBUF_INIT; struct strbuf buffer = STRBUF_INIT;
struct discovery *last = last_discovery; struct discovery *last = last_discovery;
char *refs_url; char *refs_url;
int http_ret, is_http = 0; int http_ret, maybe_smart = 0;
if (last && !strcmp(service, last->service)) if (last && !strcmp(service, last->service))
return last; return last;
free_discovery(last); free_discovery(last);
strbuf_addf(&buffer, "%sinfo/refs", url); strbuf_addf(&buffer, "%sinfo/refs", url);
if (!prefixcmp(url, "http://") || !prefixcmp(url, "https://")) { if ((!prefixcmp(url, "http://") || !prefixcmp(url, "https://")) &&
is_http = 1; git_env_bool("GIT_SMART_HTTP", 1)) {
maybe_smart = 1;
if (!strchr(url, '?')) if (!strchr(url, '?'))
strbuf_addch(&buffer, '?'); strbuf_addch(&buffer, '?');
else else
@ -131,7 +132,7 @@ static struct discovery* discover_refs(const char *service)
last->buf_alloc = strbuf_detach(&buffer, &last->len); last->buf_alloc = strbuf_detach(&buffer, &last->len);
last->buf = last->buf_alloc; last->buf = last->buf_alloc;
if (is_http && 5 <= last->len && last->buf[4] == '#') { if (maybe_smart && 5 <= last->len && last->buf[4] == '#') {
/* smart HTTP response; validate that the service /* smart HTTP response; validate that the service
* pkt-line matches our request. * pkt-line matches our request.
*/ */

12
t/t5551-http-fetch.sh
View file

@ -130,6 +130,18 @@ test_expect_success 'clone from auth-only-for-push repository' '
test_cmp expect actual test_cmp expect actual
' '
test_expect_success 'disable dumb http on server' '
git --git-dir="$HTTPD_DOCUMENT_ROOT_PATH/repo.git" \
config http.getanyfile false
'
test_expect_success 'GIT_SMART_HTTP can disable smart http' '
(GIT_SMART_HTTP=0 &&
export GIT_SMART_HTTP &&
cd clone &&
test_must_fail git fetch)
'
test -n "$GIT_TEST_LONG" && test_set_prereq EXPENSIVE test -n "$GIT_TEST_LONG" && test_set_prereq EXPENSIVE
test_expect_success EXPENSIVE 'create 50,000 tags in the repo' ' test_expect_success EXPENSIVE 'create 50,000 tags in the repo' '