[taler-exchange] branch master updated: -make content-length optional again

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository exchange.

The following commit(s) were added to refs/heads/master by this push:
     new f009e0bd -make content-length optional again
f009e0bd is described below

commit f009e0bd1261fe5b73ae7294faee3ac3e20ce802
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Tue May 9 14:07:13 2023 +0200

    -make content-length optional again
---
 src/mhd/mhd_parsing.c                  |  4 ++++
 src/testing/testing_api_helpers_bank.c | 23 +++++++++++++++++++----
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/mhd/mhd_parsing.c b/src/mhd/mhd_parsing.c
index 9e3cb571..b1f8417e 100644
--- a/src/mhd/mhd_parsing.c
+++ b/src/mhd/mhd_parsing.c
@@ -365,6 +365,9 @@ TALER_MHD_check_content_length_ (struct MHD_Connection 
*connection,
                                     MHD_HTTP_HEADER_CONTENT_LENGTH);
   if (NULL == cl)
   {
+    return GNUNET_OK;
+#if 0
+    /* wallet currently doesn't always send content-length! */
     GNUNET_break_op (0);
     return (MHD_YES ==
             TALER_MHD_reply_with_error (connection,
@@ -373,6 +376,7 @@ TALER_MHD_check_content_length_ (struct MHD_Connection 
*connection,
                                         MHD_HTTP_HEADER_CONTENT_LENGTH))
       ? GNUNET_NO
       : GNUNET_SYSERR;
+#endif
   }
   if (1 != sscanf (cl,
                    "%llu%c",
diff --git a/src/testing/testing_api_helpers_bank.c 
b/src/testing/testing_api_helpers_bank.c
index 2507a87e..f2f92956 100644
--- a/src/testing/testing_api_helpers_bank.c
+++ b/src/testing/testing_api_helpers_bank.c
@@ -30,6 +30,10 @@
 #define BANK_FAIL() \
   do {GNUNET_break (0); return NULL; } while (0)
 
+#define JDBC_TALERCHECK \
+  
"jdbc:postgresql://localhost/talercheck?socketFactory=org.newsclub.net.unix." \
+  "AFUNIXSocketFactory$FactoryArg&socketFactoryArg" \
+  "=/var/run/postgresql/.s.PGSQL.5432"
 
 struct TALER_FAKEBANK_Handle *
 TALER_TESTING_run_fakebank (const char *bank_url,
@@ -95,7 +99,7 @@ TALER_TESTING_run_libeufin (const struct 
TALER_TESTING_BankConfiguration *bc)
 
   setenv (
     "LIBEUFIN_NEXUS_DB_CONNECTION",
-    "jdbc:sqlite:/tmp/libeufin-exchange-test-nexusdb.sqlite3",
+    JDBC_TALERCHECK,
     1); // not overwriting any potentially existing DB.
 
   nexus_proc = GNUNET_OS_start_process (
@@ -145,7 +149,7 @@ TALER_TESTING_run_libeufin (const struct 
TALER_TESTING_BankConfiguration *bc)
   fprintf (stderr, "\n");
   setenv (
     "LIBEUFIN_SANDBOX_DB_CONNECTION",
-    "jdbc:sqlite:/tmp/libeufin-exchange-test-sandboxdb.sqlite3",
+    JDBC_TALERCHECK,
     1); // not overwriting any potentially existing DB.
   setenv (
     "LIBEUFIN_SANDBOX_ADMIN_PASSWORD",
@@ -366,7 +370,12 @@ TALER_TESTING_prepare_libeufin (const char 
*config_filename,
   /* DB preparation */
   if (reset_db)
   {
-    if (0 != system ("rm -f /tmp/libeufin-exchange-test-nexusdb.sqlite3"))
+    setenv (
+      "LIBEUFIN_NEXUS_DB_CONNECTION",
+      JDBC_TALERCHECK,
+      1); // not overwriting any potentially existing DB.
+
+    if (0 != system ("libeufin-nexus reset-tables"))
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                   "Failed to invoke db-removal command on nexusdb.\n");
@@ -374,7 +383,13 @@ TALER_TESTING_prepare_libeufin (const char 
*config_filename,
       GNUNET_CONFIGURATION_destroy (cfg);
       return GNUNET_SYSERR;
     }
-    if (0 != system ("rm -f /tmp/libeufin-exchange-test-sandboxdb.sqlite3"))
+
+    setenv (
+      "LIBEUFIN_SANDBOX_DB_CONNECTION",
+      JDBC_TALERCHECK,
+      1); // not overwriting any potentially existing DB.
+
+    if (0 != system ("libeufin-sandbox reset-tables"))
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                   "Failed to invoke db-removal command on sandboxdb.\n");

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.