delta/git.git/http.c, branch ms/commit-cc-option-helpstring

Merge branch 'maint'

2009-09-14T21:48:27+00:00

* maint:
  http.c: avoid freeing an uninitialized pointer

http.c: avoid freeing an uninitialized pointer

2009-09-14T21:48:15+00:00

An earlier 59b8d38 (http.c: remove verification of remote packs) left
the variable "url" uninitialized; "goto cleanup" codepath can free it
which is not very nice.

Signed-off-by: Junio C Hamano

Merge branch 'maint'

2009-09-13T08:30:53+00:00

* maint:
  GIT 1.6.4.3
  svn: properly escape arguments for authors-prog
  http.c: remove verification of remote packs
  grep: accept relative paths outside current working directory
  grep: fix exit status if external_grep() punts

Conflicts:
	GIT-VERSION-GEN
	RelNotes

http.c: remove verification of remote packs

2009-09-11T08:45:36+00:00

Make http.c::fetch_pack_index() no longer check for the remote pack
with a HEAD request before fetching the corresponding pack index file.

Not only does sending a HEAD request before we do a GET incur a
performance penalty, it does not offer any significant error-
prevention advantages (pack fetching in the *_http_pack_request()
methods is capable of handling any errors on its own).

This addresses an issue raised elsewhere:

  http://code.google.com/p/msysgit/issues/detail?id=323
  http://support.github.com/discussions/repos/957-cant-clone-over-http-or-git

Signed-off-by: Tay Ray Chuan 
Signed-off-by: Junio C Hamano

Merge branch 'maint'

2009-08-29T02:37:57+00:00

* maint:
  http.c: set slot callback members to NULL when releasing object

Merge branch 'rc/maint-http-fix' into maint

2009-08-29T02:34:16+00:00

* rc/maint-http-fix:
  http.c: don't assume that urls don't end with slash

http.c: set slot callback members to NULL when releasing object

2009-08-29T02:24:43+00:00

Set the members callback_func and callback_data of freq->slot to NULL
when releasing a http_object_request. release_active_slot() is also
invoked on the slot to remove the curl handle associated with the slot
from the multi stack (CURLM *curlm in http.c).

These prevent the callback function and data from being used in http
methods (like http.c::finish_active_slot()) after a
http_object_request has been free'd.

Noticed by Ali Polatel, who later tested this patch to verify that it
fixes the problem he saw; Dscho helped to identify the problem spot.

Signed-off-by: Tay Ray Chuan 
Signed-off-by: Junio C Hamano

Merge branch 'rc/maint-http-fix'

2009-08-19T06:33:16+00:00

* rc/maint-http-fix:
  http.c: don't assume that urls don't end with slash

http.c: don't assume that urls don't end with slash

2009-08-18T20:59:44+00:00

Make append_remote_object_url() (and by implication,
get_remote_object_url) use end_url_with_slash() to ensure that the url
ends with a slash.

Previously, they assumed that the url did not end with a slash and
as a result appended a slash, sometimes errorneously.

This fixes an issue introduced in 5424bc5 ("http*: add helper methods
for fetching objects (loose)"), where the append_remote_object_url()
implementation in http-push.c, which assumed that urls end with a
slash, was replaced by another one in http.c, which assumed urls did
not end with a slash.

The above issue was raised by Thomas Schlichter:

  http://marc.info/?l=git&m=125043105231327

Signed-off-by: Tay Ray Chuan 
Tested-by: Thomas Schlichter 
Signed-off-by: Junio C Hamano

Check return value of ftruncate call in http.c

2009-08-10T20:26:18+00:00

In new_http_object_request(), check ftruncate() call return value and
handle possible errors.

Signed-off-by: Jeff Lasslett 
Signed-off-by: Tay Ray Chuan 
Signed-off-by: Junio C Hamano