Deleted Added
full compact
http.c (97868) http.c (97891)
1/*-
2 * Copyright (c) 2000 Dag-Erling Co�dan Sm�rgrav
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 13 unchanged lines hidden (view full) ---

22 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
23 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 */
28
29#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2000 Dag-Erling Co�dan Sm�rgrav
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 13 unchanged lines hidden (view full) ---

22 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
23 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 */
28
29#include <sys/cdefs.h>
30__FBSDID("$FreeBSD: head/lib/libfetch/http.c 97868 2002-06-05 12:46:36Z des $");
30__FBSDID("$FreeBSD: head/lib/libfetch/http.c 97891 2002-06-05 21:35:35Z des $");
31
32/*
33 * The following copyright applies to the base64 code:
34 *
35 *-
36 * Copyright 1997 Massachusetts Institute of Technology
37 *
38 * Permission to use, copy, modify, and distribute this software and

--- 639 unchanged lines hidden (view full) ---

678 }
679
680 if ((conn = _fetch_connect(URL->host, URL->port, af, verbose)) == NULL)
681 /* _fetch_connect() has already set an error code */
682 return (NULL);
683 if (strcasecmp(URL->scheme, SCHEME_HTTPS) == 0 &&
684 _fetch_ssl(conn, verbose) == -1) {
685 _fetch_close(conn);
31
32/*
33 * The following copyright applies to the base64 code:
34 *
35 *-
36 * Copyright 1997 Massachusetts Institute of Technology
37 *
38 * Permission to use, copy, modify, and distribute this software and

--- 639 unchanged lines hidden (view full) ---

678 }
679
680 if ((conn = _fetch_connect(URL->host, URL->port, af, verbose)) == NULL)
681 /* _fetch_connect() has already set an error code */
682 return (NULL);
683 if (strcasecmp(URL->scheme, SCHEME_HTTPS) == 0 &&
684 _fetch_ssl(conn, verbose) == -1) {
685 _fetch_close(conn);
686 /* grrr */
687 errno = EAUTH;
688 _fetch_syserr();
686 return (NULL);
687 }
688 return (conn);
689}
690
691static struct url *
692_http_get_proxy(void)
693{

--- 443 unchanged lines hidden ---
689 return (NULL);
690 }
691 return (conn);
692}
693
694static struct url *
695_http_get_proxy(void)
696{

--- 443 unchanged lines hidden ---