Update to 1.4.25.

svn path=/head/; revision=349389

net/haproxy/Makefile

@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	haproxy
-PORTVERSION=	1.4.24
-PORTREVISION=	1
+PORTVERSION=	1.4.25
 CATEGORIES=	net www
 MASTER_SITES=	http://haproxy.1wt.eu/download/1.4/src/
 

net/haproxy/distinfo

@@ -1,2 +1,2 @@
-SHA256 (haproxy-1.4.24.tar.gz) = 680928f4d001be3b59b69d4501f41aeea69e7e56bf183fa032ad6144cf97c7ef
-SIZE (haproxy-1.4.24.tar.gz) = 836768
+SHA256 (haproxy-1.4.25.tar.gz) = 84408ec1e37bf308c6b45ae3c7e66f2a9d2f762cb689ab6d322c67bba691db62
+SIZE (haproxy-1.4.25.tar.gz) = 838775

net/haproxy/files/patch-src-session.c

@@ -1,15 +0,0 @@
---- 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,