Attachment 197274 Details for Bug 231475 – upgrade to 1.8.14

[patch] upgrade to 1.8.14

file_231475.txt (text/plain), 4.69 KB, created by David King on 2018-09-20 12:40:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David King

Created: 2018-09-20 12:40:51 UTC

Size: 4.69 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 480166)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
>
> PORTNAME=	haproxy
>-DISTVERSION=	1.8.13
>+DISTVERSION=	1.8.14
> PORTREVISION=	1
> CATEGORIES=	net www
> MASTER_SITES=	http://www.haproxy.org/download/1.8/src/
>Index: distinfo
>===================================================================
>--- distinfo	(revision 480166)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
> TIMESTAMP = 1532977852
>-SHA256 (haproxy-1.8.13.tar.gz) = 2bf5dafbb5f1530c0e67ab63666565de948591f8e0ee2a1d3c84c45e738220f1
>-SIZE (haproxy-1.8.13.tar.gz) = 2063046
>+SHA256 (haproxy-1.8.14.tar.gz) = b17e402578be85e58af7a3eac99b1f675953bea9f67af2e964cf8bdbd1bd3fdf
>+SIZE (haproxy-1.8.14.tar.gz) = 2070813
>Index: files/patch-fix-outofbounds
>===================================================================
>--- files/patch-fix-outofbounds	(revision 480166)
>+++ files/patch-fix-outofbounds	(nonexistent)
>@@ -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
>-
>
>Property changes on: files/patch-fix-outofbounds
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-include-common-hathreads.h
>===================================================================
>--- files/patch-include-common-hathreads.h	(revision 480166)
>+++ files/patch-include-common-hathreads.h	(working copy)
>@@ -1,11 +1,11 @@
>---- include/common/hathreads.h.orig	2018-02-17 18:17:22.219400000 +0000
>-+++ include/common/hathreads.h	2018-02-17 18:18:44.598422000 +0000
>-@@ -104,7 +104,7 @@ extern THREAD_LOCAL unsigned long tid_bit; /* The bit
>+--- include/common/hathreads.h.orig
>++++ include/common/hathreads.h
>+@@ -161,7 +161,7 @@ static inline unsigned long thread_isolated()
>  /* TODO: thread: For now, we rely on GCC builtins but it could be a good idea to
>   * have a header file regrouping all functions dealing with threads. */
>-
>+
> -#if defined(__GNUC__) && (__GNUC__ < 4 || __GNUC__ == 4 && __GNUC_MINOR__ < 7) && !defined(__clang__)
> +#if (defined(__GNUC__) && (__GNUC__ < 4 || __GNUC__ == 4 && __GNUC_MINOR__ < 7) && !defined(__clang__)) || (defined(__clang__) && defined(__i386__))
>  /* gcc < 4.7 */
>-
>+
>  #define HA_ATOMIC_ADD(val, i)        __sync_add_and_fetch(val, i)

Actions: View | Diff

Attachments on bug 231475: 197229 | 197273 | 197274