[taler-anastasis] branch master updated (b99f45c -> 408f4a2)

[gnunet]

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

grothoff pushed a change to branch master
in repository anastasis.

    from b99f45c  use improved dbconfig logic with better error handling and no 
editing of the configuration
     new ecf70e7  -endpoint changed
     new 408f4a2  fix build against 0.9.4 API

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 contrib/gana                                      |  2 +-
 src/authorization/anastasis-authorization-post.sh |  2 +-
 src/backend/anastasis-httpd_policy-upload.c       |  1 -
 src/backend/anastasis-httpd_truth-challenge.c     |  1 -
 src/backend/anastasis-httpd_truth-solve.c         |  1 -
 src/backend/anastasis-httpd_truth-upload.c        |  1 -
 src/restclient/anastasis_api_curl_defaults.c      | 11 +++++++++++
 7 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/contrib/gana b/contrib/gana
index 7bfddee..e9015f6 160000
--- a/contrib/gana
+++ b/contrib/gana
@@ -1 +1 @@
-Subproject commit 7bfddee1d6e2c04beb9f89a42acad70299fc423f
+Subproject commit e9015f67dd6674680a0137b6ef8a04e08a8613e3
diff --git a/src/authorization/anastasis-authorization-post.sh 
b/src/authorization/anastasis-authorization-post.sh
index fb3221f..bbead49 100755
--- a/src/authorization/anastasis-authorization-post.sh
+++ b/src/authorization/anastasis-authorization-post.sh
@@ -8,7 +8,7 @@ set -eu
 # ORG_ID=
 . pingen-secrets
 
-ENDPOINT="https://api.v2.pingen.com";
+ENDPOINT="https://api.pingen.com";
 LOGS="$PWD/authorization-post.log"
 
 MESSAGE=`cat -`
diff --git a/src/backend/anastasis-httpd_policy-upload.c 
b/src/backend/anastasis-httpd_policy-upload.c
index fd4e1ca..83e8117 100644
--- a/src/backend/anastasis-httpd_policy-upload.c
+++ b/src/backend/anastasis-httpd_policy-upload.c
@@ -537,7 +537,6 @@ await_payment (struct PolicyUploadContext *puc)
                                                   AH_backend_url,
                                                   order_id,
                                                   NULL /* our payments are NOT 
session-bound */,
-                                                  false,
                                                   timeout,
                                                   &check_payment_cb,
                                                   puc);
diff --git a/src/backend/anastasis-httpd_truth-challenge.c 
b/src/backend/anastasis-httpd_truth-challenge.c
index b06ec78..a7d138f 100644
--- a/src/backend/anastasis-httpd_truth-challenge.c
+++ b/src/backend/anastasis-httpd_truth-challenge.c
@@ -791,7 +791,6 @@ begin_payment (struct ChallengeContext *gc)
                                                  AH_backend_url,
                                                  order_id,
                                                  NULL /* NOT session-bound */,
-                                                 false,
                                                  timeout,
                                                  &check_payment_cb,
                                                  gc);
diff --git a/src/backend/anastasis-httpd_truth-solve.c 
b/src/backend/anastasis-httpd_truth-solve.c
index bf00237..eb09dc7 100644
--- a/src/backend/anastasis-httpd_truth-solve.c
+++ b/src/backend/anastasis-httpd_truth-solve.c
@@ -638,7 +638,6 @@ begin_payment (struct SolveContext *gc)
                                                  AH_backend_url,
                                                  order_id,
                                                  NULL /* NOT session-bound */,
-                                                 false,
                                                  timeout,
                                                  &check_payment_cb,
                                                  gc);
diff --git a/src/backend/anastasis-httpd_truth-upload.c 
b/src/backend/anastasis-httpd_truth-upload.c
index 105d183..1c2a58d 100644
--- a/src/backend/anastasis-httpd_truth-upload.c
+++ b/src/backend/anastasis-httpd_truth-upload.c
@@ -485,7 +485,6 @@ begin_payment (struct TruthUploadContext *tuc)
                                                 AH_backend_url,
                                                 order_id,
                                                 NULL /* our payments are NOT 
session-bound */,
-                                                false,
                                                 timeout,
                                                 &check_payment_cb,
                                                 tuc);
diff --git a/src/restclient/anastasis_api_curl_defaults.c 
b/src/restclient/anastasis_api_curl_defaults.c
index 33665e0..02a570a 100644
--- a/src/restclient/anastasis_api_curl_defaults.c
+++ b/src/restclient/anastasis_api_curl_defaults.c
@@ -38,6 +38,17 @@ ANASTASIS_curl_easy_get_ (const char *url)
                  curl_easy_setopt (eh,
                                    CURLOPT_FOLLOWLOCATION,
                                    1L));
+  if (0 == strcasecmp (url,
+                       "https://";))
+    GNUNET_assert (CURLE_OK ==
+                   curl_easy_setopt (eh,
+                                     CURLOPT_REDIR_PROTOCOLS_STR,
+                                     "https"));
+  else
+    GNUNET_assert (CURLE_OK ==
+                   curl_easy_setopt (eh,
+                                     CURLOPT_REDIR_PROTOCOLS_STR,
+                                     "http,https"));
   GNUNET_assert (CURLE_OK ==
                  curl_easy_setopt (eh,
                                    CURLOPT_TCP_FASTOPEN,

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