git/http.c, branch v1.6.3

Allow curl to rewind the read buffers

2009-04-02T20:04:07Z

When using multi-pass authentication methods, the curl library may need to rewind the read buffers (depending on how much already has been fed to the server) used for providing data to HTTP PUT, POST or PROPFIND, and in order to allow the library to do so, we need to tell it how by providing either an ioctl callback or a seek callback. This patch adds an ioctl callback, which should be usable on older curl versions (since 7.12.3) than the seek callback (introduced in curl 7.18.0). Some HTTP servers (such as Apache) give an 401 error reply immediately after receiving the headers (so no data has been read from the read buffers, and thus no rewinding is needed), but other servers (such as Lighttpd) only replies after the whole request has been sent and all data has been read from the read buffers, making rewinding necessary. Signed-off-by: Martin Storsjo Signed-off-by: Junio C Hamano

http.c: CURLOPT_NETRC_OPTIONAL is not available in ancient versions of cURL

2009-03-13T05:42:19Z

Besides, we have already called easy_setopt with the option before coming to this function if it was available, so there is no need to repeat it here. Signed-off-by: Junio C Hamano

http authentication via prompts

2009-03-11T05:35:31Z

Curl is designed not to ask for password when only username is given in the URL, but has a way for application to feed a (username, password) pair to it. With this patch, you do not have to keep your password in plaintext in your $HOME/.netrc file when talking with a password protected URL with http://@/path/to/repository.git/ syntax. The code handles only the http-walker side, not the push side. At least, not yet. But interested parties can add support for it. Signed-off-by: Junio C Hamano

http_init(): Fix config file parsing

2009-03-11T05:31:29Z

We honor the command line options, environment variables, variables in repository configuration file, variables in user's global configuration file, variables in the system configuration file, and then finally use built-in default. To implement this semantics, the code should: - start from built-in default values; - call git_config() with the configuration parser callback, which implements "later definition overrides earlier ones" logic (git_config() reads the system's, user's and then repository's configuration file in this order); - override the result from the above with environment variables if set; - override the result from the above with command line options. The initialization code http_init() for http transfer got this wrong, and implemented a "first one wins, ignoring the later ones" in http_options(), to compensate this mistake, read environment variables before calling git_config(). This is all wrong. As a second class citizen, the http codepath hasn't been audited as closely as other parts of the system, but we should try to bring sanity to it, before inviting contributors to improve on it. Signed-off-by: Junio C Hamano

http.c: style cleanups

2009-03-10T01:47:29Z

Signed-off-by: Junio C Hamano

http.c: use strbuf API in quote_ref_url

2009-03-08T04:52:25Z

In addition, ''quote_ref_url'' inserts a slash between the base URL and remote ref path only if needed. Previously, this insertion wasn't contingent on the lack of a separating slash. Signed-off-by: Tay Ray Chuan Acked-by: Johannes Schindelin Signed-off-by: Junio C Hamano

Merge branch 'maint'

2008-12-07T23:13:02Z

* maint: GIT 1.6.0.5 "git diff {3,}": do not reverse order of arguments tag: delete TAG_EDITMSG only on successful tag gitweb: Make project specific override for 'grep' feature work http.c: use 'git_config_string' to get 'curl_http_proxy' fetch-pack: Avoid memcpy() with src==dst

http.c: use 'git_config_string' to get 'curl_http_proxy'

2008-12-07T10:41:55Z

Signed-off-by: Miklos Vajna Signed-off-by: Junio C Hamano

Merge branch 'mh/maint-honor-no-ssl-verify'

2008-09-16T07:46:36Z

* mh/maint-honor-no-ssl-verify: Don't verify host name in SSL certs when GIT_SSL_NO_VERIFY is set

Use xmalloc() and friends to catch allocation failures

2008-09-09T23:28:05Z

Some places use the standard malloc/strdup without checking if the allocation was successful; they should use xmalloc/xstrdup that check the memory allocation result. Signed-off-by: Dotan Barak Signed-off-by: Junio C Hamano