?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
send-email: accept absolute path even on Windows
[git/dscho.git] / http.c
blob3e51d6cbe9d94faafa05de1069ca845a25f8dd28
1 #include "http.h"
2 #include "pack.h"
3 #include "sideband.h"
4 #include "run-command.h"
5 #include "url.h"
6 #include "credential.h"
7
8 int active_requests;
9 int http_is_verbose;
10 size_t http_post_buffer = 16 * LARGE_PACKET_MAX;
11
12 #if LIBCURL_VERSION_NUM >= 0x070a06
13 #define LIBCURL_CAN_HANDLE_AUTH_ANY
14 #endif
15
16 static int min_curl_sessions = 1;
17 static int curl_session_count;
18 #ifdef USE_CURL_MULTI
19 static int max_requests = -1;
20 static CURLM *curlm;
21 #endif
22 #ifndef NO_CURL_EASY_DUPHANDLE
23 static CURL *curl_default;
24 #endif
25
26 #define PREV_BUF_SIZE 4096
27 #define RANGE_HEADER_SIZE 30
28
29 char curl_errorstr[CURL_ERROR_SIZE];
30
31 static int curl_ssl_verify = -1;
32 static const char *ssl_cert;
33 #if LIBCURL_VERSION_NUM >= 0x070903
34 static const char *ssl_key;
35 #endif
36 #if LIBCURL_VERSION_NUM >= 0x070908
37 static const char *ssl_capath;
38 #endif
39 static const char *ssl_cainfo;
40 static long curl_low_speed_limit = -1;
41 static long curl_low_speed_time = -1;
42 static int curl_ftp_no_epsv;
43 static const char *curl_http_proxy;
44 static const char *curl_cookie_file;
45 static struct credential cre_url = CREDENTIAL_INIT;
46 static struct credential http_auth = CREDENTIAL_INIT;
47 static struct credential proxy_auth = CREDENTIAL_INIT;
48 static int http_proactive_auth;
49 static const char *user_agent;
50
51 #if LIBCURL_VERSION_NUM >= 0x071700
52 /* Use CURLOPT_KEYPASSWD as is */
53 #elif LIBCURL_VERSION_NUM >= 0x070903
54 #define CURLOPT_KEYPASSWD CURLOPT_SSLKEYPASSWD
55 #else
56 #define CURLOPT_KEYPASSWD CURLOPT_SSLCERTPASSWD
57 #endif
58
59 static struct credential cert_auth = CREDENTIAL_INIT;
60 static int ssl_cert_password_required;
61
62 static struct curl_slist *pragma_header;
63 static struct curl_slist *no_pragma_header;
64
65 static struct active_request_slot *active_queue_head;
66
67 size_t fread_buffer(char *ptr, size_t eltsize, size_t nmemb, void *buffer_)
68 {
69 size_t size = eltsize * nmemb;
70 struct buffer *buffer = buffer_;
71
72 if (size > buffer->buf.len - buffer->posn)
73 size = buffer->buf.len - buffer->posn;
74 memcpy(ptr, buffer->buf.buf + buffer->posn, size);
75 buffer->posn += size;
76
77 return size;
78 }
79
80 #ifndef NO_CURL_IOCTL
81 curlioerr ioctl_buffer(CURL *handle, int cmd, void *clientp)
82 {
83 struct buffer *buffer = clientp;
84
85 switch (cmd) {
86 case CURLIOCMD_NOP:
87 return CURLIOE_OK;
88
89 case CURLIOCMD_RESTARTREAD:
90 buffer->posn = 0;
91 return CURLIOE_OK;
92
93 default:
94 return CURLIOE_UNKNOWNCMD;
95 }
96 }
97 #endif
98
99 size_t fwrite_buffer(char *ptr, size_t eltsize, size_t nmemb, void *buffer_)
100 {
101 size_t size = eltsize * nmemb;
102 struct strbuf *buffer = buffer_;
103
104 strbuf_add(buffer, ptr, size);
105 return size;
106 }
107
108 size_t fwrite_null(char *ptr, size_t eltsize, size_t nmemb, void *strbuf)
109 {
110 return eltsize * nmemb;
111 }
112
113 #ifdef USE_CURL_MULTI
114 static void process_curl_messages(void)
115 {
116 int num_messages;
117 struct active_request_slot *slot;
118 CURLMsg *curl_message = curl_multi_info_read(curlm, &num_messages);
119
120 while (curl_message != NULL) {
121 if (curl_message->msg == CURLMSG_DONE) {
122 int curl_result = curl_message->data.result;
123 slot = active_queue_head;
124 while (slot != NULL &&
125 slot->curl != curl_message->easy_handle)
126 slot = slot->next;
127 if (slot != NULL) {
128 curl_multi_remove_handle(curlm, slot->curl);
129 slot->curl_result = curl_result;
130 finish_active_slot(slot);
131 } else {
132 fprintf(stderr, "Received DONE message for unknown request!\n");
133 }
134 } else {
135 fprintf(stderr, "Unknown CURL message received: %d\n",
136 (int)curl_message->msg);
137 }
138 curl_message = curl_multi_info_read(curlm, &num_messages);
139 }
140 }
141 #endif
142
143 static int http_options(const char *var, const char *value, void *cb)
144 {
145 if (!strcmp("http.sslverify", var)) {
146 curl_ssl_verify = git_config_bool(var, value);
147 return 0;
148 }
149 if (!strcmp("http.sslcert", var))
150 return git_config_string(&ssl_cert, var, value);
151 #if LIBCURL_VERSION_NUM >= 0x070903
152 if (!strcmp("http.sslkey", var))
153 return git_config_string(&ssl_key, var, value);
154 #endif
155 #if LIBCURL_VERSION_NUM >= 0x070908
156 if (!strcmp("http.sslcapath", var))
157 return git_config_string(&ssl_capath, var, value);
158 #endif
159 if (!strcmp("http.sslcainfo", var))
160 return git_config_string(&ssl_cainfo, var, value);
161 if (!strcmp("http.sslcertpasswordprotected", var)) {
162 if (git_config_bool(var, value))
163 ssl_cert_password_required = 1;
164 return 0;
165 }
166 if (!strcmp("http.minsessions", var)) {
167 min_curl_sessions = git_config_int(var, value);
168 #ifndef USE_CURL_MULTI
169 if (min_curl_sessions > 1)
170 min_curl_sessions = 1;
171 #endif
172 return 0;
173 }
174 #ifdef USE_CURL_MULTI
175 if (!strcmp("http.maxrequests", var)) {
176 max_requests = git_config_int(var, value);
177 return 0;
178 }
179 #endif
180 if (!strcmp("http.lowspeedlimit", var)) {
181 curl_low_speed_limit = (long)git_config_int(var, value);
182 return 0;
183 }
184 if (!strcmp("http.lowspeedtime", var)) {
185 curl_low_speed_time = (long)git_config_int(var, value);
186 return 0;
187 }
188
189 if (!strcmp("http.noepsv", var)) {
190 curl_ftp_no_epsv = git_config_bool(var, value);
191 return 0;
192 }
193 if (!strcmp("http.proxy", var))
194 return git_config_string(&curl_http_proxy, var, value);
195
196 if (!strcmp("http.cookiefile", var))
197 return git_config_string(&curl_cookie_file, var, value);
198
199 if (!strcmp("http.postbuffer", var)) {
200 http_post_buffer = git_config_int(var, value);
201 if (http_post_buffer < LARGE_PACKET_MAX)
202 http_post_buffer = LARGE_PACKET_MAX;
203 return 0;
204 }
205
206 if (!strcmp("http.useragent", var))
207 return git_config_string(&user_agent, var, value);
208
209 /* Fall back on the default ones */
210 return git_default_config(var, value, cb);
211 }
212
213 static void init_curl_http_auth(CURL *result)
214 {
215 if (http_auth.username) {
216 struct strbuf up = STRBUF_INIT;
217 credential_fill(&http_auth);
218 strbuf_addf(&up, "%s:%s",
219 http_auth.username, http_auth.password);
220 curl_easy_setopt(result, CURLOPT_USERPWD,
221 strbuf_detach(&up, NULL));
222 }
223 }
224
225 static int has_cert_password(void)
226 {
227 if (ssl_cert == NULL || ssl_cert_password_required != 1)
228 return 0;
229 if (!cert_auth.password) {
230 cert_auth.protocol = xstrdup("cert");
231 cert_auth.path = xstrdup(ssl_cert);
232 credential_fill(&cert_auth);
233 }
234 return 1;
235 }
236
237 static void set_proxy_auth(CURL *result)
238 {
239 if (proxy_auth.username && proxy_auth.password) {
240 #if LIBCURL_VERSION_NUM >= 0x071901
241 curl_easy_setopt(result, CURLOPT_PROXYUSERNAME, proxy_auth.username);
242 curl_easy_setopt(result, CURLOPT_PROXYPASSWORD, proxy_auth.password);
243 #else
244 struct strbuf userpwd = STRBUF_INIT;
245 strbuf_addf(&userpwd, "%s:%s", proxy_auth.username, proxy_auth.password);
246 curl_easy_setopt(result, CURLOPT_PROXYUSERPWD, strbuf_detach(&userpwd, NULL));
247 #endif
248 }
249 }
250
251 static CURL *get_curl_handle(const char *url)
252 {
253 CURL *result = curl_easy_init();
254
255 if (!curl_ssl_verify) {
256 curl_easy_setopt(result, CURLOPT_SSL_VERIFYPEER, 0);
257 curl_easy_setopt(result, CURLOPT_SSL_VERIFYHOST, 0);
258 } else {
259 /* Verify authenticity of the peer's certificate */
260 curl_easy_setopt(result, CURLOPT_SSL_VERIFYPEER, 1);
261 /* The name in the cert must match whom we tried to connect */
262 curl_easy_setopt(result, CURLOPT_SSL_VERIFYHOST, 2);
263 }
264
265 #if LIBCURL_VERSION_NUM >= 0x070907
266 curl_easy_setopt(result, CURLOPT_NETRC, CURL_NETRC_OPTIONAL);
267 #endif
268 #ifdef LIBCURL_CAN_HANDLE_AUTH_ANY
269 curl_easy_setopt(result, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
270 #endif
271
272 if (http_proactive_auth)
273 init_curl_http_auth(result);
274
275 if (ssl_cert != NULL)
276 curl_easy_setopt(result, CURLOPT_SSLCERT, ssl_cert);
277 if (has_cert_password())
278 curl_easy_setopt(result, CURLOPT_KEYPASSWD, cert_auth.password);
279 #if LIBCURL_VERSION_NUM >= 0x070903
280 if (ssl_key != NULL)
281 curl_easy_setopt(result, CURLOPT_SSLKEY, ssl_key);
282 #endif
283 #if LIBCURL_VERSION_NUM >= 0x070908
284 if (ssl_capath != NULL)
285 curl_easy_setopt(result, CURLOPT_CAPATH, ssl_capath);
286 #endif
287 if (ssl_cainfo != NULL)
288 curl_easy_setopt(result, CURLOPT_CAINFO, ssl_cainfo);
289 curl_easy_setopt(result, CURLOPT_FAILONERROR, 1);
290
291 if (curl_low_speed_limit > 0 && curl_low_speed_time > 0) {
292 curl_easy_setopt(result, CURLOPT_LOW_SPEED_LIMIT,
293 curl_low_speed_limit);
294 curl_easy_setopt(result, CURLOPT_LOW_SPEED_TIME,
295 curl_low_speed_time);
296 }
297
298 curl_easy_setopt(result, CURLOPT_FOLLOWLOCATION, 1);
299 #if LIBCURL_VERSION_NUM >= 0x071301
300 curl_easy_setopt(result, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
301 #elif LIBCURL_VERSION_NUM >= 0x071101
302 curl_easy_setopt(result, CURLOPT_POST301, 1);
303 #endif
304
305 if (getenv("GIT_CURL_VERBOSE"))
306 curl_easy_setopt(result, CURLOPT_VERBOSE, 1);
307
308 curl_easy_setopt(result, CURLOPT_USERAGENT,
309 user_agent ? user_agent : GIT_HTTP_USER_AGENT);
310
311 if (curl_ftp_no_epsv)
312 curl_easy_setopt(result, CURLOPT_FTP_USE_EPSV, 0);
313
314 if (!curl_http_proxy) {
315 const char *env_proxy, *no_proxy;
316 char *env_proxy_var;
317 int read_http_proxy;
318 struct strbuf buf = STRBUF_INIT;
319 credential_from_url(&cre_url, url);
320 strbuf_addf(&buf, "%s_proxy", cre_url.protocol);
321 env_proxy_var = strbuf_detach(&buf, NULL);
322 env_proxy = getenv(env_proxy_var);
323 if (env_proxy) {
324 read_http_proxy = 1;
325 no_proxy = getenv("no_proxy");
326 if (!no_proxy)
327 no_proxy = getenv("NO_PROXY");
328 if (no_proxy && (!strcmp("*", no_proxy) || strstr(no_proxy, cre_url.host)))
329 read_http_proxy = 0;
330
331 if (read_http_proxy)
332 curl_http_proxy = xstrdup(env_proxy);
333 }
334 free(env_proxy_var);
335 }
336 if (curl_http_proxy) {
337 struct strbuf proxyhost = STRBUF_INIT;
338
339 if (!proxy_auth.host) /* check to parse only once */
340 credential_from_url(&proxy_auth, curl_http_proxy);
341
342 if (http_proactive_auth && proxy_auth.username && !proxy_auth.password)
343 /* proxy string has username but no password, ask for password */
344 credential_fill(&proxy_auth);
345
346 strbuf_addf(&proxyhost, "%s://%s", proxy_auth.protocol, proxy_auth.host);
347 curl_easy_setopt(result, CURLOPT_PROXY, strbuf_detach(&proxyhost, NULL));
348 curl_easy_setopt(result, CURLOPT_PROXYAUTH, CURLAUTH_ANY);
349 set_proxy_auth(result);
350 }
351
352 return result;
353 }
354
355 static void set_from_env(const char **var, const char *envname)
356 {
357 const char *val = getenv(envname);
358 if (val)
359 *var = val;
360 }
361
362 void http_init(struct remote *remote, const char *url, int proactive_auth)
363 {
364 char *low_speed_limit;
365 char *low_speed_time;
366
367 http_is_verbose = 0;
368
369 git_config(http_options, NULL);
370
371 curl_global_init(CURL_GLOBAL_ALL);
372
373 http_proactive_auth = proactive_auth;
374
375 if (remote && remote->http_proxy)
376 curl_http_proxy = xstrdup(remote->http_proxy);
377
378 pragma_header = curl_slist_append(pragma_header, "Pragma: no-cache");
379 no_pragma_header = curl_slist_append(no_pragma_header, "Pragma:");
380
381 #ifdef USE_CURL_MULTI
382 {
383 char *http_max_requests = getenv("GIT_HTTP_MAX_REQUESTS");
384 if (http_max_requests != NULL)
385 max_requests = atoi(http_max_requests);
386 }
387
388 curlm = curl_multi_init();
389 if (curlm == NULL) {
390 fprintf(stderr, "Error creating curl multi handle.\n");
391 exit(1);
392 }
393 #endif
394
395 if (getenv("GIT_SSL_NO_VERIFY"))
396 curl_ssl_verify = 0;
397
398 set_from_env(&ssl_cert, "GIT_SSL_CERT");
399 #if LIBCURL_VERSION_NUM >= 0x070903
400 set_from_env(&ssl_key, "GIT_SSL_KEY");
401 #endif
402 #if LIBCURL_VERSION_NUM >= 0x070908
403 set_from_env(&ssl_capath, "GIT_SSL_CAPATH");
404 #endif
405 set_from_env(&ssl_cainfo, "GIT_SSL_CAINFO");
406
407 set_from_env(&user_agent, "GIT_HTTP_USER_AGENT");
408
409 low_speed_limit = getenv("GIT_HTTP_LOW_SPEED_LIMIT");
410 if (low_speed_limit != NULL)
411 curl_low_speed_limit = strtol(low_speed_limit, NULL, 10);
412 low_speed_time = getenv("GIT_HTTP_LOW_SPEED_TIME");
413 if (low_speed_time != NULL)
414 curl_low_speed_time = strtol(low_speed_time, NULL, 10);
415
416 if (curl_ssl_verify == -1)
417 curl_ssl_verify = 1;
418
419 curl_session_count = 0;
420 #ifdef USE_CURL_MULTI
421 if (max_requests < 1)
422 max_requests = DEFAULT_MAX_REQUESTS;
423 #endif
424
425 if (getenv("GIT_CURL_FTP_NO_EPSV"))
426 curl_ftp_no_epsv = 1;
427
428 if (url) {
429 credential_from_url(&http_auth, url);
430 if (!ssl_cert_password_required &&
431 getenv("GIT_SSL_CERT_PASSWORD_PROTECTED") &&
432 !prefixcmp(url, "https://"))
433 ssl_cert_password_required = 1;
434 }
435
436 #ifndef NO_CURL_EASY_DUPHANDLE
437 curl_default = get_curl_handle(url);
438 #endif
439 }
440
441 void http_cleanup(void)
442 {
443 struct active_request_slot *slot = active_queue_head;
444
445 while (slot != NULL) {
446 struct active_request_slot *next = slot->next;
447 if (slot->curl != NULL) {
448 #ifdef USE_CURL_MULTI
449 curl_multi_remove_handle(curlm, slot->curl);
450 #endif
451 curl_easy_cleanup(slot->curl);
452 }
453 free(slot);
454 slot = next;
455 }
456 active_queue_head = NULL;
457
458 #ifndef NO_CURL_EASY_DUPHANDLE
459 curl_easy_cleanup(curl_default);
460 #endif
461
462 #ifdef USE_CURL_MULTI
463 curl_multi_cleanup(curlm);
464 #endif
465 curl_global_cleanup();
466
467 curl_slist_free_all(pragma_header);
468 pragma_header = NULL;
469
470 curl_slist_free_all(no_pragma_header);
471 no_pragma_header = NULL;
472
473 if (curl_http_proxy) {
474 free((void *)curl_http_proxy);
475 curl_http_proxy = NULL;
476 }
477
478 if (cert_auth.password != NULL) {
479 memset(cert_auth.password, 0, strlen(cert_auth.password));
480 free(cert_auth.password);
481 cert_auth.password = NULL;
482 }
483 ssl_cert_password_required = 0;
484 }
485
486 struct active_request_slot *get_active_slot(const char *url)
487 {
488 struct active_request_slot *slot = active_queue_head;
489 struct active_request_slot *newslot;
490
491 #ifdef USE_CURL_MULTI
492 int num_transfers;
493
494 /* Wait for a slot to open up if the queue is full */
495 while (active_requests >= max_requests) {
496 curl_multi_perform(curlm, &num_transfers);
497 if (num_transfers < active_requests)
498 process_curl_messages();
499 }
500 #endif
501
502 while (slot != NULL && slot->in_use)
503 slot = slot->next;
504
505 if (slot == NULL) {
506 newslot = xmalloc(sizeof(*newslot));
507 newslot->curl = NULL;
508 newslot->in_use = 0;
509 newslot->next = NULL;
510
511 slot = active_queue_head;
512 if (slot == NULL) {
513 active_queue_head = newslot;
514 } else {
515 while (slot->next != NULL)
516 slot = slot->next;
517 slot->next = newslot;
518 }
519 slot = newslot;
520 }
521
522 if (slot->curl == NULL) {
523 #ifdef NO_CURL_EASY_DUPHANDLE
524 slot->curl = get_curl_handle(url);
525 #else
526 slot->curl = curl_easy_duphandle(curl_default);
527 #endif
528 curl_session_count++;
529 }
530
531 active_requests++;
532 slot->in_use = 1;
533 slot->results = NULL;
534 slot->finished = NULL;
535 slot->callback_data = NULL;
536 slot->callback_func = NULL;
537 curl_easy_setopt(slot->curl, CURLOPT_COOKIEFILE, curl_cookie_file);
538 curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, pragma_header);
539 curl_easy_setopt(slot->curl, CURLOPT_ERRORBUFFER, curl_errorstr);
540 curl_easy_setopt(slot->curl, CURLOPT_CUSTOMREQUEST, NULL);
541 curl_easy_setopt(slot->curl, CURLOPT_READFUNCTION, NULL);
542 curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, NULL);
543 curl_easy_setopt(slot->curl, CURLOPT_POSTFIELDS, NULL);
544 curl_easy_setopt(slot->curl, CURLOPT_UPLOAD, 0);
545 curl_easy_setopt(slot->curl, CURLOPT_HTTPGET, 1);
546
547 return slot;
548 }
549
550 int start_active_slot(struct active_request_slot *slot)
551 {
552 #ifdef USE_CURL_MULTI
553 CURLMcode curlm_result = curl_multi_add_handle(curlm, slot->curl);
554 int num_transfers;
555
556 if (curlm_result != CURLM_OK &&
557 curlm_result != CURLM_CALL_MULTI_PERFORM) {
558 active_requests--;
559 slot->in_use = 0;
560 return 0;
561 }
562
563 /*
564 * We know there must be something to do, since we just added
565 * something.
566 */
567 curl_multi_perform(curlm, &num_transfers);
568 #endif
569 return 1;
570 }
571
572 #ifdef USE_CURL_MULTI
573 struct fill_chain {
574 void *data;
575 int (*fill)(void *);
576 struct fill_chain *next;
577 };
578
579 static struct fill_chain *fill_cfg;
580
581 void add_fill_function(void *data, int (*fill)(void *))
582 {
583 struct fill_chain *new = xmalloc(sizeof(*new));
584 struct fill_chain **linkp = &fill_cfg;
585 new->data = data;
586 new->fill = fill;
587 new->next = NULL;
588 while (*linkp)
589 linkp = &(*linkp)->next;
590 *linkp = new;
591 }
592
593 void fill_active_slots(void)
594 {
595 struct active_request_slot *slot = active_queue_head;
596
597 while (active_requests < max_requests) {
598 struct fill_chain *fill;
599 for (fill = fill_cfg; fill; fill = fill->next)
600 if (fill->fill(fill->data))
601 break;
602
603 if (!fill)
604 break;
605 }
606
607 while (slot != NULL) {
608 if (!slot->in_use && slot->curl != NULL
609 && curl_session_count > min_curl_sessions) {
610 curl_easy_cleanup(slot->curl);
611 slot->curl = NULL;
612 curl_session_count--;
613 }
614 slot = slot->next;
615 }
616 }
617
618 void step_active_slots(void)
619 {
620 int num_transfers;
621 CURLMcode curlm_result;
622
623 do {
624 curlm_result = curl_multi_perform(curlm, &num_transfers);
625 } while (curlm_result == CURLM_CALL_MULTI_PERFORM);
626 if (num_transfers < active_requests) {
627 process_curl_messages();
628 fill_active_slots();
629 }
630 }
631 #endif
632
633 void run_active_slot(struct active_request_slot *slot)
634 {
635 #ifdef USE_CURL_MULTI
636 fd_set readfds;
637 fd_set writefds;
638 fd_set excfds;
639 int max_fd;
640 struct timeval select_timeout;
641 int finished = 0;
642
643 slot->finished = &finished;
644 while (!finished) {
645 step_active_slots();
646
647 if (slot->in_use) {
648 #if LIBCURL_VERSION_NUM >= 0x070f04
649 long curl_timeout;
650 curl_multi_timeout(curlm, &curl_timeout);
651 if (curl_timeout == 0) {
652 continue;
653 } else if (curl_timeout == -1) {
654 select_timeout.tv_sec = 0;
655 select_timeout.tv_usec = 50000;
656 } else {
657 select_timeout.tv_sec = curl_timeout / 1000;
658 select_timeout.tv_usec = (curl_timeout % 1000) * 1000;
659 }
660 #else
661 select_timeout.tv_sec = 0;
662 select_timeout.tv_usec = 50000;
663 #endif
664
665 max_fd = -1;
666 FD_ZERO(&readfds);
667 FD_ZERO(&writefds);
668 FD_ZERO(&excfds);
669 curl_multi_fdset(curlm, &readfds, &writefds, &excfds, &max_fd);
670
671 select(max_fd+1, &readfds, &writefds, &excfds, &select_timeout);
672 }
673 }
674 #else
675 while (slot->in_use) {
676 slot->curl_result = curl_easy_perform(slot->curl);
677 finish_active_slot(slot);
678 }
679 #endif
680 }
681
682 static void closedown_active_slot(struct active_request_slot *slot)
683 {
684 active_requests--;
685 slot->in_use = 0;
686 }
687
688 static void release_active_slot(struct active_request_slot *slot)
689 {
690 closedown_active_slot(slot);
691 if (slot->curl && curl_session_count > min_curl_sessions) {
692 #ifdef USE_CURL_MULTI
693 curl_multi_remove_handle(curlm, slot->curl);
694 #endif
695 curl_easy_cleanup(slot->curl);
696 slot->curl = NULL;
697 curl_session_count--;
698 }
699 #ifdef USE_CURL_MULTI
700 fill_active_slots();
701 #endif
702 }
703
704 void finish_active_slot(struct active_request_slot *slot)
705 {
706 closedown_active_slot(slot);
707 curl_easy_getinfo(slot->curl, CURLINFO_HTTP_CODE, &slot->http_code);
708
709 if (slot->finished != NULL)
710 (*slot->finished) = 1;
711
712 /* Store slot results so they can be read after the slot is reused */
713 if (slot->results != NULL) {
714 slot->results->curl_result = slot->curl_result;
715 slot->results->http_code = slot->http_code;
716 }
717
718 /* Run callback if appropriate */
719 if (slot->callback_func != NULL)
720 slot->callback_func(slot->callback_data);
721 }
722
723 void finish_all_active_slots(void)
724 {
725 struct active_request_slot *slot = active_queue_head;
726
727 while (slot != NULL)
728 if (slot->in_use) {
729 run_active_slot(slot);
730 slot = active_queue_head;
731 } else {
732 slot = slot->next;
733 }
734 }
735
736 /* Helpers for modifying and creating URLs */
737 static inline int needs_quote(int ch)
738 {
739 if (((ch >= 'A') && (ch <= 'Z'))
740 || ((ch >= 'a') && (ch <= 'z'))
741 || ((ch >= '0') && (ch <= '9'))
742 || (ch == '/')
743 || (ch == '-')
744 || (ch == '.'))
745 return 0;
746 return 1;
747 }
748
749 static char *quote_ref_url(const char *base, const char *ref)
750 {
751 struct strbuf buf = STRBUF_INIT;
752 const char *cp;
753 int ch;
754
755 end_url_with_slash(&buf, base);
756
757 for (cp = ref; (ch = *cp) != 0; cp++)
758 if (needs_quote(ch))
759 strbuf_addf(&buf, "%%%02x", ch);
760 else
761 strbuf_addch(&buf, *cp);
762
763 return strbuf_detach(&buf, NULL);
764 }
765
766 void append_remote_object_url(struct strbuf *buf, const char *url,
767 const char *hex,
768 int only_two_digit_prefix)
769 {
770 end_url_with_slash(buf, url);
771
772 strbuf_addf(buf, "objects/%.*s/", 2, hex);
773 if (!only_two_digit_prefix)
774 strbuf_addf(buf, "%s", hex+2);
775 }
776
777 char *get_remote_object_url(const char *url, const char *hex,
778 int only_two_digit_prefix)
779 {
780 struct strbuf buf = STRBUF_INIT;
781 append_remote_object_url(&buf, url, hex, only_two_digit_prefix);
782 return strbuf_detach(&buf, NULL);
783 }
784
785 /* http_request() targets */
786 #define HTTP_REQUEST_STRBUF 0
787 #define HTTP_REQUEST_FILE 1
788
789 static int http_request(const char *url, void *result, int target, int options)
790 {
791 struct active_request_slot *slot;
792 struct slot_results results;
793 struct curl_slist *headers = NULL;
794 struct strbuf buf = STRBUF_INIT;
795 int ret;
796
797 slot = get_active_slot(url);
798 slot->results = &results;
799 curl_easy_setopt(slot->curl, CURLOPT_HTTPGET, 1);
800
801 if (result == NULL) {
802 curl_easy_setopt(slot->curl, CURLOPT_NOBODY, 1);
803 } else {
804 curl_easy_setopt(slot->curl, CURLOPT_NOBODY, 0);
805 curl_easy_setopt(slot->curl, CURLOPT_FILE, result);
806
807 if (target == HTTP_REQUEST_FILE) {
808 long posn = ftell(result);
809 curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION,
810 fwrite);
811 if (posn > 0) {
812 strbuf_addf(&buf, "Range: bytes=%ld-", posn);
813 headers = curl_slist_append(headers, buf.buf);
814 strbuf_reset(&buf);
815 }
816 } else
817 curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION,
818 fwrite_buffer);
819 }
820
821 strbuf_addstr(&buf, "Pragma:");
822 if (options & HTTP_NO_CACHE)
823 strbuf_addstr(&buf, " no-cache");
824
825 headers = curl_slist_append(headers, buf.buf);
826
827 curl_easy_setopt(slot->curl, CURLOPT_URL, url);
828 curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, headers);
829
830 if (start_active_slot(slot)) {
831 run_active_slot(slot);
832 if (results.curl_result == CURLE_OK)
833 ret = HTTP_OK;
834 else if (missing_target(&results))
835 ret = HTTP_MISSING_TARGET;
836 else if (results.http_code == 401) {
837 if (http_auth.username && http_auth.password) {
838 credential_reject(&http_auth);
839 ret = HTTP_NOAUTH;
840 } else {
841 credential_fill(&http_auth);
842 init_curl_http_auth(slot->curl);
843 ret = HTTP_AUTH_RETRY;
844 }
845 } else if (results.http_code == 407) { /* Proxy authentication failure */
846 if (proxy_auth.username && proxy_auth.password) {
847 credential_reject(&proxy_auth);
848 ret = HTTP_NOAUTH;
849 } else {
850 credential_fill(&proxy_auth);
851 set_proxy_auth(slot->curl);
852 ret = HTTP_AUTH_RETRY;
853 }
854 } else {
855 if (!curl_errorstr[0])
856 strlcpy(curl_errorstr,
857 curl_easy_strerror(results.curl_result),
858 sizeof(curl_errorstr));
859 ret = HTTP_ERROR;
860 }
861 } else {
862 error("Unable to start HTTP request for %s", url);
863 ret = HTTP_START_FAILED;
864 }
865
866 curl_slist_free_all(headers);
867 strbuf_release(&buf);
868
869 if (ret == HTTP_OK)
870 credential_approve(&http_auth);
871
872 return ret;
873 }
874
875 static int http_request_reauth(const char *url, void *result, int target,
876 int options)
877 {
878 int ret;
879
880 do {
881 ret = http_request(url, result, target, options);
882 } while (ret == HTTP_AUTH_RETRY);
883
884 return ret;
885 }
886
887 int http_get_strbuf(const char *url, struct strbuf *result, int options)
888 {
889 return http_request_reauth(url, result, HTTP_REQUEST_STRBUF, options);
890 }
891
892 /*
893 * Downloads a URL and stores the result in the given file.
894 *
895 * If a previous interrupted download is detected (i.e. a previous temporary
896 * file is still around) the download is resumed.
897 */
898 static int http_get_file(const char *url, const char *filename, int options)
899 {
900 int ret;
901 struct strbuf tmpfile = STRBUF_INIT;
902 FILE *result;
903
904 strbuf_addf(&tmpfile, "%s.temp", filename);
905 result = fopen(tmpfile.buf, "a");
906 if (! result) {
907 error("Unable to open local file %s", tmpfile.buf);
908 ret = HTTP_ERROR;
909 goto cleanup;
910 }
911
912 ret = http_request_reauth(url, result, HTTP_REQUEST_FILE, options);
913 fclose(result);
914
915 if ((ret == HTTP_OK) && move_temp_to_file(tmpfile.buf, filename))
916 ret = HTTP_ERROR;
917 cleanup:
918 strbuf_release(&tmpfile);
919 return ret;
920 }
921
922 int http_error(const char *url, int ret)
923 {
924 /* http_request has already handled HTTP_START_FAILED. */
925 if (ret != HTTP_START_FAILED)
926 error("%s while accessing %s", curl_errorstr, url);
927
928 return ret;
929 }
930
931 int http_fetch_ref(const char *base, struct ref *ref)
932 {
933 char *url;
934 struct strbuf buffer = STRBUF_INIT;
935 int ret = -1;
936
937 url = quote_ref_url(base, ref->name);
938 if (http_get_strbuf(url, &buffer, HTTP_NO_CACHE) == HTTP_OK) {
939 strbuf_rtrim(&buffer);
940 if (buffer.len == 40)
941 ret = get_sha1_hex(buffer.buf, ref->old_sha1);
942 else if (!prefixcmp(buffer.buf, "ref: ")) {
943 ref->symref = xstrdup(buffer.buf + 5);
944 ret = 0;
945 }
946 }
947
948 strbuf_release(&buffer);
949 free(url);
950 return ret;
951 }
952
953 /* Helpers for fetching packs */
954 static char *fetch_pack_index(unsigned char *sha1, const char *base_url)
955 {
956 char *url, *tmp;
957 struct strbuf buf = STRBUF_INIT;
958
959 if (http_is_verbose)
960 fprintf(stderr, "Getting index for pack %s\n", sha1_to_hex(sha1));
961
962 end_url_with_slash(&buf, base_url);
963 strbuf_addf(&buf, "objects/pack/pack-%s.idx", sha1_to_hex(sha1));
964 url = strbuf_detach(&buf, NULL);
965
966 strbuf_addf(&buf, "%s.temp", sha1_pack_index_name(sha1));
967 tmp = strbuf_detach(&buf, NULL);
968
969 if (http_get_file(url, tmp, 0) != HTTP_OK) {
970 error("Unable to get pack index %s\n", url);
971 free(tmp);
972 tmp = NULL;
973 }
974
975 free(url);
976 return tmp;
977 }
978
979 static int fetch_and_setup_pack_index(struct packed_git **packs_head,
980 unsigned char *sha1, const char *base_url)
981 {
982 struct packed_git *new_pack;
983 char *tmp_idx = NULL;
984 int ret;
985
986 if (has_pack_index(sha1)) {
987 new_pack = parse_pack_index(sha1, NULL);
988 if (!new_pack)
989 return -1; /* parse_pack_index() already issued error message */
990 goto add_pack;
991 }
992
993 tmp_idx = fetch_pack_index(sha1, base_url);
994 if (!tmp_idx)
995 return -1;
996
997 new_pack = parse_pack_index(sha1, tmp_idx);
998 if (!new_pack) {
999 unlink(tmp_idx);
1000 free(tmp_idx);
1001
1002 return -1; /* parse_pack_index() already issued error message */
1003 }
1004
1005 ret = verify_pack_index(new_pack);
1006 if (!ret) {
1007 close_pack_index(new_pack);
1008 ret = move_temp_to_file(tmp_idx, sha1_pack_index_name(sha1));
1009 }
1010 free(tmp_idx);
1011 if (ret)
1012 return -1;
1013
1014 add_pack:
1015 new_pack->next = *packs_head;
1016 *packs_head = new_pack;
1017 return 0;
1018 }
1019
1020 int http_get_info_packs(const char *base_url, struct packed_git **packs_head)
1021 {
1022 int ret = 0, i = 0;
1023 char *url, *data;
1024 struct strbuf buf = STRBUF_INIT;
1025 unsigned char sha1[20];
1026
1027 end_url_with_slash(&buf, base_url);
1028 strbuf_addstr(&buf, "objects/info/packs");
1029 url = strbuf_detach(&buf, NULL);
1030
1031 ret = http_get_strbuf(url, &buf, HTTP_NO_CACHE);
1032 if (ret != HTTP_OK)
1033 goto cleanup;
1034
1035 data = buf.buf;
1036 while (i < buf.len) {
1037 switch (data[i]) {
1038 case 'P':
1039 i++;
1040 if (i + 52 <= buf.len &&
1041 !prefixcmp(data + i, " pack-") &&
1042 !prefixcmp(data + i + 46, ".pack\n")) {
1043 get_sha1_hex(data + i + 6, sha1);
1044 fetch_and_setup_pack_index(packs_head, sha1,
1045 base_url);
1046 i += 51;
1047 break;
1048 }
1049 default:
1050 while (i < buf.len && data[i] != '\n')
1051 i++;
1052 }
1053 i++;
1054 }
1055
1056 cleanup:
1057 free(url);
1058 return ret;
1059 }
1060
1061 void release_http_pack_request(struct http_pack_request *preq)
1062 {
1063 if (preq->packfile != NULL) {
1064 fclose(preq->packfile);
1065 preq->packfile = NULL;
1066 }
1067 if (preq->range_header != NULL) {
1068 curl_slist_free_all(preq->range_header);
1069 preq->range_header = NULL;
1070 }
1071 preq->slot = NULL;
1072 free(preq->url);
1073 }
1074
1075 int finish_http_pack_request(struct http_pack_request *preq)
1076 {
1077 struct packed_git **lst;
1078 struct packed_git *p = preq->target;
1079 char *tmp_idx;
1080 struct child_process ip;
1081 const char *ip_argv[8];
1082
1083 close_pack_index(p);
1084
1085 fclose(preq->packfile);
1086 preq->packfile = NULL;
1087
1088 lst = preq->lst;
1089 while (*lst != p)
1090 lst = &((*lst)->next);
1091 *lst = (*lst)->next;
1092
1093 tmp_idx = xstrdup(preq->tmpfile);
1094 strcpy(tmp_idx + strlen(tmp_idx) - strlen(".pack.temp"),
1095 ".idx.temp");
1096
1097 ip_argv[0] = "index-pack";
1098 ip_argv[1] = "-o";
1099 ip_argv[2] = tmp_idx;
1100 ip_argv[3] = preq->tmpfile;
1101 ip_argv[4] = NULL;
1102
1103 memset(&ip, 0, sizeof(ip));
1104 ip.argv = ip_argv;
1105 ip.git_cmd = 1;
1106 ip.no_stdin = 1;
1107 ip.no_stdout = 1;
1108
1109 if (run_command(&ip)) {
1110 unlink(preq->tmpfile);
1111 unlink(tmp_idx);
1112 free(tmp_idx);
1113 return -1;
1114 }
1115
1116 unlink(sha1_pack_index_name(p->sha1));
1117
1118 if (move_temp_to_file(preq->tmpfile, sha1_pack_name(p->sha1))
1119 || move_temp_to_file(tmp_idx, sha1_pack_index_name(p->sha1))) {
1120 free(tmp_idx);
1121 return -1;
1122 }
1123
1124 install_packed_git(p);
1125 free(tmp_idx);
1126 return 0;
1127 }
1128
1129 struct http_pack_request *new_http_pack_request(
1130 struct packed_git *target, const char *base_url)
1131 {
1132 long prev_posn = 0;
1133 char range[RANGE_HEADER_SIZE];
1134 struct strbuf buf = STRBUF_INIT;
1135 struct http_pack_request *preq;
1136
1137 preq = xcalloc(1, sizeof(*preq));
1138 preq->target = target;
1139
1140 end_url_with_slash(&buf, base_url);
1141 strbuf_addf(&buf, "objects/pack/pack-%s.pack",
1142 sha1_to_hex(target->sha1));
1143 preq->url = strbuf_detach(&buf, NULL);
1144
1145 snprintf(preq->tmpfile, sizeof(preq->tmpfile), "%s.temp",
1146 sha1_pack_name(target->sha1));
1147 preq->packfile = fopen(preq->tmpfile, "a");
1148 if (!preq->packfile) {
1149 error("Unable to open local file %s for pack",
1150 preq->tmpfile);
1151 goto abort;
1152 }
1153
1154 preq->slot = get_active_slot(preq->url);
1155 curl_easy_setopt(preq->slot->curl, CURLOPT_FILE, preq->packfile);
1156 curl_easy_setopt(preq->slot->curl, CURLOPT_WRITEFUNCTION, fwrite);
1157 curl_easy_setopt(preq->slot->curl, CURLOPT_URL, preq->url);
1158 curl_easy_setopt(preq->slot->curl, CURLOPT_HTTPHEADER,
1159 no_pragma_header);
1160
1161 /*
1162 * If there is data present from a previous transfer attempt,
1163 * resume where it left off
1164 */
1165 prev_posn = ftell(preq->packfile);
1166 if (prev_posn>0) {
1167 if (http_is_verbose)
1168 fprintf(stderr,
1169 "Resuming fetch of pack %s at byte %ld\n",
1170 sha1_to_hex(target->sha1), prev_posn);
1171 sprintf(range, "Range: bytes=%ld-", prev_posn);
1172 preq->range_header = curl_slist_append(NULL, range);
1173 curl_easy_setopt(preq->slot->curl, CURLOPT_HTTPHEADER,
1174 preq->range_header);
1175 }
1176
1177 return preq;
1178
1179 abort:
1180 free(preq->url);
1181 free(preq);
1182 return NULL;
1183 }
1184
1185 /* Helpers for fetching objects (loose) */
1186 static size_t fwrite_sha1_file(char *ptr, size_t eltsize, size_t nmemb,
1187 void *data)
1188 {
1189 unsigned char expn[4096];
1190 size_t size = eltsize * nmemb;
1191 int posn = 0;
1192 struct http_object_request *freq =
1193 (struct http_object_request *)data;
1194 do {
1195 ssize_t retval = xwrite(freq->localfile,
1196 (char *) ptr + posn, size - posn);
1197 if (retval < 0)
1198 return posn;
1199 posn += retval;
1200 } while (posn < size);
1201
1202 freq->stream.avail_in = size;
1203 freq->stream.next_in = (void *)ptr;
1204 do {
1205 freq->stream.next_out = expn;
1206 freq->stream.avail_out = sizeof(expn);
1207 freq->zret = git_inflate(&freq->stream, Z_SYNC_FLUSH);
1208 git_SHA1_Update(&freq->c, expn,
1209 sizeof(expn) - freq->stream.avail_out);
1210 } while (freq->stream.avail_in && freq->zret == Z_OK);
1211 return size;
1212 }
1213
1214 struct http_object_request *new_http_object_request(const char *base_url,
1215 unsigned char *sha1)
1216 {
1217 char *hex = sha1_to_hex(sha1);
1218 char *filename;
1219 char prevfile[PATH_MAX];
1220 int prevlocal;
1221 char prev_buf[PREV_BUF_SIZE];
1222 ssize_t prev_read = 0;
1223 long prev_posn = 0;
1224 char range[RANGE_HEADER_SIZE];
1225 struct curl_slist *range_header = NULL;
1226 struct http_object_request *freq;
1227
1228 freq = xcalloc(1, sizeof(*freq));
1229 hashcpy(freq->sha1, sha1);
1230 freq->localfile = -1;
1231
1232 filename = sha1_file_name(sha1);
1233 snprintf(freq->tmpfile, sizeof(freq->tmpfile),
1234 "%s.temp", filename);
1235
1236 snprintf(prevfile, sizeof(prevfile), "%s.prev", filename);
1237 unlink_or_warn(prevfile);
1238 rename(freq->tmpfile, prevfile);
1239 unlink_or_warn(freq->tmpfile);
1240
1241 if (freq->localfile != -1)
1242 error("fd leakage in start: %d", freq->localfile);
1243 freq->localfile = open(freq->tmpfile,
1244 O_WRONLY | O_CREAT | O_EXCL, 0666);
1245 /*
1246 * This could have failed due to the "lazy directory creation";
1247 * try to mkdir the last path component.
1248 */
1249 if (freq->localfile < 0 && errno == ENOENT) {
1250 char *dir = strrchr(freq->tmpfile, '/');
1251 if (dir) {
1252 *dir = 0;
1253 mkdir(freq->tmpfile, 0777);
1254 *dir = '/';
1255 }
1256 freq->localfile = open(freq->tmpfile,
1257 O_WRONLY | O_CREAT | O_EXCL, 0666);
1258 }
1259
1260 if (freq->localfile < 0) {
1261 error("Couldn't create temporary file %s: %s",
1262 freq->tmpfile, strerror(errno));
1263 goto abort;
1264 }
1265
1266 git_inflate_init(&freq->stream);
1267
1268 git_SHA1_Init(&freq->c);
1269
1270 freq->url = get_remote_object_url(base_url, hex, 0);
1271
1272 /*
1273 * If a previous temp file is present, process what was already
1274 * fetched.
1275 */
1276 prevlocal = open(prevfile, O_RDONLY);
1277 if (prevlocal != -1) {
1278 do {
1279 prev_read = xread(prevlocal, prev_buf, PREV_BUF_SIZE);
1280 if (prev_read>0) {
1281 if (fwrite_sha1_file(prev_buf,
1282 1,
1283 prev_read,
1284 freq) == prev_read) {
1285 prev_posn += prev_read;
1286 } else {
1287 prev_read = -1;
1288 }
1289 }
1290 } while (prev_read > 0);
1291 close(prevlocal);
1292 }
1293 unlink_or_warn(prevfile);
1294
1295 /*
1296 * Reset inflate/SHA1 if there was an error reading the previous temp
1297 * file; also rewind to the beginning of the local file.
1298 */
1299 if (prev_read == -1) {
1300 memset(&freq->stream, 0, sizeof(freq->stream));
1301 git_inflate_init(&freq->stream);
1302 git_SHA1_Init(&freq->c);
1303 if (prev_posn>0) {
1304 prev_posn = 0;
1305 lseek(freq->localfile, 0, SEEK_SET);
1306 if (ftruncate(freq->localfile, 0) < 0) {
1307 error("Couldn't truncate temporary file %s: %s",
1308 freq->tmpfile, strerror(errno));
1309 goto abort;
1310 }
1311 }
1312 }
1313
1314 freq->slot = get_active_slot(freq->url);
1315
1316 curl_easy_setopt(freq->slot->curl, CURLOPT_FILE, freq);
1317 curl_easy_setopt(freq->slot->curl, CURLOPT_WRITEFUNCTION, fwrite_sha1_file);
1318 curl_easy_setopt(freq->slot->curl, CURLOPT_ERRORBUFFER, freq->errorstr);
1319 curl_easy_setopt(freq->slot->curl, CURLOPT_URL, freq->url);
1320 curl_easy_setopt(freq->slot->curl, CURLOPT_HTTPHEADER, no_pragma_header);
1321
1322 /*
1323 * If we have successfully processed data from a previous fetch
1324 * attempt, only fetch the data we don't already have.
1325 */
1326 if (prev_posn>0) {
1327 if (http_is_verbose)
1328 fprintf(stderr,
1329 "Resuming fetch of object %s at byte %ld\n",
1330 hex, prev_posn);
1331 sprintf(range, "Range: bytes=%ld-", prev_posn);
1332 range_header = curl_slist_append(range_header, range);
1333 curl_easy_setopt(freq->slot->curl,
1334 CURLOPT_HTTPHEADER, range_header);
1335 }
1336
1337 return freq;
1338
1339 abort:
1340 free(freq->url);
1341 free(freq);
1342 return NULL;
1343 }
1344
1345 void process_http_object_request(struct http_object_request *freq)
1346 {
1347 if (freq->slot == NULL)
1348 return;
1349 freq->curl_result = freq->slot->curl_result;
1350 freq->http_code = freq->slot->http_code;
1351 freq->slot = NULL;
1352 }
1353
1354 int finish_http_object_request(struct http_object_request *freq)
1355 {
1356 struct stat st;
1357
1358 close(freq->localfile);
1359 freq->localfile = -1;
1360
1361 process_http_object_request(freq);
1362
1363 if (freq->http_code == 416) {
1364 warning("requested range invalid; we may already have all the data.");
1365 } else if (freq->curl_result != CURLE_OK) {
1366 if (stat(freq->tmpfile, &st) == 0)
1367 if (st.st_size == 0)
1368 unlink_or_warn(freq->tmpfile);
1369 return -1;
1370 }
1371
1372 git_inflate_end(&freq->stream);
1373 git_SHA1_Final(freq->real_sha1, &freq->c);
1374 if (freq->zret != Z_STREAM_END) {
1375 unlink_or_warn(freq->tmpfile);
1376 return -1;
1377 }
1378 if (hashcmp(freq->sha1, freq->real_sha1)) {
1379 unlink_or_warn(freq->tmpfile);
1380 return -1;
1381 }
1382 freq->rename =
1383 move_temp_to_file(freq->tmpfile, sha1_file_name(freq->sha1));
1384
1385 return freq->rename;
1386 }
1387
1388 void abort_http_object_request(struct http_object_request *freq)
1389 {
1390 unlink_or_warn(freq->tmpfile);
1391
1392 release_http_object_request(freq);
1393 }
1394
1395 void release_http_object_request(struct http_object_request *freq)
1396 {
1397 if (freq->localfile != -1) {
1398 close(freq->localfile);
1399 freq->localfile = -1;
1400 }
1401 if (freq->url != NULL) {
1402 free(freq->url);
1403 freq->url = NULL;
1404 }
1405 if (freq->slot != NULL) {
1406 freq->slot->callback_func = NULL;
1407 freq->slot->callback_data = NULL;
1408 release_active_slot(freq->slot);
1409 freq->slot = NULL;
1410 }
1411 }
Dscho's miscellaneous git branches