From 5454635cfc125b844a4a9d018ec6b7f29047e0e7 Mon Sep 17 00:00:00 2001 From: Thorsten Alteholz Date: Thu, 23 Mar 2017 01:34:35 +0100 Subject: [PATCH 1/2] fix typo in manpage --- man/httperf.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/httperf.1 b/man/httperf.1 index 13f1814..40f12a5 100755 --- a/man/httperf.1 +++ b/man/httperf.1 @@ -1076,7 +1076,7 @@ avg 6.45 connections/session 4 7 4 ... 3 3 240 .RE .PP -The line labeled ``Session rate'' shows the minium, average, and +The line labeled ``Session rate'' shows the minimum, average, and maximum rate at which sessions completed (based on a 5 second sampling interval). It also shows the standard deviation of the session completion rate. The numbers in parentheses show how many sessions From c4b07d477b15f1188079176608eefa169a27f378 Mon Sep 17 00:00:00 2001 From: Thorsten Alteholz Date: Thu, 23 Mar 2017 01:38:26 +0100 Subject: [PATCH 2/2] make it compile with SSL 1.1.0 --- src/core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core.c b/src/core.c index bb4929e..a6ba6f8 100755 --- a/src/core.c +++ b/src/core.c @@ -1035,9 +1035,9 @@ core_ssl_connect(Conn * s) "suites!\n"); else fprintf(stderr, - "core_ssl_connect: cipher=%s, valid=%d, id=%lu\n", - ssl_cipher->name, ssl_cipher->valid, - ssl_cipher->id); + "core_ssl_connect: cipher=%s, id=%lu\n", + SSL_CIPHER_get_name(ssl_cipher), + SSL_CIPHER_get_id(ssl_cipher)); } arg.l = 0;