summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2017-12-10 00:18:48 +0100
committerChristian Grothoff <christian@grothoff.org>2017-12-10 00:18:48 +0100
commit76769e9429a75e40e6b47d6c7b2eddc1ca5fc7d5 (patch)
tree46e732617fea11e03b29b57603330638ddf02664
parent2d658cef65046427caa777e41ae311bffd18bd11 (diff)
downloadexchange-76769e9429a75e40e6b47d6c7b2eddc1ca5fc7d5.tar.gz
exchange-76769e9429a75e40e6b47d6c7b2eddc1ca5fc7d5.tar.bz2
exchange-76769e9429a75e40e6b47d6c7b2eddc1ca5fc7d5.zip
fix test for '*' accepted encoding
-rw-r--r--src/auditor/taler-auditor.c8
-rw-r--r--src/exchange/taler-exchange-httpd_responses.c8
2 files changed, 7 insertions, 9 deletions
diff --git a/src/auditor/taler-auditor.c b/src/auditor/taler-auditor.c
index 7ccb9e897..870a81a42 100644
--- a/src/auditor/taler-auditor.c
+++ b/src/auditor/taler-auditor.c
@@ -2557,11 +2557,9 @@ analyze_aggregations (void *cls)
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Analyzing aggregations\n");
- ac.qs = GNUNET_DB_STATUS_SUCCESS_ONE_RESULT;
- ac.wire_head = NULL;
- ac.wire_tail = NULL;
- ac.fee_head = NULL;
- ac.fee_tail = NULL;
+ memset (&ac,
+ 0,
+ sizeof (ac));
qsx = adb->get_wire_fee_summary (adb->cls,
asession,
&master_pub,
diff --git a/src/exchange/taler-exchange-httpd_responses.c b/src/exchange/taler-exchange-httpd_responses.c
index 64e7a9367..8965e2aaf 100644
--- a/src/exchange/taler-exchange-httpd_responses.c
+++ b/src/exchange/taler-exchange-httpd_responses.c
@@ -70,15 +70,15 @@ TEH_RESPONSE_can_compress (struct MHD_Connection *connection)
MHD_HTTP_HEADER_ACCEPT_ENCODING);
if (NULL == ae)
return MHD_NO;
+ if (0 == strcmp (ae,
+ "*"))
+ return MHD_YES;
de = strstr (ae,
"deflate");
if (NULL == de)
return MHD_NO;
- if (0 == strcmp (de,
- "*"))
- return MHD_YES;
if ( ( (de == ae) ||
- ( de[-1] == ',') ||
+ (de[-1] == ',') ||
(de[-1] == ' ') ) &&
( (de[strlen ("deflate")] == '\0') ||
(de[strlen ("deflate")] == ',') ||