Attachment #193610 for bug #228424

View | Details | Raw Unified | Return to bug 228424
Collapse All | Expand All

Lines 2-8 Link Here

(-)Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= nuster	4	PORTNAME= nuster
5	PORTVERSION= 1.7.10.1	5	PORTVERSION= 1.8.8.1
6	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
7	CATEGORIES= net www	7	CATEGORIES= net www
8		8

Lines 1-3 Link Here

(-)distinfo (-2 / +2 lines)
1	TIMESTAMP = 1522091814	1	TIMESTAMP = 1522091814
2	SHA256 (jiangwenyuan-nuster-v1.7.10.1_GH0.tar.gz) = 0cf75205ef39db10700abc4307cab5fa410d612c8b096d14adb99cd8775b22d1	2	SHA256 (jiangwenyuan-nuster-v1.8.8.1_GH0.tar.gz) = 984dfcfbc9c6f9c45ce666ccc38a96f5794925862aba83558c3f0945d1a6ebb4
3	SIZE (jiangwenyuan-nuster-v1.7.10.1_GH0.tar.gz) = 1795433	3	SIZE (jiangwenyuan-nuster-v1.8.8.1_GH0.tar.gz) = 2101541

Line 0 Link Here

(-)files/patch-include-common-hathreads.h (+11 lines)
	1	--- include/common/hathreads.h.orig 2018-02-17 18:17:22.219400000 +0000
	2	+++ include/common/hathreads.h 2018-02-17 18:18:44.598422000 +0000
	3	@@ -104,7 +104,7 @@ extern THREAD_LOCAL unsigned long tid_bit; /* The bit
	4	/* TODO: thread: For now, we rely on GCC builtins but it could be a good idea to
	5	* have a header file regrouping all functions dealing with threads. */
	6
	7	-#if defined(__GNUC__) && (__GNUC__ < 4 \|\| __GNUC__ == 4 && __GNUC_MINOR__ < 7) && !defined(__clang__)
	8	+#if (defined(__GNUC__) && (__GNUC__ < 4 \|\| __GNUC__ == 4 && __GNUC_MINOR__ < 7) && !defined(__clang__)) \|\| (defined(__clang__) && defined(__i386__))
	9	/* gcc < 4.7 */
	10
	11	#define HA_ATOMIC_ADD(val, i) __sync_add_and_fetch(val, i)




X-Git-Url: http://git.haproxy.org/?p=haproxy.git;a=blobdiff_plain;f=src%2Fhaproxy.c;h=30e850c4ac4719b71adccb3b6bd41248ef5bb470;hp=7af4ab479c761a43b2fa64d2124388dbf5c21fc3;hb=97148f60b8feec39b76768d1bcfab6d755c12164;hpb=0d00593361b91017b894c4c7d5e24721a7838d6e

--- src/haproxy.c.orig	2018-02-05 02:24:58 UTC
+++ src/haproxy.c
@@ -2031,7 +2031,18 @@ int main(int argc, char **argv)
 		    proc < LONGBITS &&       /* only the first 32/64 processes may be pinned */
 		    global.cpu_map[proc])    /* only do this if the process has a CPU map */
 #ifdef __FreeBSD__
-			cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, -1, sizeof(unsigned long), (void *)&global.cpu_map[proc]);
+		{
+			cpuset_t cpuset;
+			int i;
+			unsigned long cpu_map = global.cpu_map[proc];
+
+			CPU_ZERO(&cpuset);
+			while ((i = ffsl(cpu_map)) > 0) {
+				CPU_SET(i - 1, &cpuset);
+				cpu_map &= ~(1 << (i - 1));
+			}
+			ret = cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, -1, sizeof(cpuset), &cpuset);
+		}
 #else
 			sched_setaffinity(0, sizeof(unsigned long), (void *)&global.cpu_map[proc]);
 #endif




