svn commit: r331619 - in head/net/haproxy: . files

[Dmitry Sivachenko]

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 <rainer at ultra-secure.de>
  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,