From owner-svn-src-stable@FreeBSD.ORG  Tue Dec  1 23:24:42 2009
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BE268106566C;
	Tue,  1 Dec 2009 23:24:42 +0000 (UTC)
	(envelope-from fabient@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id ACF438FC22;
	Tue,  1 Dec 2009 23:24:42 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nB1NOgFC080032;
	Tue, 1 Dec 2009 23:24:42 GMT (envelope-from fabient@svn.freebsd.org)
Received: (from fabient@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nB1NOgTw080030;
	Tue, 1 Dec 2009 23:24:42 GMT (envelope-from fabient@svn.freebsd.org)
Message-Id: <200912012324.nB1NOgTw080030@svn.freebsd.org>
From: Fabien Thomas <fabient@FreeBSD.org>
Date: Tue, 1 Dec 2009 23:24:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r200013 - stable/7/lib/libfetch
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 01 Dec 2009 23:24:42 -0000

Author: fabient
Date: Tue Dec  1 23:24:42 2009
New Revision: 200013
URL: http://svn.freebsd.org/changeset/base/200013

Log:
  MFC 198339:
  Fix the NO_PROXY handling.
  
  PR: 139751

Modified:
  stable/7/lib/libfetch/common.c
Directory Properties:
  stable/7/lib/libfetch/   (props changed)

Modified: stable/7/lib/libfetch/common.c
==============================================================================
--- stable/7/lib/libfetch/common.c	Tue Dec  1 23:23:52 2009	(r200012)
+++ stable/7/lib/libfetch/common.c	Tue Dec  1 23:24:42 2009	(r200013)
@@ -772,7 +772,7 @@ fetch_no_proxy_match(const char *host)
 				break;
 
 		d_len = q - p;
-		if (d_len > 0 && h_len > d_len &&
+		if (d_len > 0 && h_len >= d_len &&
 		    strncasecmp(host + h_len - d_len,
 			p, d_len) == 0) {
 			/* domain name matches */