--- src/ssl_sock.c.orig	2017-07-07 09:49:34 UTC
+++ src/ssl_sock.c
@@ -794,8 +794,11 @@ static int ssl_sock_load_ocsp(SSL_CTX *c
 		ocsp = NULL;
 
 #ifndef SSL_CTX_get_tlsext_status_cb
+#ifndef SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB
+#define SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB 128
+#endif
 # define SSL_CTX_get_tlsext_status_cb(ctx, cb) \
-	*cb = (void (*) (void))ctx->tlsext_status_cb;
+	*cb = SSL_CTX_ctrl(ctx,SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB,0, (void (**)(void))cb)
 #endif
 	SSL_CTX_get_tlsext_status_cb(ctx, &callback);
 
@@ -823,7 +826,10 @@ static int ssl_sock_load_ocsp(SSL_CTX *c
 		int key_type;
 		EVP_PKEY *pkey;
 
-#ifdef SSL_CTX_get_tlsext_status_arg
+#if defined(SSL_CTX_get_tlsext_status_arg) || defined(LIBRESSL_VERSION_NUMBER)
+#ifndef SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB_ARG
+#define SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB_ARG 129
+#endif
 		SSL_CTX_ctrl(ctx, SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB_ARG, 0, &cb_arg);
 #else
 		cb_arg = ctx->tlsext_status_arg;
@@ -3539,7 +3545,7 @@ int ssl_sock_handshake(struct connection
 					OSSL_HANDSHAKE_STATE state = SSL_get_state((SSL *)conn->xprt_ctx);
 					empty_handshake = state == TLS_ST_BEFORE;
 #else
-					empty_handshake = !((SSL *)conn->xprt_ctx)->packet_length;
+					empty_handshake = SSL_state((SSL *)conn->xprt_ctx) == SSL_ST_BEFORE;
 #endif
 
 					if (empty_handshake) {
@@ -3617,7 +3623,7 @@ int ssl_sock_handshake(struct connection
 			state = SSL_get_state((SSL *)conn->xprt_ctx);
 			empty_handshake = state == TLS_ST_BEFORE;
 #else
-			empty_handshake = !((SSL *)conn->xprt_ctx)->packet_length;
+			empty_handshake = SSL_state((SSL *)conn->xprt_ctx) == SSL_ST_BEFORE;
 #endif
 			if (empty_handshake) {
 				if (!errno) {

Return to bug 228424

Lines 1-24 Link Here

(-)files/patch-src_haproxy.c (-24 lines)
1	X-Git-Url: http://git.haproxy.org/?p=haproxy.git;a=blobdiff_plain;f=src%2Fhaproxy.c;h=30e850c4ac4719b71adccb3b6bd41248ef5bb470;hp=7af4ab479c761a43b2fa64d2124388dbf5c21fc3;hb=97148f60b8feec39b76768d1bcfab6d755c12164;hpb=0d00593361b91017b894c4c7d5e24721a7838d6e
2
3	--- src/haproxy.c.orig 2018-02-05 02:24:58 UTC
4	+++ src/haproxy.c
5	@@ -2031,7 +2031,18 @@ int main(int argc, char **argv)
6	proc < LONGBITS && /* only the first 32/64 processes may be pinned */
7	global.cpu_map[proc]) /* only do this if the process has a CPU map */
8	#ifdef __FreeBSD__
9	- cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, -1, sizeof(unsigned long), (void *)&global.cpu_map[proc]);
10	+ {
11	+ cpuset_t cpuset;
12	+ int i;
13	+ unsigned long cpu_map = global.cpu_map[proc];
14	+
15	+ CPU_ZERO(&cpuset);
16	+ while ((i = ffsl(cpu_map)) > 0) {
17	+ CPU_SET(i - 1, &cpuset);
18	+ cpu_map &= ~(1 << (i - 1));
19	+ }
20	+ ret = cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, -1, sizeof(cpuset), &cpuset);
21	+ }
22	#else
23	sched_setaffinity(0, sizeof(unsigned long), (void *)&global.cpu_map[proc]);
24	#endif

Lines 1-45 Link Here

(-)files/patch-src_ssl__sock.c (-45 lines)
1	--- src/ssl_sock.c.orig 2017-07-07 09:49:34 UTC
2	+++ src/ssl_sock.c
3	@@ -794,8 +794,11 @@ static int ssl_sock_load_ocsp(SSL_CTX *c
4	ocsp = NULL;
5
6	#ifndef SSL_CTX_get_tlsext_status_cb
7	+#ifndef SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB
8	+#define SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB 128
9	+#endif
10	# define SSL_CTX_get_tlsext_status_cb(ctx, cb) \
11	- cb = (void () (void))ctx->tlsext_status_cb;
12	+ cb = SSL_CTX_ctrl(ctx,SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB,0, (void (*)(void))cb)
13	#endif
14	SSL_CTX_get_tlsext_status_cb(ctx, &callback);
15
16	@@ -823,7 +826,10 @@ static int ssl_sock_load_ocsp(SSL_CTX *c
17	int key_type;
18	EVP_PKEY *pkey;
19
20	-#ifdef SSL_CTX_get_tlsext_status_arg
21	+#if defined(SSL_CTX_get_tlsext_status_arg) \|\| defined(LIBRESSL_VERSION_NUMBER)
22	+#ifndef SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB_ARG
23	+#define SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB_ARG 129
24	+#endif
25	SSL_CTX_ctrl(ctx, SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB_ARG, 0, &cb_arg);
26	#else
27	cb_arg = ctx->tlsext_status_arg;
28	@@ -3539,7 +3545,7 @@ int ssl_sock_handshake(struct connection
29	OSSL_HANDSHAKE_STATE state = SSL_get_state((SSL *)conn->xprt_ctx);
30	empty_handshake = state == TLS_ST_BEFORE;
31	#else
32	- empty_handshake = !((SSL *)conn->xprt_ctx)->packet_length;
33	+ empty_handshake = SSL_state((SSL *)conn->xprt_ctx) == SSL_ST_BEFORE;
34	#endif
35
36	if (empty_handshake) {
37	@@ -3617,7 +3623,7 @@ int ssl_sock_handshake(struct connection
38	state = SSL_get_state((SSL *)conn->xprt_ctx);
39	empty_handshake = state == TLS_ST_BEFORE;
40	#else
41	- empty_handshake = !((SSL *)conn->xprt_ctx)->packet_length;
42	+ empty_handshake = SSL_state((SSL *)conn->xprt_ctx) == SSL_ST_BEFORE;
43	#endif
44	if (empty_handshake) {
45	if (!errno) {