From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 30 Sep 2012 05:28:24 +0000 (-0700)
Subject: Merge branch 'jk/smart-http-switch'
X-Git-Tag: v1.8.0-rc0~13
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/fb1e4a85bf7eb2df819a888d7db3ecececa1b7fc?ds=inline;hp=-c

Merge branch 'jk/smart-http-switch'

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
---

fb1e4a85bf7eb2df819a888d7db3ecececa1b7fc
diff --combined remote-curl.c
index a2696082fb,7b19ebb0f8..10fa8f1ac5
--- a/remote-curl.c
+++ b/remote-curl.c
@@@ -95,15 -95,16 +95,16 @@@ static struct discovery* discover_refs(
  	struct strbuf buffer = STRBUF_INIT;
  	struct discovery *last = last_discovery;
  	char *refs_url;
- 	int http_ret, is_http = 0;
+ 	int http_ret, maybe_smart = 0;
  
  	if (last && !strcmp(service, last->service))
  		return last;
  	free_discovery(last);
  
  	strbuf_addf(&buffer, "%sinfo/refs", url);
- 	if (!prefixcmp(url, "http://") || !prefixcmp(url, "https://")) {
- 		is_http = 1;
+ 	if ((!prefixcmp(url, "http://") || !prefixcmp(url, "https://")) &&
+ 	     git_env_bool("GIT_SMART_HTTP", 1)) {
+ 		maybe_smart = 1;
  		if (!strchr(url, '?'))
  			strbuf_addch(&buffer, '?');
  		else
@@@ -131,7 -132,7 +132,7 @@@
  	last->buf_alloc = strbuf_detach(&buffer, &last->len);
  	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
  		 * pkt-line matches our request.
  		 */
@@@ -379,7 -380,7 +380,7 @@@ static int probe_rpc(struct rpc_state *
  	curl_easy_setopt(slot->curl, CURLOPT_NOBODY, 0);
  	curl_easy_setopt(slot->curl, CURLOPT_POST, 1);
  	curl_easy_setopt(slot->curl, CURLOPT_URL, rpc->service_url);
 -	curl_easy_setopt(slot->curl, CURLOPT_ENCODING, "");
 +	curl_easy_setopt(slot->curl, CURLOPT_ENCODING, NULL);
  	curl_easy_setopt(slot->curl, CURLOPT_POSTFIELDS, "0000");
  	curl_easy_setopt(slot->curl, CURLOPT_POSTFIELDSIZE, 4);
  	curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, headers);
@@@ -435,7 -436,7 +436,7 @@@ static int post_rpc(struct rpc_state *r
  	curl_easy_setopt(slot->curl, CURLOPT_NOBODY, 0);
  	curl_easy_setopt(slot->curl, CURLOPT_POST, 1);
  	curl_easy_setopt(slot->curl, CURLOPT_URL, rpc->service_url);
 -	curl_easy_setopt(slot->curl, CURLOPT_ENCODING, "");
 +	curl_easy_setopt(slot->curl, CURLOPT_ENCODING, "gzip");
  
  	headers = curl_slist_append(headers, rpc->hdr_content_type);
  	headers = curl_slist_append(headers, rpc->hdr_accept);
diff --combined t/t5551-http-fetch.sh
index 380c17541e,8427943f0e..5060879d6d
--- a/t/t5551-http-fetch.sh
+++ b/t/t5551-http-fetch.sh
@@@ -32,14 -32,13 +32,14 @@@ setup_askpass_helpe
  cat >exp <<EOF
  > GET /smart/repo.git/info/refs?service=git-upload-pack HTTP/1.1
  > Accept: */*
 +> Accept-Encoding: gzip
  > Pragma: no-cache
  < HTTP/1.1 200 OK
  < Pragma: no-cache
  < Cache-Control: no-cache, max-age=0, must-revalidate
  < Content-Type: application/x-git-upload-pack-advertisement
  > POST /smart/repo.git/git-upload-pack HTTP/1.1
 -> Accept-Encoding: deflate, gzip
 +> Accept-Encoding: gzip
  > Content-Type: application/x-git-upload-pack-request
  > Accept: application/x-git-upload-pack-result
  > Content-Length: xxx
@@@ -130,6 -129,18 +130,18 @@@ test_expect_success 'clone from auth-on
  	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_expect_success EXPENSIVE 'create 50,000 tags in the repo' '