aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsilvioprog <silvioprog@gmail.com>2018-12-06 02:13:37 -0300
committersilvioprog <silvioprog@gmail.com>2018-12-06 02:13:37 -0300
commit53674dcdfba0ade96b50672a709edae1eae0323a (patch)
tree84c4e85106239dfff339f647c7f6f07731bfa797
parent79a8955bb61d62f6dc4fc93d2f05a08adf8596d5 (diff)
downloadlibmicrohttpd-53674dcdfba0ade96b50672a709edae1eae0323a.tar.gz
libmicrohttpd-53674dcdfba0ade96b50672a709edae1eae0323a.zip
Referenced the gnutls_load_file() function in the HTTPs examples.
-rw-r--r--ChangeLog3
-rw-r--r--src/examples/benchmark_https.c2
-rw-r--r--src/examples/demo_https.c2
3 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 7fc917d4..0f401a6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
1Thu Dec 6 02:11:15 -03 2018
2 Referenced the gnutls_load_file() function in the HTTPs examples. -SC
3
1Wed Dec 5 18:08:59 CET 2018 4Wed Dec 5 18:08:59 CET 2018
2 Fix regression causing URLs to be unescaped twice. -CG 5 Fix regression causing URLs to be unescaped twice. -CG
3 6
diff --git a/src/examples/benchmark_https.c b/src/examples/benchmark_https.c
index c19f0be8..64eb11b7 100644
--- a/src/examples/benchmark_https.c
+++ b/src/examples/benchmark_https.c
@@ -204,6 +204,8 @@ main (int argc, char *const *argv)
204 MHD_OPTION_URI_LOG_CALLBACK, &uri_logger_cb, NULL, 204 MHD_OPTION_URI_LOG_CALLBACK, &uri_logger_cb, NULL,
205 MHD_OPTION_NOTIFY_COMPLETED, &completed_callback, NULL, 205 MHD_OPTION_NOTIFY_COMPLETED, &completed_callback, NULL,
206 MHD_OPTION_CONNECTION_LIMIT, (unsigned int) 1000, 206 MHD_OPTION_CONNECTION_LIMIT, (unsigned int) 1000,
207 /* Optionally, the gnutls_load_file() can be used to
208 load the key and the certificate from file. */
207 MHD_OPTION_HTTPS_MEM_KEY, srv_signed_key_pem, 209 MHD_OPTION_HTTPS_MEM_KEY, srv_signed_key_pem,
208 MHD_OPTION_HTTPS_MEM_CERT, srv_signed_cert_pem, 210 MHD_OPTION_HTTPS_MEM_CERT, srv_signed_cert_pem,
209 MHD_OPTION_END); 211 MHD_OPTION_END);
diff --git a/src/examples/demo_https.c b/src/examples/demo_https.c
index b2c67af9..14ca0bf7 100644
--- a/src/examples/demo_https.c
+++ b/src/examples/demo_https.c
@@ -972,6 +972,8 @@ main (int argc, char *const *argv)
972 MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) (120 /* seconds */), 972 MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) (120 /* seconds */),
973 MHD_OPTION_THREAD_POOL_SIZE, (unsigned int) NUMBER_OF_THREADS, 973 MHD_OPTION_THREAD_POOL_SIZE, (unsigned int) NUMBER_OF_THREADS,
974 MHD_OPTION_NOTIFY_COMPLETED, &response_completed_callback, NULL, 974 MHD_OPTION_NOTIFY_COMPLETED, &response_completed_callback, NULL,
975 /* Optionally, the gnutls_load_file() can be used to
976 load the key and the certificate from file. */
975 MHD_OPTION_HTTPS_MEM_KEY, srv_signed_key_pem, 977 MHD_OPTION_HTTPS_MEM_KEY, srv_signed_key_pem,
976 MHD_OPTION_HTTPS_MEM_CERT, srv_signed_cert_pem, 978 MHD_OPTION_HTTPS_MEM_CERT, srv_signed_cert_pem,
977 MHD_OPTION_END); 979 MHD_OPTION_END);