From owner-svn-src-head@FreeBSD.ORG  Sun Jul 21 06:59:57 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 71969723;
 Sun, 21 Jul 2013 06:59:57 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 6567477B;
 Sun, 21 Jul 2013 06:59:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6L6xvaM012362;
 Sun, 21 Jul 2013 06:59:57 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6L6xvHX012361;
 Sun, 21 Jul 2013 06:59:57 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201307210659.r6L6xvHX012361@svn.freebsd.org>
From: Dag-Erling Smørgrav <des@FreeBSD.org>
Date: Sun, 21 Jul 2013 06:59:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r253514 - head/lib/libfetch
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 21 Jul 2013 06:59:57 -0000

Author: des
Date: Sun Jul 21 06:59:56 2013
New Revision: 253514
URL: http://svnweb.freebsd.org/changeset/base/253514

Log:
  Use the correct request syntax for proxied (tunneled) HTTPS requests.
  
  PR:		bin/180666
  MFC after:	3 days

Modified:
  head/lib/libfetch/http.c

Modified: head/lib/libfetch/http.c
==============================================================================
--- head/lib/libfetch/http.c	Sun Jul 21 05:23:34 2013	(r253513)
+++ head/lib/libfetch/http.c	Sun Jul 21 06:59:56 2013	(r253514)
@@ -1581,7 +1581,7 @@ http_request(struct url *URL, const char
 		if (verbose)
 			fetch_info("requesting %s://%s%s",
 			    url->scheme, host, url->doc);
-		if (purl) {
+		if (purl && strcasecmp(URL->scheme, SCHEME_HTTPS) != 0) {
 			http_cmd(conn, "%s %s://%s%s HTTP/1.1",
 			    op, url->scheme, host, url->doc);
 		} else {