From owner-FreeBSD-users-jp@jp.FreeBSD.org Mon Apr 16 16:34:14 2012
Received: (from daemon@localhost)
	by castle.jp.FreeBSD.org (8.11.6p2+3.4W/8.11.3) id q3G7YEt67142;
	Mon, 16 Apr 2012 16:34:14 +0900 (JST)
	(envelope-from owner-FreeBSD-users-jp@jp.FreeBSD.org)
Received: from mail-pb0-f42.google.com (mail-pb0-f42.google.com [209.85.160.42])
	by castle.jp.FreeBSD.org (8.11.6p2+3.4W/8.11.3) with ESMTP/inet id q3G7YDO67137
	for <FreeBSD-users-jp@jp.freebsd.org>; Mon, 16 Apr 2012 16:34:13 +0900 (JST)
	(envelope-from naito.yuichiro@gmail.com)
Received: by pbcun1 with SMTP id un1so10991246pbc.1
        for <FreeBSD-users-jp@jp.freebsd.org>; Mon, 16 Apr 2012 00:34:06 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20120113;
        h=from:content-type:subject:date:message-id:to:mime-version:x-mailer;
        bh=LPCUTZMv42e0OMonVY6r3utTlSrKrGt1hhc0MfCrYOo=;
        b=r/dcQAcNjoVyFhJWOaIbFbhKgNdufnpbG83jqziTbK6ma5avUia5EBxDEL36x/i0ss
         fxhAbSQ0GBZaFyLqPqG/lIAEvborEq1P3qmfAmrlYVPiNiUUFQ4rO+XYfbf1dEaOGmXX
         2xIF5YLWXXTACIAIfb9UXr2w4UCVD64iJYmAEqCbOEgbOxqaDsrlLLVYxqnb9x7dTQNl
         UuD9ICsAn7HtTBqmt21R5cH6ppJyhZyVcZUq7us4Vvar34fZ/MJ+R5vKmZy2mmAVFgYs
         Kq+872TvPjptMKBkzhNTcunLFjJDAYwNuIu1MwuLtQbQULk8CBQhJqASiHDM0qN6qMNP
         Z8qw==
Received: by 10.68.211.36 with SMTP id mz4mr26304991pbc.150.1334561646841;
        Mon, 16 Apr 2012 00:34:06 -0700 (PDT)
Received: from dhcp-200-240.soum.co.jp (gate2.soum.co.jp. [202.221.181.100])
        by mx.google.com with ESMTPS id f7sm16968086pbr.3.2012.04.16.00.34.05
        (version=TLSv1/SSLv3 cipher=OTHER);
        Mon, 16 Apr 2012 00:34:05 -0700 (PDT)
From: =?iso-2022-jp?B?GyRCRmJGIxsoQiAbJEJNNDBsTzobKEI=?= <naito.yuichiro@gmail.com>
Content-Type: multipart/mixed; boundary="Apple-Mail=_946104AD-F485-4C69-A0F8-8B6B0DDBD77E"
Message-Id: <2CF3FB52-B70C-40CA-B05E-52EE0186D369@gmail.com>
To: FreeBSD-users-jp@jp.FreeBSD.org
Mime-Version: 1.0 (Apple Message framework v1257)
X-Mailer: Apple Mail (2.1257)
Reply-To: FreeBSD-users-jp@jp.FreeBSD.org
Precedence: list
Date: Mon, 16 Apr 2012 16:34:03 +0900
X-Sequence: FreeBSD-users-jp 93815
Subject: [FreeBSD-users-jp 93815] proxy =?ISO-2022-JP?B?GyRCJHIbKEI=?=
 =?ISO-2022-JP?B?GyRCO0hNUSQ3JD87fiROGyhC?= fetch
 =?ISO-2022-JP?B?GyRCJTMlXiVzJUkkTkYwOm4bKEI=?=
Sender: owner-FreeBSD-users-jp@jp.FreeBSD.org
X-Originator: naito.yuichiro@gmail.com
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+060209


--Apple-Mail=_946104AD-F485-4C69-A0F8-8B6B0DDBD77E
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain;
	charset=iso-2022-jp

=1B$BFbF#$G$9!#=1B(B

