kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to version 1.8.14.

Browse source 
PR:		231475
Submitted by:	David King <king.c.david@googlemail.com>
This commit is contained in:
Dmitry Sivachenko 2018-09-20 12:45:16 +00:00
parent c03ecabe91
commit 12019eaf82
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=480168
3 changed files with 4 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
net/haproxy/Makefile
View file

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= haproxy
DISTVERSION= 1.8.13
PORTREVISION= 1
DISTVERSION= 1.8.14
CATEGORIES= net www
MASTER_SITES= http://www.haproxy.org/download/1.8/src/

6
net/haproxy/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1532977852
SHA256 (haproxy-1.8.13.tar.gz) = 2bf5dafbb5f1530c0e67ab63666565de948591f8e0ee2a1d3c84c45e738220f1
SIZE (haproxy-1.8.13.tar.gz) = 2063046
TIMESTAMP = 1537447373
SHA256 (haproxy-1.8.14.tar.gz) = b17e402578be85e58af7a3eac99b1f675953bea9f67af2e964cf8bdbd1bd3fdf
SIZE (haproxy-1.8.14.tar.gz) = 2070813

60
net/haproxy/files/patch-fix-outofbounds
View file

@ -1,60 +0,0 @@
diff --git a/include/common/hpack-tbl.h b/include/common/hpack-tbl.h
index ffa866b..385f386 100644
--- include/common/hpack-tbl.h
+++ include/common/hpack-tbl.h
@@ -155,7 +155,7 @@ static inline const struct hpack_dte *hpack_get_dte(const struct hpack_dht *dht,
}
/* returns non-zero if <idx> is valid for table <dht> */
-static inline int hpack_valid_idx(const struct hpack_dht *dht, uint16_t idx)
+static inline int hpack_valid_idx(const struct hpack_dht *dht, uint32_t idx)
{
return idx < dht->used + HPACK_SHT_SIZE;
}
@@ -181,7 +181,7 @@ static inline struct ist hpack_get_value(const struct hpack_dht *dht, const stru
}
/* takes an idx, returns the associated name */
-static inline struct ist hpack_idx_to_name(const struct hpack_dht *dht, int idx)
+static inline struct ist hpack_idx_to_name(const struct hpack_dht *dht, uint32_t idx)
{
const struct hpack_dte *dte;
@@ -196,7 +196,7 @@ static inline struct ist hpack_idx_to_name(const struct hpack_dht *dht, int idx)
}
/* takes an idx, returns the associated value */
-static inline struct ist hpack_idx_to_value(const struct hpack_dht *dht, int idx)
+static inline struct ist hpack_idx_to_value(const struct hpack_dht *dht, uint32_t idx)
{
const struct hpack_dte *dte;
diff --git a/src/hpack-dec.c b/src/hpack-dec.c
index dfbcaff..99d40f9 100644
--- src/hpack-dec.c
+++ src/hpack-dec.c
@@ -110,7 +110,7 @@ static inline int hpack_idx_to_phdr(uint32_t idx)
* allocated there. In case of allocation failure, returns a string whose
* pointer is NULL.
*/
-static inline struct ist hpack_alloc_string(struct chunk *store, int idx, struct ist in)
+static inline struct ist hpack_alloc_string(struct chunk *store, uint32_t idx, struct ist in)
{
struct ist out;
diff --git a/src/hpack-tbl.c b/src/hpack-tbl.c
index 9d6b764..e2d4426 100644
--- src/hpack-tbl.c
+++ src/hpack-tbl.c
@@ -113,7 +113,7 @@ static inline unsigned int hpack_dht_get_tail(const struct hpack_dht *dht)
/* dump the whole dynamic header table */
static void hpack_dht_dump(const struct hpack_dht *dht)
{
- int i;
+ unsigned int i;
unsigned int slot;
char name[4096], value[4096];
--
1.7.12.1