taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix matching

Browse Source
This commit is contained in:
Christian Grothoff 2019-12-08 23:04:41 +01:00
parent a76247276d
commit 496b9ba6a9
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/exchange/taler-exchange-httpd_terms.c
View File

@ -45,7 +45,7 @@ struct Terms
/** /**
* The desired language. * The desired language.
*/ */
const char *language; char *language;
/** /**
* Number of bytes in @e terms. * Number of bytes in @e terms.
@ -215,13 +215,21 @@ TEH_handler_terms (struct TEH_RequestHandler *rh,
p->mime_type)) ) p->mime_type)) )
{ {
if ( (NULL == t) || if ( (NULL == t) ||
(! mime_matches (mime,
t->mime_type)) ||
(language_matches (lang, (language_matches (lang,
p->mime_type) > p->language) >
language_matches (lang, language_matches (lang,
t->mime_type) ) ) t->language) ) )
t = p; t = p;
} }
} }
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Best match for %s/%s: %s / %s\n",
lang,
mime,
(NULL != t) ? t->mime_type : "<none>",
(NULL != t) ? t->language : "<none>");
} }
if (NULL == t) if (NULL == t)
@ -440,7 +448,7 @@ load_terms (const char *path,
struct Terms t = { struct Terms t = {
.mime_type = mime, .mime_type = mime,
.terms = buf, .terms = buf,
.language = lang, .language = GNUNET_strdup (lang),
.terms_size = bsize .terms_size = bsize
}; };

2
src/lib/test_exchange_api.conf
View File

@ -26,8 +26,6 @@ PORT = 8083
[exchange] [exchange]
TERMS_ETAG = 0
TERMS_DIR = /home/grothoff/share/taler-exchange/tos/
# how long is one signkey valid? # how long is one signkey valid?
signkey_duration = 4 weeks signkey_duration = 4 weeks