FreeBSD 9.0-R=1B$B$N4D6-$G=1B(Bproxy=1B$B$r;HMQ$7$F$$$k>l9g!"=1B(B
=1B$B;~!9=1B(Bfetch(1)=1B$B$,<:GT$9$k$N$GD4$Y$F$$$^$7$?$H$3$m!"=1B(B
=1B$B$I$&$b=1B(Bhttps=1B$B$r;XDj$7$F$$$k;~$K<:GT$9$k$3$H$,J,$+$j$^$7$?!#=1B=
(B

=
=1B$B:G6a!"=1B(Bports=1B$B$N%"%C%W%G!<%H$G2<5-=1B(BURL=1B$B$r<hF@$7$h$&$H$=
7$F$$$?$H$3$m$G=1B(B
fetch=1B$B%3%^%s%I$,%(%i!<$K$J$C$F$$$^$7$?!#=1B(B

fetch =
https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_13_4_R=
TM/src/nss-3.13.4.tar.gz

=
=1B$B$h$/$h$/8+$F$_$k$H!"$I$&$b=1B(Bhttps=1B$B$N>l9g$O=1B(Bproxy=1B$B$r;HM=
Q$;$:$K=1B(B
=1B$BD>@\=1B(B ftp.mozilla.org =1B$B$K@\B3$7$h$&$H$7$F$$$k$h$&$G$9!#=1B(B

=
=1B$B%=3D!<%9>e!"3N$+$K=1B(Bsrc/lib/libfetch/http.c=1B$B$N=1B(Bhttp_connec=
t()=1B$B4X?tFb$G=1B(B
=
https=1B$B$N>l9g$O=1B(Bproxy=1B$B$r;HMQ$;$:$KD>@\@\B3$7$K9T$/%3!<%I$K$J$C$=
F$$$^$7$?!#=1B(B

=
=1B$B$H$j$"$($:!"<j85$N4D6-$G$O=1B(Bproxy=1B$B$r;HMQ$7$F$/$l$J$$$H:$$j$^$9=
$N$G!"=1B(B
=1B$B$A$g$C$H=3D$@5$7$F$_$^$7$?!#=1B(B

=1B$BE:IU$N=1B(Bpatch=1B$B$r=1B(B src/lib/libfetch =
=1B$B$N2<$GEv$F$k$H!"=1B(B
https=1B$B$N>l9g$G$b=1B(B proxy =
=1B$B7PM3$G@\B3$7$F$/$l$k$h$&$K$J$j$^$9!#=1B(B

=1B$B$?$@$7!"=1B(BAuthorization=1B$B%X%C%@$KBP1~$7$F$$$^$;$s$?$a!"=1B(B
=1B$BG'>Z$NI,MW$J=1B(Bproxy=1B$B%5!<%P$OMxMQ$G$-$^$;$s!#=1B(B

=1B$B$J$*!"$h$/$h$/%=3D!<%9$r8+$F$_$k$H!"=1B(B
=
Authorization=1B$B%X%C%@$r=1B(BProxy=1B$B$,JV$7$F$-$?>l9g$K$O=1B(BTCP=1B$B=
%3%M%/%7%g%s$r@ZCG$7$F$$$k$h$&$K=1B(B
=
=1B$B;W$$$^$9$?$a!"=1B(B9.0R=1B$B$N<BAu$G$O4D6-JQ?t=1B(BHTTP_PROXY_AUTH=1B=
$B$,8z$+$J$$$h$&$K;W$$$^$9!#=1B(B

=
=1B$B;DG0$J$,$i;d$N<j85$K$OG'>Z$NI,MW$J=1B(BProxy=1B$B%5!<%P$,$"$j$^$;$s$?=
$a!"=1B(B
=1B$B3NG'$,$G$-$^$;$s!#=1B(B

=1B$B$3$NOCBj$,4{$K=3DP$F$$$k$N$+!"=1B(B
Google=1B$B$GC5$7$?8B$j$G$O8+$D$+$i$J$+$C$?$N$G$9$,!"=1B(B
=1B$BIT40A4$J%Q%C%A$G$b=1B(Bsend-pr=1B$B$7$FNI$$$b$N$J$N$G$7$g$&$+!)=1B(B

--=20
=1B$BFbF#=1B(B =1B$BM40lO:=1B(B
naito.yuichiro@gmail.com



--Apple-Mail=_946104AD-F485-4C69-A0F8-8B6B0DDBD77E
Content-Disposition: attachment;
	filename=libfetch.diff
Content-Type: application/octet-stream;
	x-unix-mode=0644;
	name="libfetch.diff"
Content-Transfer-Encoding: 7bit

Index: http.c
===================================================================
--- http.c	(revision 233503)
+++ http.c	(working copy)
@@ -1356,6 +1356,7 @@
 http_connect(struct url *URL, struct url *purl, const char *flags)
 {
 	conn_t *conn;
+	struct url *connect_url;
 	int verbose;
 	int af, val;
 
@@ -1373,25 +1374,40 @@
 		af = AF_INET6;
 #endif
 
-	if (purl && strcasecmp(URL->scheme, SCHEME_HTTPS) != 0) {
-		URL = purl;
-	} else if (strcasecmp(URL->scheme, SCHEME_FTP) == 0) {
+	if (strcasecmp(URL->scheme, SCHEME_FTP) == 0) {
 		/* can't talk http to an ftp server */
 		/* XXX should set an error code */
 		return (NULL);
 	}
+	if (purl)
+		connect_url = purl;
+	else
+		connect_url = URL;
 
-	if ((conn = fetch_connect(URL->host, URL->port, af, verbose)) == NULL)
+	if ((conn = fetch_connect(connect_url->host,
+				  connect_url->port, af, verbose)) == NULL) {
 		/* fetch_connect() has already set an error code */
 		return (NULL);
-	if (strcasecmp(URL->scheme, SCHEME_HTTPS) == 0 &&
-	    fetch_ssl(conn, verbose) == -1) {
-		fetch_close(conn);
-		/* grrr */
-		errno = EAUTH;
-		fetch_syserr();
-		return (NULL);
 	}
+	if (strcasecmp(URL->scheme, SCHEME_HTTPS) == 0) {
+		if (purl) {
+			http_cmd(conn, "CONNECT %s:%d HTTP/1.1",
+				 URL->host, URL->port);
+			http_cmd(conn, "");
+			if (http_get_reply(conn) != HTTP_OK) {
+				fetch_close(conn);
+				return (NULL);
+			}
+			http_get_reply(conn);
+		}
+		if (fetch_ssl(conn, verbose) == -1) {
+			fetch_close(conn);
+			/* grrr */
+			errno = EAUTH;
+			fetch_syserr();
+			return (NULL);
+		}
+	}
 
 	val = 1;
 	setsockopt(conn->sd, IPPROTO_TCP, TCP_NOPUSH, &val, sizeof(val));

--Apple-Mail=_946104AD-F485-4C69-A0F8-8B6B0DDBD77E--
