diff options
author | Christian Grothoff <christian@grothoff.org> | 2016-11-04 11:21:25 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2016-11-04 11:21:25 +0100 |
commit | f2858123902bea7492114d69fdaf1731741ad767 (patch) | |
tree | 537e58e0ebe48c4b2c3179fecd9adc94a51884e6 | |
parent | 90086f053104e7072ad141fe5132cd6256e2227f (diff) | |
download | libmicrohttpd-f2858123902bea7492114d69fdaf1731741ad767.tar.gz libmicrohttpd-f2858123902bea7492114d69fdaf1731741ad767.zip |
fix commit 334468c467472230b25b2640ba42639d6052c654 which introduced wrong branch for openssl command-line tool in test
-rw-r--r-- | po/POTFILES.in | 1 | ||||
-rw-r--r-- | src/microhttpd/test_upgrade_ssl.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in index f85c0b7f..f4fdac4d 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in | |||
@@ -41,6 +41,7 @@ src/testcurl/https/tls_test_common.c | |||
41 | src/testzzuf/socat.c | 41 | src/testzzuf/socat.c |
42 | src/include/mhd_options.h | 42 | src/include/mhd_options.h |
43 | src/include/microhttpd.h | 43 | src/include/microhttpd.h |
44 | src/microhttpd/connection.h | ||
44 | src/microhttpd/internal.h | 45 | src/microhttpd/internal.h |
45 | src/microhttpd/mhd_compat.h | 46 | src/microhttpd/mhd_compat.h |
46 | src/microhttpd/mhd_itc.h | 47 | src/microhttpd/mhd_itc.h |
diff --git a/src/microhttpd/test_upgrade_ssl.c b/src/microhttpd/test_upgrade_ssl.c index 3aa55d1a..bc4c4249 100644 --- a/src/microhttpd/test_upgrade_ssl.c +++ b/src/microhttpd/test_upgrade_ssl.c | |||
@@ -189,7 +189,7 @@ main (int argc, | |||
189 | use_tool = TLS_CLI_NO_TOOL; | 189 | use_tool = TLS_CLI_NO_TOOL; |
190 | if (0 == system ("gnutls-cli --version 1> /dev/null")) | 190 | if (0 == system ("gnutls-cli --version 1> /dev/null")) |
191 | use_tool = TLS_CLI_GNUTLS; | 191 | use_tool = TLS_CLI_GNUTLS; |
192 | else if (0 != system ("openssl version 1> /dev/null")) | 192 | else if (0 == system ("openssl version 1> /dev/null")) |
193 | use_tool = TLS_CLI_OPENSSL; | 193 | use_tool = TLS_CLI_OPENSSL; |
194 | else | 194 | else |
195 | return 77; /* not possible to test */ | 195 | return 77; /* not possible to test */ |