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

handle missconfiguration more nicely

Browse Source
This commit is contained in:
Christian Grothoff 2019-12-08 22:47:57 +01:00
parent b19c7cff91
commit 45a7b98d4b
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -171,6 +171,7 @@ TEH_handler_terms (struct TEH_RequestHandler *rh,
MHD_HEADER_KIND,
MHD_HTTP_HEADER_IF_NONE_MATCH);
if ( (NULL != etag) &&
(NULL != terms_etag) &&
(0 == strcasecmp (etag,
terms_etag)) )
{
@ -205,7 +206,7 @@ TEH_handler_terms (struct TEH_RequestHandler *rh,
mime = "text/html";
/* Find best match: must match mime type (if possible), and if
mime type matches, ideally also language */
for (unsigned int i = 0; NULL != terms[i].terms; i++)
for (unsigned int i = 0; i < terms_len; i++)
{
struct Terms *p = &terms[i];
@ -332,9 +333,10 @@ load_terms (const char *path,
lang);
return;
}
if (0 != strncmp (terms_etag,
name,
ext - name - 1))
if ( (NULL == terms_etag) ||
(0 != strncmp (terms_etag,
name,
ext - name - 1)) )
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"Filename `%s' does not match Etag `%s' in directory `%s/%s'. Ignoring it.\n",