From owner-svn-ports-head@FreeBSD.ORG Fri Oct 25 18:04:27 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 589882A2; Fri, 25 Oct 2013 18:04:27 +0000 (UTC) (envelope-from demon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4623B2762; Fri, 25 Oct 2013 18:04:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9PI4Rc2070305; Fri, 25 Oct 2013 18:04:27 GMT (envelope-from demon@svn.freebsd.org) Received: (from demon@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9PI4QcX070303; Fri, 25 Oct 2013 18:04:26 GMT (envelope-from demon@svn.freebsd.org) Message-Id: <201310251804.r9PI4QcX070303@svn.freebsd.org> From: Dmitry Sivachenko Date: Fri, 25 Oct 2013 18:04:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331619 - in head/net/haproxy: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Oct 2013 18:04:27 -0000 Author: demon Date: Fri Oct 25 18:04:26 2013 New Revision: 331619 URL: http://svnweb.freebsd.org/changeset/ports/331619 Log: Add a patch to fix crash under certain conditions. http://haproxy.1wt.eu/git?p=haproxy-1.4.git;a=commit;h=d362dc75f3dfa7062e5c2cb7822ad12ffb755389 Submitted by: Rainer Duffner Obtained from: project git repository Added: head/net/haproxy/files/patch-src-session.c (contents, props changed) Modified: head/net/haproxy/Makefile Modified: head/net/haproxy/Makefile ============================================================================== --- head/net/haproxy/Makefile Fri Oct 25 17:49:15 2013 (r331618) +++ head/net/haproxy/Makefile Fri Oct 25 18:04:26 2013 (r331619) @@ -3,6 +3,7 @@ PORTNAME= haproxy PORTVERSION= 1.4.24 +PORTREVISION= 1 CATEGORIES= net www MASTER_SITES= http://haproxy.1wt.eu/download/1.4/src/ Added: head/net/haproxy/files/patch-src-session.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/haproxy/files/patch-src-session.c Fri Oct 25 18:04:26 2013 (r331619) @@ -0,0 +1,15 @@ +--- src/session.c.orig 2013-06-17 17:28:14.000000000 +0400 ++++ src/session.c 2013-10-25 22:01:39.000000000 +0400 +@@ -1428,9 +1428,9 @@ + /* Now we can add the server name to a header (if requested) */ + /* check for HTTP mode and proxy server_name_hdr_name != NULL */ + if ((s->flags & SN_BE_ASSIGNED) && +- (s->be->mode == PR_MODE_HTTP) && +- (s->be->server_id_hdr_name != NULL)) { +- ++ (s->be->mode == PR_MODE_HTTP) && ++ (s->be->server_id_hdr_name != NULL) && ++ (s->srv)) { + http_send_name_header(&s->txn, + &s->txn.req, + s->req,