git/http.c, branch v2.10.3

http: http.emptyauth should allow empty (not just NULL) usernames

2016-10-04T19:02:00Z

When using Kerberos authentication with newer versions of libcurl, CURLOPT_USERPWD must be set to a value, even if it is an empty value. The value is never sent to the server. Previous versions of libcurl did not require this variable to be set. One way that some users express the empty username/password is http://:@gitserver.example.com, which http.emptyauth was designed to support. Another, equivalent, URL is http://@gitserver.example.com. The latter leads to a username of zero-length, rather than a NULL username, but CURLOPT_USERPWD still needs to be set (if http.emptyauth is set). Do so. Signed-off-by: David Turner Signed-off-by: Junio C Hamano

Merge branch 'ew/http-do-not-forget-to-call-curl-multi-remove-handle' into maint

2016-09-29T23:49:39Z

The http transport (with curl-multi option, which is the default these days) failed to remove curl-easy handle from a curlm session, which led to unnecessary API failures. * ew/http-do-not-forget-to-call-curl-multi-remove-handle: http: always remove curl easy from curlm session on release http: consolidate #ifdefs for curl_multi_remove_handle http: warn on curl_multi_add_handle failures

Merge branch 'jk/fix-remote-curl-url-wo-proto' into maint

2016-09-29T23:49:38Z

"git fetch http::/site/path" did not die correctly and segfaulted instead. * jk/fix-remote-curl-url-wo-proto: remote-curl: handle URLs without protocol

http: always remove curl easy from curlm session on release

2016-09-13T20:34:04Z

We must call curl_multi_remove_handle when releasing the slot to prevent subsequent calls to curl_multi_add_handle from failing with CURLM_ADDED_ALREADY (in curl 7.32.1+; older versions returned CURLM_BAD_EASY_HANDLE) Signed-off-by: Eric Wong Signed-off-by: Junio C Hamano

http: consolidate #ifdefs for curl_multi_remove_handle

2016-09-13T20:34:03Z

I find #ifdefs makes code difficult-to-follow. An early version of this patch had error checking for curl_multi_remove_handle calls, but caused some tests (e.g. t5541) to fail under curl 7.26.0 on old Debian wheezy. Signed-off-by: Eric Wong Signed-off-by: Junio C Hamano

http: warn on curl_multi_add_handle failures

2016-09-13T20:34:01Z

This will be useful for tracking down curl usage errors. Signed-off-by: Eric Wong Signed-off-by: Junio C Hamano

remote-curl: handle URLs without protocol

2016-09-08T18:23:43Z

Generally remote-curl would never see a URL that did not have "proto:" at the beginning, as that is what tells git to run the "git-remote-proto" helper (and git-remote-http, etc, are aliases for git-remote-curl). However, the special syntax "proto::something" will run git-remote-proto with only "something" as the URL. So a malformed URL like: http::/example.com/repo.git will feed the URL "/example.com/repo.git" to git-remote-http. The resulting URL has no protocol, but the code added by 372370f (http: use credential API to handle proxy authentication, 2016-01-26) does not handle this case and segfaults. For the purposes of this code, we don't really care what the exact protocol; only whether or not it is https. So let's just assume that a missing protocol is not, and curl will handle the real error (which is that the URL is nonsense). Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'rs/use-strbuf-addstr'

2016-08-08T21:48:41Z

* rs/use-strbuf-addstr: use strbuf_addstr() instead of strbuf_addf() with "%s" use strbuf_addstr() for adding constant strings to a strbuf

use strbuf_addstr() instead of strbuf_addf() with "%s"

2016-08-05T22:09:25Z

Call strbuf_addstr() for adding a simple string to a strbuf instead of using the heavier strbuf_addf(). This is shorter and documents the intent more clearly. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

Merge branch 'ew/http-walker'

2016-08-03T22:10:24Z

Dumb http transport on the client side has been optimized. * ew/http-walker: list: avoid incompatibility with *BSD sys/queue.h http-walker: reduce O(n) ops with doubly-linked list http: avoid disconnecting on 404s for loose objects http-walker: remove unused parameter from fetch_object