diff options
-rw-r--r-- | configure.ac | 9 | ||||
-rw-r--r-- | src/microhttpd/Makefile.am | 24 | ||||
-rw-r--r-- | src/testcurl/https/Makefile.am | 24 | ||||
-rw-r--r-- | src/testcurl/test_get.c | 2 | ||||
-rw-r--r-- | src/testcurl/test_put.c | 2 |
5 files changed, 36 insertions, 25 deletions
diff --git a/configure.ac b/configure.ac index 356f7fef..e2f9891d 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1502,6 +1502,8 @@ AC_ARG_WITH([[gnutls]], | |||
1502 | AC_MSG_RESULT([[-I$with_gnutls/include -L$with_gnutls/lib -lgnutls]]) | 1502 | AC_MSG_RESULT([[-I$with_gnutls/include -L$with_gnutls/lib -lgnutls]]) |
1503 | SAVE_LDFLAGS="$LDFLAGS" | 1503 | SAVE_LDFLAGS="$LDFLAGS" |
1504 | SAVE_CPPFLAGS="$CPPFLAGS" | 1504 | SAVE_CPPFLAGS="$CPPFLAGS" |
1505 | SAVE_CFLAGS="$CFLAGS" | ||
1506 | SAVE_LIBS="$LIBS" | ||
1505 | LDFLAGS="-L$with_gnutls/lib $LDFLAGS" | 1507 | LDFLAGS="-L$with_gnutls/lib $LDFLAGS" |
1506 | CPPFLAGS="-I$with_gnutls/include $CPPFLAGS" | 1508 | CPPFLAGS="-I$with_gnutls/include $CPPFLAGS" |
1507 | have_gnutls_pkgcfg=no | 1509 | have_gnutls_pkgcfg=no |
@@ -1514,6 +1516,10 @@ AC_ARG_WITH([[gnutls]], | |||
1514 | have_gnutls=yes | 1516 | have_gnutls=yes |
1515 | ])], [], [AC_INCLUDES_DEFAULT]) | 1517 | ])], [], [AC_INCLUDES_DEFAULT]) |
1516 | AS_IF([test "x$have_gnutls" != "xyes"], [AC_MSG_ERROR([can't find usable libgnutls at specified prefix $with_gnutls])]) | 1518 | AS_IF([test "x$have_gnutls" != "xyes"], [AC_MSG_ERROR([can't find usable libgnutls at specified prefix $with_gnutls])]) |
1519 | CPPFLAGS="$SAVE_CPPFLAGS" | ||
1520 | CFLAGS="$SAVE_CFLAGS" | ||
1521 | LDFLAGS="$SAVE_LDFLAGS" | ||
1522 | LIBS="$SAVE_LIBS" | ||
1517 | ;; | 1523 | ;; |
1518 | esac | 1524 | esac |
1519 | ], | 1525 | ], |
@@ -1659,7 +1665,8 @@ AS_IF([test "x$with_gnutls" != "xno" && test "x$have_gnutls" != "xyes"], | |||
1659 | ) | 1665 | ) |
1660 | ] | 1666 | ] |
1661 | ) | 1667 | ) |
1662 | AS_IF([test "x$have_gnutls" != "xyes" && test "x$with_gnutls" = "xyes"], [AC_MSG_ERROR([[can't find usable libgnutls]])]) | 1668 | AS_IF([test "x$have_gnutls" != "xyes" && test "x$with_gnutls" = "xyes"], |
1669 | [AC_MSG_ERROR([[can't find usable libgnutls]])]) | ||
1663 | # | 1670 | # |
1664 | # End of large unindented block | 1671 | # End of large unindented block |
1665 | # | 1672 | # |
diff --git a/src/microhttpd/Makefile.am b/src/microhttpd/Makefile.am index f03c4ed6..f303b3f9 100644 --- a/src/microhttpd/Makefile.am +++ b/src/microhttpd/Makefile.am | |||
@@ -194,11 +194,11 @@ test_daemon_LDADD = \ | |||
194 | test_upgrade_SOURCES = \ | 194 | test_upgrade_SOURCES = \ |
195 | test_upgrade.c test_helpers.h mhd_sockets.h | 195 | test_upgrade.c test_helpers.h mhd_sockets.h |
196 | test_upgrade_CPPFLAGS = \ | 196 | test_upgrade_CPPFLAGS = \ |
197 | $(AM_CPPFLAGS) $(GNUTLS_CPPFLAGS) | 197 | $(AM_CPPFLAGS) $(MHD_TLS_LIB_CPPFLAGS) |
198 | test_upgrade_CFLAGS = \ | 198 | test_upgrade_CFLAGS = \ |
199 | $(AM_CFLAGS) $(PTHREAD_CFLAGS) $(GNUTLS_CFLAGS) | 199 | $(AM_CFLAGS) $(PTHREAD_CFLAGS) $(MHD_TLS_LIB_CFLAGS) |
200 | test_upgrade_LDFLAGS = \ | 200 | test_upgrade_LDFLAGS = \ |
201 | $(GNUTLS_LDFLAGS) | 201 | $(MHD_TLS_LIB_LDFLAGS) |
202 | test_upgrade_LDADD = \ | 202 | test_upgrade_LDADD = \ |
203 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | 203 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ |
204 | $(PTHREAD_LIBS) | 204 | $(PTHREAD_LIBS) |
@@ -206,11 +206,11 @@ test_upgrade_LDADD = \ | |||
206 | test_upgrade_tls_SOURCES = \ | 206 | test_upgrade_tls_SOURCES = \ |
207 | test_upgrade.c test_helpers.h mhd_sockets.h | 207 | test_upgrade.c test_helpers.h mhd_sockets.h |
208 | test_upgrade_tls_CPPFLAGS = \ | 208 | test_upgrade_tls_CPPFLAGS = \ |
209 | $(AM_CPPFLAGS) $(GNUTLS_CPPFLAGS) | 209 | $(AM_CPPFLAGS) $(MHD_TLS_LIB_CPPFLAGS) |
210 | test_upgrade_tls_CFLAGS = \ | 210 | test_upgrade_tls_CFLAGS = \ |
211 | $(AM_CFLAGS) $(PTHREAD_CFLAGS) $(GNUTLS_CFLAGS) | 211 | $(AM_CFLAGS) $(PTHREAD_CFLAGS) $(MHD_TLS_LIB_CFLAGS) |
212 | test_upgrade_tls_LDFLAGS = \ | 212 | test_upgrade_tls_LDFLAGS = \ |
213 | $(GNUTLS_LDFLAGS) | 213 | $(MHD_TLS_LIB_LDFLAGS) |
214 | test_upgrade_tls_LDADD = \ | 214 | test_upgrade_tls_LDADD = \ |
215 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | 215 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ |
216 | $(PTHREAD_LIBS) | 216 | $(PTHREAD_LIBS) |
@@ -218,27 +218,27 @@ test_upgrade_tls_LDADD = \ | |||
218 | test_postprocessor_SOURCES = \ | 218 | test_postprocessor_SOURCES = \ |
219 | test_postprocessor.c | 219 | test_postprocessor.c |
220 | test_postprocessor_CPPFLAGS = \ | 220 | test_postprocessor_CPPFLAGS = \ |
221 | $(AM_CPPFLAGS) $(GNUTLS_CPPFLAGS) | 221 | $(AM_CPPFLAGS) $(MHD_TLS_LIB_CPPFLAGS) |
222 | test_postprocessor_CFLAGS = \ | 222 | test_postprocessor_CFLAGS = \ |
223 | $(AM_CFLAGS) $(GNUTLS_CFLAGS) | 223 | $(AM_CFLAGS) $(MHD_TLS_LIB_CFLAGS) |
224 | test_postprocessor_LDADD = \ | 224 | test_postprocessor_LDADD = \ |
225 | $(top_builddir)/src/microhttpd/libmicrohttpd.la | 225 | $(top_builddir)/src/microhttpd/libmicrohttpd.la |
226 | 226 | ||
227 | test_postprocessor_amp_SOURCES = \ | 227 | test_postprocessor_amp_SOURCES = \ |
228 | test_postprocessor_amp.c | 228 | test_postprocessor_amp.c |
229 | test_postprocessor_amp_CPPFLAGS = \ | 229 | test_postprocessor_amp_CPPFLAGS = \ |
230 | $(AM_CPPFLAGS) $(GNUTLS_CPPFLAGS) | 230 | $(AM_CPPFLAGS) $(MHD_TLS_LIB_CPPFLAGS) |
231 | test_postprocessor_amp_CFLAGS = \ | 231 | test_postprocessor_amp_CFLAGS = \ |
232 | $(AM_CFLAGS) $(GNUTLS_CFLAGS) | 232 | $(AM_CFLAGS) $(MHD_TLS_LIB_CFLAGS) |
233 | test_postprocessor_amp_LDADD = \ | 233 | test_postprocessor_amp_LDADD = \ |
234 | $(top_builddir)/src/microhttpd/libmicrohttpd.la | 234 | $(top_builddir)/src/microhttpd/libmicrohttpd.la |
235 | 235 | ||
236 | test_postprocessor_large_SOURCES = \ | 236 | test_postprocessor_large_SOURCES = \ |
237 | test_postprocessor_large.c | 237 | test_postprocessor_large.c |
238 | test_postprocessor_large_CPPFLAGS = \ | 238 | test_postprocessor_large_CPPFLAGS = \ |
239 | $(AM_CPPFLAGS) $(GNUTLS_CPPFLAGS) | 239 | $(AM_CPPFLAGS) $(MHD_TLS_LIB_CPPFLAGS) |
240 | test_postprocessor_large_CFLAGS = \ | 240 | test_postprocessor_large_CFLAGS = \ |
241 | $(AM_CFLAGS) $(GNUTLS_CFLAGS) | 241 | $(AM_CFLAGS) $(MHD_TLS_LIB_CFLAGS) |
242 | test_postprocessor_large_LDADD = \ | 242 | test_postprocessor_large_LDADD = \ |
243 | $(top_builddir)/src/microhttpd/libmicrohttpd.la | 243 | $(top_builddir)/src/microhttpd/libmicrohttpd.la |
244 | 244 | ||
diff --git a/src/testcurl/https/Makefile.am b/src/testcurl/https/Makefile.am index 875770b6..239ce2ca 100644 --- a/src/testcurl/https/Makefile.am +++ b/src/testcurl/https/Makefile.am | |||
@@ -20,7 +20,7 @@ AM_CPPFLAGS = \ | |||
20 | -I$(top_srcdir)/src/include \ | 20 | -I$(top_srcdir)/src/include \ |
21 | -I$(top_srcdir)/src/microhttpd \ | 21 | -I$(top_srcdir)/src/microhttpd \ |
22 | -I$(top_srcdir)/src/platform \ | 22 | -I$(top_srcdir)/src/platform \ |
23 | $(LIBCURL_CPPFLAGS) $(GNUTLS_CPPFLAGS) | 23 | $(LIBCURL_CPPFLAGS) $(MHD_TLS_LIB_CPPFLAGS) |
24 | 24 | ||
25 | check_PROGRAMS = \ | 25 | check_PROGRAMS = \ |
26 | test_tls_options \ | 26 | test_tls_options \ |
@@ -58,7 +58,7 @@ test_https_time_out_SOURCES = \ | |||
58 | test_https_time_out_LDADD = \ | 58 | test_https_time_out_LDADD = \ |
59 | $(top_builddir)/src/testcurl/libcurl_version_check.a \ | 59 | $(top_builddir)/src/testcurl/libcurl_version_check.a \ |
60 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | 60 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ |
61 | $(GNUTLS_LDFLAGS) $(GNUTLS_LIBS) @LIBGCRYPT_LIBS@ @LIBCURL@ | 61 | $(MHD_TLS_LIB_LDFLAGS) $(MHD_TLS_LIBDEPS) @LIBGCRYPT_LIBS@ @LIBCURL@ |
62 | 62 | ||
63 | test_tls_options_SOURCES = \ | 63 | test_tls_options_SOURCES = \ |
64 | test_tls_options.c \ | 64 | test_tls_options.c \ |
@@ -68,7 +68,7 @@ test_tls_options_SOURCES = \ | |||
68 | test_tls_options_LDADD = \ | 68 | test_tls_options_LDADD = \ |
69 | $(top_builddir)/src/testcurl/libcurl_version_check.a \ | 69 | $(top_builddir)/src/testcurl/libcurl_version_check.a \ |
70 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | 70 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ |
71 | $(GNUTLS_LDFLAGS) $(GNUTLS_LIBS) @LIBGCRYPT_LIBS@ @LIBCURL@ | 71 | $(MHD_TLS_LIB_LDFLAGS) $(MHD_TLS_LIBDEPS) @LIBGCRYPT_LIBS@ @LIBCURL@ |
72 | 72 | ||
73 | test_https_get_parallel_SOURCES = \ | 73 | test_https_get_parallel_SOURCES = \ |
74 | test_https_get_parallel.c \ | 74 | test_https_get_parallel.c \ |
@@ -82,7 +82,7 @@ test_https_get_parallel_CFLAGS = \ | |||
82 | test_https_get_parallel_LDADD = \ | 82 | test_https_get_parallel_LDADD = \ |
83 | $(top_builddir)/src/testcurl/libcurl_version_check.a \ | 83 | $(top_builddir)/src/testcurl/libcurl_version_check.a \ |
84 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | 84 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ |
85 | $(PTHREAD_LIBS) $(GNUTLS_LDFLAGS) $(GNUTLS_LIBS) @LIBGCRYPT_LIBS@ @LIBCURL@ | 85 | $(PTHREAD_LIBS) $(MHD_TLS_LIB_LDFLAGS) $(MHD_TLS_LIBDEPS) @LIBGCRYPT_LIBS@ @LIBCURL@ |
86 | 86 | ||
87 | test_empty_response_SOURCES = \ | 87 | test_empty_response_SOURCES = \ |
88 | test_empty_response.c \ | 88 | test_empty_response.c \ |
@@ -92,7 +92,7 @@ test_empty_response_SOURCES = \ | |||
92 | test_empty_response_LDADD = \ | 92 | test_empty_response_LDADD = \ |
93 | $(top_builddir)/src/testcurl/libcurl_version_check.a \ | 93 | $(top_builddir)/src/testcurl/libcurl_version_check.a \ |
94 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | 94 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ |
95 | $(GNUTLS_LDFLAGS) $(GNUTLS_LIBS) @LIBGCRYPT_LIBS@ @LIBCURL@ | 95 | $(MHD_TLS_LIB_LDFLAGS) $(MHD_TLS_LIBDEPS) @LIBGCRYPT_LIBS@ @LIBCURL@ |
96 | 96 | ||
97 | test_https_get_parallel_threads_SOURCES = \ | 97 | test_https_get_parallel_threads_SOURCES = \ |
98 | test_https_get_parallel_threads.c \ | 98 | test_https_get_parallel_threads.c \ |
@@ -106,7 +106,7 @@ test_https_get_parallel_threads_CFLAGS = \ | |||
106 | test_https_get_parallel_threads_LDADD = \ | 106 | test_https_get_parallel_threads_LDADD = \ |
107 | $(top_builddir)/src/testcurl/libcurl_version_check.a \ | 107 | $(top_builddir)/src/testcurl/libcurl_version_check.a \ |
108 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | 108 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ |
109 | $(PTHREAD_LIBS) $(GNUTLS_LDFLAGS) $(GNUTLS_LIBS) @LIBGCRYPT_LIBS@ @LIBCURL@ | 109 | $(PTHREAD_LIBS) $(MHD_TLS_LIB_LDFLAGS) $(MHD_TLS_LIBDEPS) @LIBGCRYPT_LIBS@ @LIBCURL@ |
110 | 110 | ||
111 | test_tls_authentication_SOURCES = \ | 111 | test_tls_authentication_SOURCES = \ |
112 | test_tls_authentication.c \ | 112 | test_tls_authentication.c \ |
@@ -116,7 +116,7 @@ test_tls_authentication_SOURCES = \ | |||
116 | test_tls_authentication_LDADD = \ | 116 | test_tls_authentication_LDADD = \ |
117 | $(top_builddir)/src/testcurl/libcurl_version_check.a \ | 117 | $(top_builddir)/src/testcurl/libcurl_version_check.a \ |
118 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | 118 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ |
119 | $(GNUTLS_LDFLAGS) $(GNUTLS_LIBS) @LIBGCRYPT_LIBS@ @LIBCURL@ | 119 | $(MHD_TLS_LIB_LDFLAGS) $(MHD_TLS_LIBDEPS) @LIBGCRYPT_LIBS@ @LIBCURL@ |
120 | 120 | ||
121 | test_https_session_info_SOURCES = \ | 121 | test_https_session_info_SOURCES = \ |
122 | test_https_session_info.c \ | 122 | test_https_session_info.c \ |
@@ -126,7 +126,7 @@ test_https_session_info_SOURCES = \ | |||
126 | test_https_session_info_LDADD = \ | 126 | test_https_session_info_LDADD = \ |
127 | $(top_builddir)/src/testcurl/libcurl_version_check.a \ | 127 | $(top_builddir)/src/testcurl/libcurl_version_check.a \ |
128 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | 128 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ |
129 | $(GNUTLS_LDFLAGS) $(GNUTLS_LIBS) @LIBGCRYPT_LIBS@ @LIBCURL@ | 129 | $(MHD_TLS_LIB_LDFLAGS) $(MHD_TLS_LIBDEPS) @LIBGCRYPT_LIBS@ @LIBCURL@ |
130 | 130 | ||
131 | test_https_multi_daemon_SOURCES = \ | 131 | test_https_multi_daemon_SOURCES = \ |
132 | test_https_multi_daemon.c \ | 132 | test_https_multi_daemon.c \ |
@@ -136,7 +136,7 @@ test_https_multi_daemon_SOURCES = \ | |||
136 | test_https_multi_daemon_LDADD = \ | 136 | test_https_multi_daemon_LDADD = \ |
137 | $(top_builddir)/src/testcurl/libcurl_version_check.a \ | 137 | $(top_builddir)/src/testcurl/libcurl_version_check.a \ |
138 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | 138 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ |
139 | $(GNUTLS_LDFLAGS) $(GNUTLS_LIBS) @LIBGCRYPT_LIBS@ @LIBCURL@ | 139 | $(MHD_TLS_LIB_LDFLAGS) $(MHD_TLS_LIBDEPS) @LIBGCRYPT_LIBS@ @LIBCURL@ |
140 | 140 | ||
141 | test_https_get_SOURCES = \ | 141 | test_https_get_SOURCES = \ |
142 | test_https_get.c \ | 142 | test_https_get.c \ |
@@ -146,7 +146,7 @@ test_https_get_SOURCES = \ | |||
146 | test_https_get_LDADD = \ | 146 | test_https_get_LDADD = \ |
147 | $(top_builddir)/src/testcurl/libcurl_version_check.a \ | 147 | $(top_builddir)/src/testcurl/libcurl_version_check.a \ |
148 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | 148 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ |
149 | $(GNUTLS_LDFLAGS) $(GNUTLS_LIBS) @LIBGCRYPT_LIBS@ @LIBCURL@ | 149 | $(MHD_TLS_LIB_LDFLAGS) $(MHD_TLS_LIBDEPS) @LIBGCRYPT_LIBS@ @LIBCURL@ |
150 | 150 | ||
151 | if HAVE_GNUTLS_SNI | 151 | if HAVE_GNUTLS_SNI |
152 | test_https_sni_SOURCES = \ | 152 | test_https_sni_SOURCES = \ |
@@ -160,7 +160,7 @@ test_https_sni_CPPFLAGS = \ | |||
160 | test_https_sni_LDADD = \ | 160 | test_https_sni_LDADD = \ |
161 | $(top_builddir)/src/testcurl/libcurl_version_check.a \ | 161 | $(top_builddir)/src/testcurl/libcurl_version_check.a \ |
162 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | 162 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ |
163 | $(GNUTLS_LDFLAGS) $(GNUTLS_LIBS) @LIBGCRYPT_LIBS@ @LIBCURL@ | 163 | $(MHD_TLS_LIB_LDFLAGS) $(MHD_TLS_LIBDEPS) @LIBGCRYPT_LIBS@ @LIBCURL@ |
164 | endif | 164 | endif |
165 | 165 | ||
166 | test_https_get_select_SOURCES = \ | 166 | test_https_get_select_SOURCES = \ |
@@ -171,5 +171,5 @@ test_https_get_select_SOURCES = \ | |||
171 | test_https_get_select_LDADD = \ | 171 | test_https_get_select_LDADD = \ |
172 | $(top_builddir)/src/testcurl/libcurl_version_check.a \ | 172 | $(top_builddir)/src/testcurl/libcurl_version_check.a \ |
173 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ | 173 | $(top_builddir)/src/microhttpd/libmicrohttpd.la \ |
174 | $(GNUTLS_LDFLAGS) $(GNUTLS_LIBS) @LIBGCRYPT_LIBS@ @LIBCURL@ | 174 | $(MHD_TLS_LIB_LDFLAGS) $(MHD_TLS_LIBDEPS) @LIBGCRYPT_LIBS@ @LIBCURL@ |
175 | 175 | ||
diff --git a/src/testcurl/test_get.c b/src/testcurl/test_get.c index 081859f7..1c9796f7 100644 --- a/src/testcurl/test_get.c +++ b/src/testcurl/test_get.c | |||
@@ -420,6 +420,8 @@ testExternalGet () | |||
420 | } | 420 | } |
421 | tv.tv_sec = 0; | 421 | tv.tv_sec = 0; |
422 | tv.tv_usec = 1000; | 422 | tv.tv_usec = 1000; |
423 | if (maxsock > maxposixs) | ||
424 | maxposixs = maxsock; | ||
423 | if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv)) | 425 | if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv)) |
424 | { | 426 | { |
425 | #ifdef MHD_POSIX_SOCKETS | 427 | #ifdef MHD_POSIX_SOCKETS |
diff --git a/src/testcurl/test_put.c b/src/testcurl/test_put.c index 83c4a124..eba7afa0 100644 --- a/src/testcurl/test_put.c +++ b/src/testcurl/test_put.c | |||
@@ -462,6 +462,8 @@ curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer); | |||
462 | MHD_stop_daemon (d); | 462 | MHD_stop_daemon (d); |
463 | return 4096; | 463 | return 4096; |
464 | } | 464 | } |
465 | if (maxsock > maxposixs) | ||
466 | maxposixs = maxsock; | ||
465 | tv.tv_sec = 0; | 467 | tv.tv_sec = 0; |
466 | tv.tv_usec = 1000; | 468 | tv.tv_usec = 1000; |
467 | if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv)) | 469 | if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv)) |