[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r32419 - libmicrohttpd/src/testcurl/https
From: |
gnunet |
Subject: |
[GNUnet-SVN] r32419 - libmicrohttpd/src/testcurl/https |
Date: |
Wed, 19 Feb 2014 07:45:03 +0100 |
Author: grothoff
Date: 2014-02-19 07:45:03 +0100 (Wed, 19 Feb 2014)
New Revision: 32419
Modified:
libmicrohttpd/src/testcurl/https/Makefile.am
libmicrohttpd/src/testcurl/https/test_https_sni.c
Log:
locate host.crt-files even if doing an out-of-tree build
Modified: libmicrohttpd/src/testcurl/https/Makefile.am
===================================================================
--- libmicrohttpd/src/testcurl/https/Makefile.am 2014-02-19 06:22:45 UTC
(rev 32418)
+++ libmicrohttpd/src/testcurl/https/Makefile.am 2014-02-19 06:45:03 UTC
(rev 32419)
@@ -115,6 +115,9 @@
test_https_sni_SOURCES = \
test_https_sni.c \
tls_test_common.c
+test_https_sni_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
+ -DABS_SRCDIR=\"$(abs_srcdir)\"
test_https_sni_LDADD = \
$(top_builddir)/src/testcurl/libcurl_version_check.a \
$(top_builddir)/src/microhttpd/libmicrohttpd.la \
Modified: libmicrohttpd/src/testcurl/https/test_https_sni.c
===================================================================
--- libmicrohttpd/src/testcurl/https/test_https_sni.c 2014-02-19 06:22:45 UTC
(rev 32418)
+++ libmicrohttpd/src/testcurl/https/test_https_sni.c 2014-02-19 06:45:03 UTC
(rev 32419)
@@ -67,6 +67,8 @@
struct Hosts *host;
host = malloc (sizeof (struct Hosts));
+ if (NULL == host)
+ abort ();
host->hostname = hostname;
host->next = hosts;
hosts = host;
@@ -256,8 +258,8 @@
fprintf (stderr, "Error: %s\n", strerror (errno));
return -1;
}
- load_keys ("host1", "host1.crt", "host1.key");
- load_keys ("host2", "host2.crt", "host2.key");
+ load_keys ("host1", ABS_SRCDIR "/host1.crt", ABS_SRCDIR "/host1.key");
+ load_keys ("host2", ABS_SRCDIR "/host2.crt", ABS_SRCDIR "/host2.key");
d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_SSL |
MHD_USE_DEBUG,
4233,
NULL, NULL,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r32419 - libmicrohttpd/src/testcurl/https,
gnunet <=