mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'nh/http'

Browse Source 
* nh/http:
  http: prevent segfault during curl handle reuse
  Remove possible segfault in http-fetch.
This commit is contained in:
Junio C Hamano
2006-06-02 10:31:15 -07:00
parent 0825de892f 9094950d73
commit 3126262710
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
http-fetch.c
View File

@ -1269,10 +1269,10 @@ int main(int argc, char **argv)
if (pull(commit_id)) if (pull(commit_id))
rc = 1; rc = 1;
curl_slist_free_all(no_pragma_header);
http_cleanup(); http_cleanup();
curl_slist_free_all(no_pragma_header);
if (corrupt_object_found) { if (corrupt_object_found) {
fprintf(stderr, fprintf(stderr,
"Some loose object were found to be corrupt, but they might be just\n" "Some loose object were found to be corrupt, but they might be just\n"

9
http.c
View File

@ -25,7 +25,6 @@ long curl_low_speed_limit = -1;
long curl_low_speed_time = -1; long curl_low_speed_time = -1;
struct curl_slist *pragma_header; struct curl_slist *pragma_header;
struct curl_slist *no_range_header;
struct active_request_slot *active_queue_head = NULL; struct active_request_slot *active_queue_head = NULL;
@ -208,7 +207,6 @@ void http_init(void)
curl_global_init(CURL_GLOBAL_ALL); curl_global_init(CURL_GLOBAL_ALL);
pragma_header = curl_slist_append(pragma_header, "Pragma: no-cache"); pragma_header = curl_slist_append(pragma_header, "Pragma: no-cache");
no_range_header = curl_slist_append(no_range_header, "Range:");
#ifdef USE_CURL_MULTI #ifdef USE_CURL_MULTI
{ {
@ -344,9 +342,14 @@ struct active_request_slot *get_active_slot(void)
slot->finished = NULL; slot->finished = NULL;
slot->callback_data = NULL; slot->callback_data = NULL;
slot->callback_func = NULL; slot->callback_func = NULL;
curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, NULL);
curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, pragma_header); curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, pragma_header);
curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, no_range_header);
curl_easy_setopt(slot->curl, CURLOPT_ERRORBUFFER, curl_errorstr); curl_easy_setopt(slot->curl, CURLOPT_ERRORBUFFER, curl_errorstr);
curl_easy_setopt(slot->curl, CURLOPT_CUSTOMREQUEST, NULL);
curl_easy_setopt(slot->curl, CURLOPT_READFUNCTION, NULL);
curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, NULL);
curl_easy_setopt(slot->curl, CURLOPT_UPLOAD, 0);
curl_easy_setopt(slot->curl, CURLOPT_HTTPGET, 1);
return slot; return slot;
} }