bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package: haproxy

Browse Source 
- refresh patches



git-svn-id: svn://svn.openwrt.org/openwrt/packages@35092 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
heil 2013-01-10 23:49:52 +00:00
parent 240ad98e89
commit 76932a1f75
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/haproxy/Makefile
View File

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=haproxy PKG_NAME:=haproxy
PKG_VERSION:=1.4.22 PKG_VERSION:=1.4.22
PKG_RELEASE:=23 PKG_RELEASE:=24
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://haproxy.1wt.eu/download/1.4/src PKG_SOURCE_URL:=http://haproxy.1wt.eu/download/1.4/src

17
net/haproxy/patches/0023-BUG-MINOR-http-don-t-process-abortonclose-when-1.4.22.diff
View File

@ -12,15 +12,11 @@ write before aborting.
This fix should be backported to 1.4 too. This fix should be backported to 1.4 too.
(cherry picked from commit a7a7ebc38280d7a04192bf95e6852222f4bd8140) (cherry picked from commit a7a7ebc38280d7a04192bf95e6852222f4bd8140)
--- Index: haproxy-1.4.22/src/session.c
src/session.c | 3 ++- ===================================================================
1 files changed, 2 insertions(+), 1 deletions(-) --- haproxy-1.4.22.orig/src/session.c
+++ haproxy-1.4.22/src/session.c
diff --git a/src/session.c b/src/session.c @@ -203,7 +203,8 @@ int sess_update_st_con_tcp(struct sessio
index 239d4f5..6211a45 100644
--- a/src/session.c
+++ b/src/session.c
@@ -203,7 +203,8 @@ int sess_update_st_con_tcp(struct session *s, struct stream_interface *si)
} }
/* OK, maybe we want to abort */ /* OK, maybe we want to abort */
@ -30,6 +26,3 @@ index 239d4f5..6211a45 100644
((req->flags & BF_SHUTW_NOW) && /* FIXME: this should not prevent a connection from establishing */ ((req->flags & BF_SHUTW_NOW) && /* FIXME: this should not prevent a connection from establishing */
(((req->flags & (BF_OUT_EMPTY|BF_WRITE_ACTIVITY)) == BF_OUT_EMPTY) || (((req->flags & (BF_OUT_EMPTY|BF_WRITE_ACTIVITY)) == BF_OUT_EMPTY) ||
s->be->options & PR_O_ABRT_CLOSE)))) { s->be->options & PR_O_ABRT_CLOSE)))) {
--
1.7.1