diff options
| author | demon <demon@FreeBSD.org> | 2013-10-25 18:04:26 +0000 |
|---|---|---|
| committer | demon <demon@FreeBSD.org> | 2013-10-25 18:04:26 +0000 |
| commit | 798fdbbe7df447c22aaf8d570a7dd4bc03b4f148 (patch) | |
| tree | d4df834df32172d3d16878e1623b5b063943aa64 /net/haproxy | |
| parent | 877e2ee040f5211f60d49e56e8a34fdc73a11fbe (diff) | |
| download | FreeBSD-ports-798fdbbe7df447c22aaf8d570a7dd4bc03b4f148.zip FreeBSD-ports-798fdbbe7df447c22aaf8d570a7dd4bc03b4f148.tar.gz | |
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@ultra-secure.de>
Obtained from: project git repository
Diffstat (limited to 'net/haproxy')
| -rw-r--r-- | net/haproxy/Makefile | 1 | ||||
| -rw-r--r-- | net/haproxy/files/patch-src-session.c | 15 |
2 files changed, 16 insertions, 0 deletions
diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile index 506b222..e90fb62 100644 --- a/net/haproxy/Makefile +++ b/net/haproxy/Makefile @@ -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/ diff --git a/net/haproxy/files/patch-src-session.c b/net/haproxy/files/patch-src-session.c new file mode 100644 index 0000000..051dfcd --- /dev/null +++ b/net/haproxy/files/patch-src-session.c @@ -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, |
