mirror of
https://github.com/novatiq/packages.git
synced 2026-07-31 07:43:06 +01:00
haproxy: Update HAProxy to v2.1.2
- Major version jump from v2.0 to v2.1 - Update haproxy download URL and hash - Add new patches (see https://www.haproxy.org/bugs/bugs-2.1.2.html) - Stop building LUA 5.3 in the haproxy build-process and use liblua5.3 as a dependency instead Signed-off-by: Christian Lachner <gladiac@gmail.com>
This commit is contained in:
@@ -0,0 +1,39 @@
|
||||
commit fbe15b7184da09c0d71051bf3978540f63aba5cc
|
||||
Author: Olivier Houchard <cognet@ci0.org>
|
||||
Date: Sun Jan 5 16:45:14 2020 +0100
|
||||
|
||||
MINOR: ssl: Remove unused variable "need_out".
|
||||
|
||||
The "need_out" variable was used to let the ssl code know we're done
|
||||
reading early data, and we should start the handshake.
|
||||
Now that the handshake function is responsible for taking care of reading
|
||||
early data, all that logic has been removed from ssl_sock_to_buf(), but
|
||||
need_out was forgotten, and left. Remove it know.
|
||||
This patch was submitted by William Dauchy <w.dauchy@criteo.com>, and should
|
||||
fix github issue #434.
|
||||
This should be backported to 2.0 and 2.1.
|
||||
|
||||
(cherry picked from commit 7f4f7f140f6b03b61d1b38260962db235c42c121)
|
||||
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
|
||||
|
||||
diff --git a/src/ssl_sock.c b/src/ssl_sock.c
|
||||
index 7c62299a0..1fac2d905 100644
|
||||
--- a/src/ssl_sock.c
|
||||
+++ b/src/ssl_sock.c
|
||||
@@ -6385,7 +6385,6 @@ static size_t ssl_sock_to_buf(struct connection *conn, void *xprt_ctx, struct bu
|
||||
* EINTR too.
|
||||
*/
|
||||
while (count > 0) {
|
||||
- int need_out = 0;
|
||||
|
||||
try = b_contig_space(buf);
|
||||
if (!try)
|
||||
@@ -6443,8 +6442,6 @@ static size_t ssl_sock_to_buf(struct connection *conn, void *xprt_ctx, struct bu
|
||||
/* otherwise it's a real error */
|
||||
goto out_error;
|
||||
}
|
||||
- if (need_out)
|
||||
- break;
|
||||
}
|
||||
leave:
|
||||
return done;
|
||||
Reference in New Issue
Block a user