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

[packages] haproxy: bump to version 1.4.9 which obsoletes patch

Browse Source 
001-clean..



git-svn-id: svn://svn.openwrt.org/openwrt/packages@23938 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
heil 2010-11-09 11:45:09 +00:00
parent 0ddc0d0cf2
commit 18ec98d374
2 changed files with 3 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/haproxy/Makefile
View File

@ -9,12 +9,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=haproxy PKG_NAME:=haproxy
PKG_VERSION:=1.4.8 PKG_VERSION:=1.4.9
PKG_RELEASE:=4 PKG_RELEASE:=1
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
PKG_MD5SUM:=104f4985b37bd9bac7a33e20fb6aaadf PKG_MD5SUM:=2cbcc95b54c0d803edaa13e7b4aeec25
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

38
net/haproxy/patches/001-clean-listener-ressource-shortage.patch
View File

@ -1,38 +0,0 @@
--- a/src/client.c
+++ b/src/client.c
@@ -1,7 +1,7 @@
/*
* Client-side variables and functions.
*
- * Copyright 2000-2009 Willy Tarreau <w@1wt.eu>
+ * Copyright 2000-2010 Willy Tarreau <w@1wt.eu>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -33,6 +33,7 @@
#include <proto/log.h>
#include <proto/hdr_idx.h>
#include <proto/pattern.h>
+#include <proto/protocols.h>
#include <proto/proto_tcp.h>
#include <proto/proto_http.h>
#include <proto/proxy.h>
@@ -121,7 +122,7 @@ int event_accept(int fd) {
if ((s = pool_alloc2(pool2_session)) == NULL) { /* disable this proxy for a while */
Alert("out of memory in event_accept().\n");
- EV_FD_CLR(fd, DIR_RD);
+ disable_listener(l);
p->state = PR_STIDLE;
goto out_close;
}
@@ -149,7 +150,7 @@ int event_accept(int fd) {
if ((t = task_new()) == NULL) { /* disable this proxy for a while */
Alert("out of memory in event_accept().\n");
- EV_FD_CLR(fd, DIR_RD);
+ disable_listener(l);
p->state = PR_STIDLE;
goto out_free_session;
}