Deleted Added
full compact
http.c (143049) http.c (149414)
1/*-
2 * Copyright (c) 2000-2004 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-2004 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 143049 2005-03-02 19:09:28Z kbyanc $");
30__FBSDID("$FreeBSD: head/lib/libfetch/http.c 149414 2005-08-24 12:28:05Z 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

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

719_http_get_proxy(const char *flags)
720{
721 struct url *purl;
722 char *p;
723
724 if (flags != NULL && strchr(flags, 'd') != NULL)
725 return (NULL);
726 if (((p = getenv("HTTP_PROXY")) || (p = getenv("http_proxy"))) &&
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

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

719_http_get_proxy(const char *flags)
720{
721 struct url *purl;
722 char *p;
723
724 if (flags != NULL && strchr(flags, 'd') != NULL)
725 return (NULL);
726 if (((p = getenv("HTTP_PROXY")) || (p = getenv("http_proxy"))) &&
727 (purl = fetchParseURL(p))) {
727 *p && (purl = fetchParseURL(p))) {
728 if (!*purl->scheme)
729 strcpy(purl->scheme, SCHEME_HTTP);
730 if (!purl->port)
731 purl->port = _fetch_default_proxy_port(purl->scheme);
732 if (strcasecmp(purl->scheme, SCHEME_HTTP) == 0)
733 return (purl);
734 fetchFreeURL(purl);
735 }

--- 478 unchanged lines hidden ---
728 if (!*purl->scheme)
729 strcpy(purl->scheme, SCHEME_HTTP);
730 if (!purl->port)
731 purl->port = _fetch_default_proxy_port(purl->scheme);
732 if (strcasecmp(purl->scheme, SCHEME_HTTP) == 0)
733 return (purl);
734 fetchFreeURL(purl);
735 }

--- 478 unchanged lines hidden ---