diff options
-rw-r--r-- | src/gns/gnunet-gns-proxy.c | 2 | ||||
-rw-r--r-- | src/my/my.c | 1 | ||||
-rw-r--r-- | src/mysql/mysql.c | 21 | ||||
-rw-r--r-- | src/transport/plugin_transport_http_server.c | 2 |
4 files changed, 16 insertions, 10 deletions
diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c index ef9c7bf62..477444919 100644 --- a/src/gns/gnunet-gns-proxy.c +++ b/src/gns/gnunet-gns-proxy.c | |||
@@ -2302,7 +2302,7 @@ lookup_ssl_httpd (const char* domain) | |||
2302 | hd->is_ssl = GNUNET_YES; | 2302 | hd->is_ssl = GNUNET_YES; |
2303 | hd->domain = GNUNET_strdup (domain); | 2303 | hd->domain = GNUNET_strdup (domain); |
2304 | hd->proxy_cert = pgc; | 2304 | hd->proxy_cert = pgc; |
2305 | hd->daemon = MHD_start_daemon (MHD_USE_DEBUG | MHD_USE_SSL | MHD_USE_NO_LISTEN_SOCKET, | 2305 | hd->daemon = MHD_start_daemon (MHD_USE_DEBUG | MHD_USE_TLS | MHD_USE_NO_LISTEN_SOCKET, |
2306 | 0, | 2306 | 0, |
2307 | NULL, NULL, | 2307 | NULL, NULL, |
2308 | &create_response, hd, | 2308 | &create_response, hd, |
diff --git a/src/my/my.c b/src/my/my.c index 5816663b6..459f09b6a 100644 --- a/src/my/my.c +++ b/src/my/my.c | |||
@@ -181,6 +181,7 @@ GNUNET_MY_extract_result (struct GNUNET_MYSQL_StatementHandle *sh, | |||
181 | stmt, | 181 | stmt, |
182 | field_off, | 182 | field_off, |
183 | &result[field_off])) | 183 | &result[field_off])) |
184 | |||
184 | { | 185 | { |
185 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 186 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
186 | "Pre-conversion for MySQL result failed at offset %u\n", | 187 | "Pre-conversion for MySQL result failed at offset %u\n", |
diff --git a/src/mysql/mysql.c b/src/mysql/mysql.c index acd54a288..bebbfbe0f 100644 --- a/src/mysql/mysql.c +++ b/src/mysql/mysql.c | |||
@@ -197,7 +197,7 @@ get_my_cnf_path (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
197 | * our default options). | 197 | * our default options). |
198 | * | 198 | * |
199 | * @param mc database context to initialze | 199 | * @param mc database context to initialze |
200 | * @return GNUNET_OK on success | 200 | * @return #GNUNET_OK on success |
201 | */ | 201 | */ |
202 | static int | 202 | static int |
203 | iopen (struct GNUNET_MYSQL_Context *mc) | 203 | iopen (struct GNUNET_MYSQL_Context *mc) |
@@ -300,7 +300,8 @@ GNUNET_MYSQL_context_create (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
300 | mc = GNUNET_new (struct GNUNET_MYSQL_Context); | 300 | mc = GNUNET_new (struct GNUNET_MYSQL_Context); |
301 | mc->cfg = cfg; | 301 | mc->cfg = cfg; |
302 | mc->section = section; | 302 | mc->section = section; |
303 | mc->cnffile = get_my_cnf_path (cfg, section); | 303 | mc->cnffile = get_my_cnf_path (cfg, |
304 | section); | ||
304 | 305 | ||
305 | return mc; | 306 | return mc; |
306 | } | 307 | } |
@@ -383,18 +384,22 @@ GNUNET_MYSQL_statement_prepare (struct GNUNET_MYSQL_Context *mc, | |||
383 | * | 384 | * |
384 | * @param mc mysql context | 385 | * @param mc mysql context |
385 | * @param sql SQL statement to run | 386 | * @param sql SQL statement to run |
386 | * @return GNUNET_OK on success | 387 | * @return #GNUNET_OK on success |
387 | * GNUNET_SYSERR if there was a problem | 388 | * #GNUNET_SYSERR if there was a problem |
388 | */ | 389 | */ |
389 | int | 390 | int |
390 | GNUNET_MYSQL_statement_run (struct GNUNET_MYSQL_Context *mc, const char *sql) | 391 | GNUNET_MYSQL_statement_run (struct GNUNET_MYSQL_Context *mc, |
392 | const char *sql) | ||
391 | { | 393 | { |
392 | if ((NULL == mc->dbf) && (GNUNET_OK != iopen (mc))) | 394 | if ( (NULL == mc->dbf) && |
395 | (GNUNET_OK != iopen (mc)) ) | ||
393 | return GNUNET_SYSERR; | 396 | return GNUNET_SYSERR; |
394 | mysql_query (mc->dbf, sql); | 397 | mysql_query (mc->dbf, sql); |
395 | if (mysql_error (mc->dbf)[0]) | 398 | if (mysql_error (mc->dbf)[0]) |
396 | { | 399 | { |
397 | LOG_MYSQL (GNUNET_ERROR_TYPE_ERROR, "mysql_query", mc); | 400 | LOG_MYSQL (GNUNET_ERROR_TYPE_ERROR, |
401 | "mysql_query", | ||
402 | mc); | ||
398 | GNUNET_MYSQL_statements_invalidate (mc); | 403 | GNUNET_MYSQL_statements_invalidate (mc); |
399 | return GNUNET_SYSERR; | 404 | return GNUNET_SYSERR; |
400 | } | 405 | } |
@@ -407,7 +412,7 @@ GNUNET_MYSQL_statement_run (struct GNUNET_MYSQL_Context *mc, const char *sql) | |||
407 | * | 412 | * |
408 | * @param mc mysql context | 413 | * @param mc mysql context |
409 | * @param sh statement handle to prepare | 414 | * @param sh statement handle to prepare |
410 | * @return GNUNET_OK on success | 415 | * @return #GNUNET_OK on success |
411 | */ | 416 | */ |
412 | static int | 417 | static int |
413 | prepare_statement (struct GNUNET_MYSQL_StatementHandle *sh) | 418 | prepare_statement (struct GNUNET_MYSQL_StatementHandle *sh) |
diff --git a/src/transport/plugin_transport_http_server.c b/src/transport/plugin_transport_http_server.c index 5088f2e77..1a2f5d21a 100644 --- a/src/transport/plugin_transport_http_server.c +++ b/src/transport/plugin_transport_http_server.c | |||
@@ -2200,7 +2200,7 @@ run_mhd_start_daemon (struct HTTP_Server_Plugin *plugin, | |||
2200 | MHD_USE_DEBUG | | 2200 | MHD_USE_DEBUG | |
2201 | #endif | 2201 | #endif |
2202 | #if BUILD_HTTPS | 2202 | #if BUILD_HTTPS |
2203 | MHD_USE_SSL | | 2203 | MHD_USE_TLS | |
2204 | #endif | 2204 | #endif |
2205 | MHD_USE_SUSPEND_RESUME | | 2205 | MHD_USE_SUSPEND_RESUME | |
2206 | v6, | 2206 | v6, |