commit 4422cde1a47514c231a82fb51c2e7a47cbe80be0
parent a202e526b3bdada230c6c8adbf5d3ecd6980c866
Author: Christian Grothoff <christian@grothoff.org>
Date: Mon, 16 Jun 2025 23:12:49 +0200
implement #10109: remove cache control from /config
Diffstat:
1 file changed, 5 insertions(+), 33 deletions(-)
diff --git a/src/backend/taler-merchant-httpd_config.c b/src/backend/taler-merchant-httpd_config.c
@@ -83,36 +83,16 @@ MH_handler_config (const struct TMH_RequestHandler *rh,
struct TMH_HandlerContext *hc)
{
static struct MHD_Response *response;
- static struct GNUNET_TIME_Absolute a;
(void) rh;
(void) hc;
- if ( (GNUNET_TIME_absolute_is_past (a)) &&
- (NULL != response) )
- {
- MHD_destroy_response (response);
- response = NULL;
- }
if (NULL == response)
{
json_t *specs = json_object ();
json_t *exchanges = json_array ();
- struct GNUNET_TIME_Timestamp km;
- char dat[128];
GNUNET_assert (NULL != specs);
GNUNET_assert (NULL != exchanges);
- a = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_DAYS);
- /* Round up to next full day to ensure the expiration
- time does not become a fingerprint! */
- a = GNUNET_TIME_absolute_round_down (a,
- GNUNET_TIME_UNIT_DAYS);
- a = GNUNET_TIME_absolute_add (a,
- GNUNET_TIME_UNIT_DAYS);
- /* => /config response stays at most 48h in caches! */
- km = GNUNET_TIME_absolute_to_timestamp (a);
- TALER_MHD_get_date_string (km.abs_time,
- dat);
TMH_exchange_get_trusted (&add_exchange,
exchanges);
for (unsigned int i = 0; i<TMH_num_cspecs; i++)
@@ -121,11 +101,11 @@ MH_handler_config (const struct TMH_RequestHandler *rh,
if (TMH_test_exchange_configured_for_currency (cspec->currency))
GNUNET_assert (0 ==
- json_object_set_new (specs,
- cspec->currency,
- TALER_CONFIG_currency_specs_to_json
- (
- cspec)));
+ json_object_set_new (
+ specs,
+ cspec->currency,
+ TALER_CONFIG_currency_specs_to_json
+ (cspec)));
}
response = TALER_MHD_MAKE_JSON_PACK (
GNUNET_JSON_pack_string ("currency",
@@ -141,14 +121,6 @@ MH_handler_config (const struct TMH_RequestHandler *rh,
"taler-merchant"),
GNUNET_JSON_pack_string ("version",
MERCHANT_PROTOCOL_VERSION));
- GNUNET_break (MHD_YES ==
- MHD_add_response_header (response,
- MHD_HTTP_HEADER_EXPIRES,
- dat));
- GNUNET_break (MHD_YES ==
- MHD_add_response_header (response,
- MHD_HTTP_HEADER_CACHE_CONTROL,
- "public,max-age=21600")); /* 6h */
}
return MHD_queue_response (connection,
MHD_HTTP_OK,