Unwind the stack to handle setlocale errors

4 files changed, 251 insertions, 249 deletions

diff --git a/po/disfluid.pot b/po/disfluid.pot
index 0187767..8587eb6 100644
--- a/po/disfluid.pot
+++ b/po/disfluid.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: disfluid SNAPSHOT\n"
 "Report-Msgid-Bugs-To: vivien@planete-kraus.eu\n"
-"POT-Creation-Date: 2021-10-04 22:52+0200\n"
+"POT-Creation-Date: 2021-10-04 22:59+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -342,7 +342,7 @@ msgid "The application you are trying to authorize behaved unexpectedly."
 msgstr ""
 
 #: src/scm/webid-oidc/authorization-page-unsafe.scm:126
-#: src/scm/webid-oidc/resource-server.scm:290
+#: src/scm/webid-oidc/resource-server.scm:291
 msgid "reason-phrase|Found"
 msgstr ""
 
@@ -876,15 +876,15 @@ msgstr ""
 msgid "<p>The client is compatible with Solid.</p>"
 msgstr ""
 
-#: src/scm/webid-oidc/hello-world.scm:64 src/scm/webid-oidc/program.scm:230
+#: src/scm/webid-oidc/hello-world.scm:64 src/scm/webid-oidc/program.scm:231
 msgid "command-line|version"
 msgstr ""
 
-#: src/scm/webid-oidc/hello-world.scm:66 src/scm/webid-oidc/program.scm:234
+#: src/scm/webid-oidc/hello-world.scm:66 src/scm/webid-oidc/program.scm:235
 msgid "command-line|complete-corresponding-source"
 msgstr ""
 
-#: src/scm/webid-oidc/hello-world.scm:68 src/scm/webid-oidc/program.scm:236
+#: src/scm/webid-oidc/hello-world.scm:68 src/scm/webid-oidc/program.scm:237
 msgid "command-line|help"
 msgstr ""
 
@@ -892,11 +892,11 @@ msgstr ""
 msgid "command-line|port"
 msgstr ""
 
-#: src/scm/webid-oidc/hello-world.scm:72 src/scm/webid-oidc/program.scm:268
+#: src/scm/webid-oidc/hello-world.scm:72 src/scm/webid-oidc/program.scm:269
 msgid "command-line|log-file"
 msgstr ""
 
-#: src/scm/webid-oidc/hello-world.scm:74 src/scm/webid-oidc/program.scm:270
+#: src/scm/webid-oidc/hello-world.scm:74 src/scm/webid-oidc/program.scm:271
 msgid "command-line|error-file"
 msgstr ""
 
@@ -934,7 +934,7 @@ msgstr ""
 msgid "~a version ~a\n"
 msgstr ""
 
-#: src/scm/webid-oidc/hello-world.scm:128 src/scm/webid-oidc/program.scm:632
+#: src/scm/webid-oidc/hello-world.scm:128 src/scm/webid-oidc/program.scm:633
 msgid ""
 "You are legally required to link to the complete corresponding source code.\n"
 msgstr ""
@@ -944,7 +944,7 @@ msgid "The port should be a number between 0 and 65535.\n"
 msgstr ""
 
 #: src/scm/webid-oidc/hello-world.scm:159
-#: src/scm/webid-oidc/resource-server.scm:311
+#: src/scm/webid-oidc/resource-server.scm:312
 msgid "reason-phrase|Unauthorized"
 msgstr ""
 
@@ -957,7 +957,7 @@ msgid "<p>This page requires authentication with Solid.</p>"
 msgstr ""
 
 #: src/scm/webid-oidc/hello-world.scm:179
-#: src/scm/webid-oidc/resource-server.scm:319
+#: src/scm/webid-oidc/resource-server.scm:320
 msgid "reason-phrase|Method Not Allowed"
 msgstr ""
 
@@ -1287,82 +1287,82 @@ msgstr ""
 msgid "(there was an error: ~a)"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:232
+#: src/scm/webid-oidc/program.scm:233
 msgid "command-line|describe-project"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:238
+#: src/scm/webid-oidc/program.scm:239
 msgid "command-line|server|port"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:240
+#: src/scm/webid-oidc/program.scm:241
 msgid "command-line|server|server-name"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:242
+#: src/scm/webid-oidc/program.scm:243
 msgid "command-line|server|reverse-proxy|backend-uri"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:244
+#: src/scm/webid-oidc/program.scm:245
 msgid "command-line|server|reverse-proxy|header"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:246
+#: src/scm/webid-oidc/program.scm:247
 msgid "command-line|server|issuer|key-file"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:248
+#: src/scm/webid-oidc/program.scm:249
 msgid "command-line|server|issuer|subject"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:250
+#: src/scm/webid-oidc/program.scm:251
 msgid "command-line|server|issuer|encrypted-password"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:252
+#: src/scm/webid-oidc/program.scm:253
 msgid "command-line|server|issuer|encrypted-password-from-file"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:254
+#: src/scm/webid-oidc/program.scm:255
 msgid "command-line|server|issuer|jwks-uri"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:256
+#: src/scm/webid-oidc/program.scm:257
 msgid "command-line|server|issuer|authorization-endpoint-uri"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:258
+#: src/scm/webid-oidc/program.scm:259
 msgid "command-line|server|issuer|token-endpoint-uri"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:260
+#: src/scm/webid-oidc/program.scm:261
 msgid "command-line|server|client-id"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:262
+#: src/scm/webid-oidc/program.scm:263
 msgid "command-line|server|redirect-uri"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:264
+#: src/scm/webid-oidc/program.scm:265
 msgid "command-line|server|client-name"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:266
+#: src/scm/webid-oidc/program.scm:267
 msgid "command-line|server|client-uri"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:300
+#: src/scm/webid-oidc/program.scm:301
 #, scheme-format
 msgid "Usage: ~a COMMAND [OPTIONS]...\n"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:304
+#: src/scm/webid-oidc/program.scm:305
 msgid ""
 "\n"
 "Run the disfluid COMMAND."
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:307
+#: src/scm/webid-oidc/program.scm:308
 msgid ""
 "\n"
 "This program is covered by the GNU Affero GPL, version 3 or\n"
@@ -1372,13 +1372,13 @@ msgid ""
 "to all responses."
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:314
+#: src/scm/webid-oidc/program.scm:315
 msgid ""
 "\n"
 "Available commands:"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:316
+#: src/scm/webid-oidc/program.scm:317
 #, scheme-format
 msgid ""
 "\n"
@@ -1386,12 +1386,12 @@ msgid ""
 "      run an authenticating reverse proxy."
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:319 src/scm/webid-oidc/program.scm:514
-#: src/scm/webid-oidc/program.scm:714
+#: src/scm/webid-oidc/program.scm:320 src/scm/webid-oidc/program.scm:515
+#: src/scm/webid-oidc/program.scm:715
 msgid "command-line|command|reverse-proxy"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:320
+#: src/scm/webid-oidc/program.scm:321
 #, scheme-format
 msgid ""
 "\n"
@@ -1399,12 +1399,12 @@ msgid ""
 "      run an identity provider."
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:323 src/scm/webid-oidc/program.scm:539
-#: src/scm/webid-oidc/program.scm:735
+#: src/scm/webid-oidc/program.scm:324 src/scm/webid-oidc/program.scm:540
+#: src/scm/webid-oidc/program.scm:736
 msgid "command-line|command|identity-provider"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:324
+#: src/scm/webid-oidc/program.scm:325
 #, scheme-format
 msgid ""
 "\n"
@@ -1412,12 +1412,12 @@ msgid ""
 "      serve the pages for a public application."
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:327 src/scm/webid-oidc/program.scm:560
-#: src/scm/webid-oidc/program.scm:776
+#: src/scm/webid-oidc/program.scm:328 src/scm/webid-oidc/program.scm:561
+#: src/scm/webid-oidc/program.scm:777
 msgid "command-line|command|client-service"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:328
+#: src/scm/webid-oidc/program.scm:329
 #, scheme-format
 msgid ""
 "\n"
@@ -1426,24 +1426,24 @@ msgid ""
 "      facility."
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:332 src/scm/webid-oidc/program.scm:586
-#: src/scm/webid-oidc/program.scm:805
+#: src/scm/webid-oidc/program.scm:333 src/scm/webid-oidc/program.scm:587
+#: src/scm/webid-oidc/program.scm:806
 msgid "command-line|command|server"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:334
+#: src/scm/webid-oidc/program.scm:335
 msgid ""
 "\n"
 "If no command is specified, run the browser."
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:337
+#: src/scm/webid-oidc/program.scm:338
 msgid ""
 "\n"
 "General options:"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:339
+#: src/scm/webid-oidc/program.scm:340
 #, scheme-format
 msgid ""
 "\n"
@@ -1452,7 +1452,7 @@ msgid ""
 "      code. For instance, this would be an URI pointing to a tarball."
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:344
+#: src/scm/webid-oidc/program.scm:345
 #, scheme-format
 msgid ""
 "\n"
@@ -1460,7 +1460,7 @@ msgid ""
 "      display a short help message and exit."
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:348
+#: src/scm/webid-oidc/program.scm:349
 #, scheme-format
 msgid ""
 "\n"
@@ -1468,7 +1468,7 @@ msgid ""
 "      display the version information (~a, released ~a) and exit."
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:354
+#: src/scm/webid-oidc/program.scm:355
 #, scheme-format
 msgid ""
 "\n"
@@ -1476,7 +1476,7 @@ msgid ""
 "      describe the project in the DOAP vocabulary and exit."
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:358
+#: src/scm/webid-oidc/program.scm:359
 #, scheme-format
 msgid ""
 "\n"
@@ -1484,7 +1484,7 @@ msgid ""
 "      redirect the program standard output to FILE.log."
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:362
+#: src/scm/webid-oidc/program.scm:363
 #, scheme-format
 msgid ""
 "\n"
@@ -1492,13 +1492,13 @@ msgid ""
 "      redirect the program errors to FILE.err."
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:367
+#: src/scm/webid-oidc/program.scm:368
 msgid ""
 "\n"
 "General server-side options:"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:369
+#: src/scm/webid-oidc/program.scm:370
 #, scheme-format
 msgid ""
 "\n"
@@ -1506,7 +1506,7 @@ msgid ""
 "      set the server port to bind, 8080 by default."
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:373
+#: src/scm/webid-oidc/program.scm:374
 #, scheme-format
 msgid ""
 "\n"
@@ -1514,13 +1514,13 @@ msgid ""
 "      set the public server URI (scheme, userinfo, host, and port)."
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:378
+#: src/scm/webid-oidc/program.scm:379
 msgid ""
 "\n"
 "Options for the resource server:"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:380
+#: src/scm/webid-oidc/program.scm:381
 #, scheme-format
 msgid ""
 "\n"
@@ -1530,7 +1530,7 @@ msgid ""
 "      authentication."
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:386
+#: src/scm/webid-oidc/program.scm:387
 #, scheme-format
 msgid ""
 "\n"
@@ -1539,13 +1539,13 @@ msgid ""
 "      reverse-proxy command."
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:392
+#: src/scm/webid-oidc/program.scm:393
 msgid ""
 "\n"
 "Options for the identity provider:"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:394
+#: src/scm/webid-oidc/program.scm:395
 #, scheme-format
 msgid ""
 "\n"
@@ -1554,7 +1554,7 @@ msgid ""
 "      key is generated. The server does not offer an HTTPS service."
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:399
+#: src/scm/webid-oidc/program.scm:400
 #, scheme-format
 msgid ""
 "\n"
@@ -1562,7 +1562,7 @@ msgid ""
 "      set the identity of the subject."
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:403
+#: src/scm/webid-oidc/program.scm:404
 #, scheme-format
 msgid ""
 "\n"
@@ -1570,7 +1570,7 @@ msgid ""
 "      set the encrypted password to recognize the user."
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:407
+#: src/scm/webid-oidc/program.scm:408
 #, scheme-format
 msgid ""
 "\n"
@@ -1578,7 +1578,7 @@ msgid ""
 "      load the user’s encrypted password from ENCRYPTED_PASSWORD_FILE."
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:411
+#: src/scm/webid-oidc/program.scm:412
 #, scheme-format
 msgid ""
 "\n"
@@ -1586,7 +1586,7 @@ msgid ""
 "      set the URI to query the key of the server."
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:415
+#: src/scm/webid-oidc/program.scm:416
 #, scheme-format
 msgid ""
 "\n"
@@ -1594,7 +1594,7 @@ msgid ""
 "      set the authorization endpoint of the issuer."
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:419
+#: src/scm/webid-oidc/program.scm:420
 #, scheme-format
 msgid ""
 "\n"
@@ -1602,13 +1602,13 @@ msgid ""
 "      set the token endpoint of the issuer."
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:424
+#: src/scm/webid-oidc/program.scm:425
 msgid ""
 "\n"
 "Options for the client service:"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:426
+#: src/scm/webid-oidc/program.scm:427
 #, scheme-format
 msgid ""
 "\n"
@@ -1617,7 +1617,7 @@ msgid ""
 "      dereferenced to a semantic resource."
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:431
+#: src/scm/webid-oidc/program.scm:432
 #, scheme-format
 msgid ""
 "\n"
@@ -1626,7 +1626,7 @@ msgid ""
 "      page is presented with the code to paste in the application."
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:436
+#: src/scm/webid-oidc/program.scm:437
 #, scheme-format
 msgid ""
 "\n"
@@ -1634,7 +1634,7 @@ msgid ""
 "      set the user-visible application name (may be misleading...)."
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:440
+#: src/scm/webid-oidc/program.scm:441
 #, scheme-format
 msgid ""
 "\n"
@@ -1643,13 +1643,13 @@ msgid ""
 "      application (again, may be misleading)."
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:446
+#: src/scm/webid-oidc/program.scm:447
 msgid ""
 "\n"
 "Environment variables:"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:448
+#: src/scm/webid-oidc/program.scm:449
 msgid ""
 "\n"
 "  XML_CATALOG_FILES: the server will fetch resources on the web. By\n"
@@ -1660,23 +1660,23 @@ msgid ""
 "      content-type."
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:456 src/scm/webid-oidc/program.scm:463
-#: src/scm/webid-oidc/program.scm:472 src/scm/webid-oidc/program.scm:480
-#: src/scm/webid-oidc/program.scm:488
+#: src/scm/webid-oidc/program.scm:457 src/scm/webid-oidc/program.scm:464
+#: src/scm/webid-oidc/program.scm:473 src/scm/webid-oidc/program.scm:481
+#: src/scm/webid-oidc/program.scm:489
 #, scheme-format
 msgid ""
 "the-environment-variable|\n"
 "      It is currently set to ~s."
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:459
+#: src/scm/webid-oidc/program.scm:460
 msgid ""
 "\n"
 "  LANG: set the locale of the user interface (for the server commands,\n"
 "      the user is the system administrator)."
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:466
+#: src/scm/webid-oidc/program.scm:467
 msgid ""
 "\n"
 "  XDG_DATA_HOME: where the program stores persistent data. The\n"
@@ -1685,7 +1685,7 @@ msgid ""
 "      recommended to set it to /var/lib."
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:475
+#: src/scm/webid-oidc/program.scm:476
 msgid ""
 "\n"
 "  XDG_CACHE_HOME: where the program stores and updates the seed file,\n"
@@ -1693,7 +1693,7 @@ msgid ""
 "      time. The seed file will be initialized from /dev/random."
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:483
+#: src/scm/webid-oidc/program.scm:484
 msgid ""
 "\n"
 "  HOME: if XDG_DATA_HOME or XDG_CACHE_HOME is not set, they are\n"
@@ -1701,13 +1701,13 @@ msgid ""
 "      not used otherwise."
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:492
+#: src/scm/webid-oidc/program.scm:493
 msgid ""
 "\n"
 "Running a reverse proxy"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:494
+#: src/scm/webid-oidc/program.scm:495
 msgid ""
 "\n"
 "Suppose that you operate data.provider.com. You want to run an\n"
@@ -1720,7 +1720,7 @@ msgid ""
 "from this reverse proxy."
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:504
+#: src/scm/webid-oidc/program.scm:505
 #, scheme-format
 msgid ""
 "\n"
@@ -1734,20 +1734,20 @@ msgid ""
 "      --~a '/var/log/proxy.err'"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:519
+#: src/scm/webid-oidc/program.scm:520
 msgid ""
 "\n"
 "Running an identity provider"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:521
+#: src/scm/webid-oidc/program.scm:522
 msgid ""
 "\n"
 "The identity provider running at webid-oidc-demo.planete-kraus.eu is\n"
 "invoked with the following options:"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:525
+#: src/scm/webid-oidc/program.scm:526
 #, scheme-format
 msgid ""
 "\n"
@@ -1766,20 +1766,20 @@ msgid ""
 "      --~a $PORT"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:545
+#: src/scm/webid-oidc/program.scm:546
 msgid ""
 "\n"
 "Running the public pages for an application"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:547
+#: src/scm/webid-oidc/program.scm:548
 msgid ""
 "\n"
 "The example client application pages for\n"
 "webid-oidc-demo.planete-kraus.eu are served this way:"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:551
+#: src/scm/webid-oidc/program.scm:552
 #, scheme-format
 msgid ""
 "\n"
@@ -1795,13 +1795,13 @@ msgid ""
 "      --~a $PORT"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:565
+#: src/scm/webid-oidc/program.scm:566
 msgid ""
 "\n"
 "Running a full server"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:568
+#: src/scm/webid-oidc/program.scm:569
 msgid ""
 "\n"
 "To run the server with identity provider and\n"
@@ -1809,7 +1809,7 @@ msgid ""
 "options for the parts."
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:572
+#: src/scm/webid-oidc/program.scm:573
 #, scheme-format
 msgid ""
 "\n"
@@ -1828,14 +1828,14 @@ msgid ""
 "      --~a '...port...'"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:597
+#: src/scm/webid-oidc/program.scm:598
 #, scheme-format
 msgid ""
 "\n"
 "If you find a bug, then please send a report to ~a."
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:602
+#: src/scm/webid-oidc/program.scm:603
 #, scheme-format
 msgid ""
 "~a version ~a\n"
@@ -1843,101 +1843,101 @@ msgid ""
 "Rreleased ~a\n"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:639
+#: src/scm/webid-oidc/program.scm:640
 #, scheme-format
 msgid "The --~a argument must be a number, not ~s.\n"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:645
+#: src/scm/webid-oidc/program.scm:646
 #, scheme-format
 msgid "The --~a argument must be an integer, not ~s.\n"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:651
+#: src/scm/webid-oidc/program.scm:652
 #, scheme-format
 msgid "The --~a argument must be positive, ~s is invalid.\n"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:656
+#: src/scm/webid-oidc/program.scm:657
 #, scheme-format
 msgid "The --~a argument must be less than 65536, ~s is invalid.\n"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:684
+#: src/scm/webid-oidc/program.scm:685
 msgid ""
 "You specified two different passwords: one directly, and one from a file. "
 "Please set only one password.\n"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:717 src/scm/webid-oidc/program.scm:738
-#: src/scm/webid-oidc/program.scm:807
+#: src/scm/webid-oidc/program.scm:718 src/scm/webid-oidc/program.scm:739
+#: src/scm/webid-oidc/program.scm:808
 #, scheme-format
 msgid "You must pass --~a to set the server name.\n"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:721
+#: src/scm/webid-oidc/program.scm:722
 #, scheme-format
 msgid "You must pass --~a to set the backend URI.\n"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:742 src/scm/webid-oidc/program.scm:811
+#: src/scm/webid-oidc/program.scm:743 src/scm/webid-oidc/program.scm:812
 #, scheme-format
 msgid ""
 "You must pass --~a to set the file where to store the identity provider "
 "key.\n"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:746 src/scm/webid-oidc/program.scm:815
+#: src/scm/webid-oidc/program.scm:747 src/scm/webid-oidc/program.scm:816
 #, scheme-format
 msgid "You must pass --~a to set the subject of the identity provider.\n"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:750
+#: src/scm/webid-oidc/program.scm:751
 #, scheme-format
 msgid "You must pass --~a or --~a to set the subject’s encrypted password.\n"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:754 src/scm/webid-oidc/program.scm:823
+#: src/scm/webid-oidc/program.scm:755 src/scm/webid-oidc/program.scm:824
 #, scheme-format
 msgid "You must pass --~a to set the JWKS URI.\n"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:758 src/scm/webid-oidc/program.scm:827
+#: src/scm/webid-oidc/program.scm:759 src/scm/webid-oidc/program.scm:828
 #, scheme-format
 msgid "You must pass --~a to set the authorization endpoint URI.\n"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:762 src/scm/webid-oidc/program.scm:831
+#: src/scm/webid-oidc/program.scm:763 src/scm/webid-oidc/program.scm:832
 #, scheme-format
 msgid "You must pass --~a to set the token endpoint URI.\n"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:779
+#: src/scm/webid-oidc/program.scm:780
 #, scheme-format
 msgid "You must pass --~a to set the application web ID.\n"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:783
+#: src/scm/webid-oidc/program.scm:784
 #, scheme-format
 msgid "You must pass --~a to set the redirection URI.\n"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:787
+#: src/scm/webid-oidc/program.scm:788
 #, scheme-format
 msgid "You must pass --~a to set the informative client name.\n"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:791
+#: src/scm/webid-oidc/program.scm:792
 #, scheme-format
 msgid "You must pass --~a to set the informative client URI.\n"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:819
+#: src/scm/webid-oidc/program.scm:820
 #, scheme-format
 msgid "You must pass --~a to set the subject’s encrypted password.\n"
 msgstr ""
 
-#: src/scm/webid-oidc/program.scm:871
+#: src/scm/webid-oidc/program.scm:872
 #, scheme-format
 msgid "Unknown command ~s\n"
 msgstr ""
@@ -1967,47 +1967,47 @@ msgstr ""
 msgid "~a: authentication failure\n"
 msgstr ""
 
-#: src/scm/webid-oidc/resource-server.scm:157
-#: src/scm/webid-oidc/resource-server.scm:342
+#: src/scm/webid-oidc/resource-server.scm:158
+#: src/scm/webid-oidc/resource-server.scm:343
 msgid "reason-phrase|Precondition Failed"
 msgstr ""
 
-#: src/scm/webid-oidc/resource-server.scm:172
+#: src/scm/webid-oidc/resource-server.scm:173
 msgid "reason-phrase|Not Modified"
 msgstr ""
 
-#: src/scm/webid-oidc/resource-server.scm:187
+#: src/scm/webid-oidc/resource-server.scm:188
 msgid "The owner is not defined."
 msgstr ""
 
-#: src/scm/webid-oidc/resource-server.scm:256
+#: src/scm/webid-oidc/resource-server.scm:257
 msgid "reason-phrase|Created"
 msgstr ""
 
-#: src/scm/webid-oidc/resource-server.scm:279
+#: src/scm/webid-oidc/resource-server.scm:280
 #, scheme-format
 msgid "~a: ignoring a group that cannot be fetched: ~a\n"
 msgstr ""
 
-#: src/scm/webid-oidc/resource-server.scm:283
+#: src/scm/webid-oidc/resource-server.scm:284
 #, scheme-format
 msgid "~a: ignoring a group that cannot be fetched\n"
 msgstr ""
 
-#: src/scm/webid-oidc/resource-server.scm:307
+#: src/scm/webid-oidc/resource-server.scm:308
 #: src/scm/webid-oidc/token-endpoint.scm:104
 msgid "reason-phrase|Forbidden"
 msgstr ""
 
-#: src/scm/webid-oidc/resource-server.scm:328
+#: src/scm/webid-oidc/resource-server.scm:329
 msgid "reason-phrase|Conflict"
 msgstr ""
 
-#: src/scm/webid-oidc/resource-server.scm:335
+#: src/scm/webid-oidc/resource-server.scm:336
 msgid "reason-phrase|Unsupported Media Type"
 msgstr ""
 
-#: src/scm/webid-oidc/resource-server.scm:349
+#: src/scm/webid-oidc/resource-server.scm:350
 msgid "reason-phrase|Not Acceptable"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index e7d5d7f..83b28dd 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: webid-oidc 0.0.0\n"
 "Report-Msgid-Bugs-To: vivien@planete-kraus.eu\n"
-"POT-Creation-Date: 2021-10-04 22:52+0200\n"
-"PO-Revision-Date: 2021-10-04 22:56+0200\n"
+"POT-Creation-Date: 2021-10-04 22:59+0200\n"
+"PO-Revision-Date: 2021-10-04 22:59+0200\n"
 "Last-Translator: Vivien Kraus <vivien@planete-kraus.eu>\n"
 "Language-Team: French <vivien@planete-kraus.eu>\n"
 "Language: fr\n"
@@ -374,7 +374,7 @@ msgstr ""
 "L’application que vous essayez d’autoriser se comporte de façon inattendue."
 
 #: src/scm/webid-oidc/authorization-page-unsafe.scm:126
-#: src/scm/webid-oidc/resource-server.scm:290
+#: src/scm/webid-oidc/resource-server.scm:291
 msgid "reason-phrase|Found"
 msgstr "Trouvé"
 
@@ -951,15 +951,15 @@ msgstr "<h1>Bonjour, ~a !</h1>"
 msgid "<p>The client is compatible with Solid.</p>"
 msgstr "<p>Le client est compatible avec Solid.</p>"
 
-#: src/scm/webid-oidc/hello-world.scm:64 src/scm/webid-oidc/program.scm:230
+#: src/scm/webid-oidc/hello-world.scm:64 src/scm/webid-oidc/program.scm:231
 msgid "command-line|version"
 msgstr "version"
 
-#: src/scm/webid-oidc/hello-world.scm:66 src/scm/webid-oidc/program.scm:234
+#: src/scm/webid-oidc/hello-world.scm:66 src/scm/webid-oidc/program.scm:235
 msgid "command-line|complete-corresponding-source"
 msgstr "code-source-correspondant-complet"
 
-#: src/scm/webid-oidc/hello-world.scm:68 src/scm/webid-oidc/program.scm:236
+#: src/scm/webid-oidc/hello-world.scm:68 src/scm/webid-oidc/program.scm:237
 msgid "command-line|help"
 msgstr "aide"
 
@@ -967,11 +967,11 @@ msgstr "aide"
 msgid "command-line|port"
 msgstr "port"
 
-#: src/scm/webid-oidc/hello-world.scm:72 src/scm/webid-oidc/program.scm:268
+#: src/scm/webid-oidc/hello-world.scm:72 src/scm/webid-oidc/program.scm:269
 msgid "command-line|log-file"
 msgstr "fichier-journal"
 
-#: src/scm/webid-oidc/hello-world.scm:74 src/scm/webid-oidc/program.scm:270
+#: src/scm/webid-oidc/hello-world.scm:74 src/scm/webid-oidc/program.scm:271
 msgid "command-line|error-file"
 msgstr "fichier-erreur"
 
@@ -1034,7 +1034,7 @@ msgstr ""
 msgid "~a version ~a\n"
 msgstr "~a version ~a\n"
 
-#: src/scm/webid-oidc/hello-world.scm:128 src/scm/webid-oidc/program.scm:632
+#: src/scm/webid-oidc/hello-world.scm:128 src/scm/webid-oidc/program.scm:633
 msgid ""
 "You are legally required to link to the complete corresponding source code.\n"
 msgstr ""
@@ -1046,7 +1046,7 @@ msgid "The port should be a number between 0 and 65535.\n"
 msgstr "Le port doit être un nombre entre 0 et 65535.\n"
 
 #: src/scm/webid-oidc/hello-world.scm:159
-#: src/scm/webid-oidc/resource-server.scm:311
+#: src/scm/webid-oidc/resource-server.scm:312
 msgid "reason-phrase|Unauthorized"
 msgstr "Non Autorisé"
 
@@ -1059,7 +1059,7 @@ msgid "<p>This page requires authentication with Solid.</p>"
 msgstr "<p>Cette page requiert une authentification avec Solid.</p>"
 
 #: src/scm/webid-oidc/hello-world.scm:179
-#: src/scm/webid-oidc/resource-server.scm:319
+#: src/scm/webid-oidc/resource-server.scm:320
 msgid "reason-phrase|Method Not Allowed"
 msgstr "Méthode Non Autorisée"
 
@@ -1418,76 +1418,76 @@ msgstr "~a : ~a"
 msgid "(there was an error: ~a)"
 msgstr "(il y a eu une erreur : ~a)"
 
-#: src/scm/webid-oidc/program.scm:232
+#: src/scm/webid-oidc/program.scm:233
 msgid "command-line|describe-project"
 msgstr "décrire-projet"
 
-#: src/scm/webid-oidc/program.scm:238
+#: src/scm/webid-oidc/program.scm:239
 msgid "command-line|server|port"
 msgstr "port"
 
-#: src/scm/webid-oidc/program.scm:240
+#: src/scm/webid-oidc/program.scm:241
 msgid "command-line|server|server-name"
 msgstr "nom-du-serveur"
 
-#: src/scm/webid-oidc/program.scm:242
+#: src/scm/webid-oidc/program.scm:243
 msgid "command-line|server|reverse-proxy|backend-uri"
 msgstr "uri-arrière-plan"
 
-#: src/scm/webid-oidc/program.scm:244
+#: src/scm/webid-oidc/program.scm:245
 msgid "command-line|server|reverse-proxy|header"
 msgstr "en-tête"
 
-#: src/scm/webid-oidc/program.scm:246
+#: src/scm/webid-oidc/program.scm:247
 msgid "command-line|server|issuer|key-file"
 msgstr "fichier-clé"
 
-#: src/scm/webid-oidc/program.scm:248
+#: src/scm/webid-oidc/program.scm:249
 msgid "command-line|server|issuer|subject"
 msgstr "sujet"
 
-#: src/scm/webid-oidc/program.scm:250
+#: src/scm/webid-oidc/program.scm:251
 msgid "command-line|server|issuer|encrypted-password"
 msgstr "mot-de-passe-chiffré"
 
-#: src/scm/webid-oidc/program.scm:252
+#: src/scm/webid-oidc/program.scm:253
 msgid "command-line|server|issuer|encrypted-password-from-file"
 msgstr "fichier-de-mot-de-passe-chiffré"
 
-#: src/scm/webid-oidc/program.scm:254
+#: src/scm/webid-oidc/program.scm:255
 msgid "command-line|server|issuer|jwks-uri"
 msgstr "uri-jwks"
 
-#: src/scm/webid-oidc/program.scm:256
+#: src/scm/webid-oidc/program.scm:257
 msgid "command-line|server|issuer|authorization-endpoint-uri"
 msgstr "uri-terminal-autorisation"
 
-#: src/scm/webid-oidc/program.scm:258
+#: src/scm/webid-oidc/program.scm:259
 msgid "command-line|server|issuer|token-endpoint-uri"
 msgstr "uri-terminal-jeton"
 
-#: src/scm/webid-oidc/program.scm:260
+#: src/scm/webid-oidc/program.scm:261
 msgid "command-line|server|client-id"
 msgstr "id-client"
 
-#: src/scm/webid-oidc/program.scm:262
+#: src/scm/webid-oidc/program.scm:263
 msgid "command-line|server|redirect-uri"
 msgstr "uri-redirection"
 
-#: src/scm/webid-oidc/program.scm:264
+#: src/scm/webid-oidc/program.scm:265
 msgid "command-line|server|client-name"
 msgstr "nom-client"
 
-#: src/scm/webid-oidc/program.scm:266
+#: src/scm/webid-oidc/program.scm:267
 msgid "command-line|server|client-uri"
 msgstr "uri-client"
 
-#: src/scm/webid-oidc/program.scm:300
+#: src/scm/webid-oidc/program.scm:301
 #, scheme-format
 msgid "Usage: ~a COMMAND [OPTIONS]...\n"
 msgstr "Utilisation : ~a COMMANDE [OPTIONS]...\n"
 
-#: src/scm/webid-oidc/program.scm:304
+#: src/scm/webid-oidc/program.scm:305
 msgid ""
 "\n"
 "Run the disfluid COMMAND."
@@ -1495,7 +1495,7 @@ msgstr ""
 "\n"
 "Exécute la COMMANDE disfluid."
 
-#: src/scm/webid-oidc/program.scm:307
+#: src/scm/webid-oidc/program.scm:308
 msgid ""
 "\n"
 "This program is covered by the GNU Affero GPL, version 3 or\n"
@@ -1511,7 +1511,7 @@ msgstr ""
 "code source complet correspondant (avec vos modifications) sans\n"
 "frais. Le serveur ajoute un en-tête « Source: » à toutes les réponses."
 
-#: src/scm/webid-oidc/program.scm:314
+#: src/scm/webid-oidc/program.scm:315
 msgid ""
 "\n"
 "Available commands:"
@@ -1519,7 +1519,7 @@ msgstr ""
 "\n"
 "Commandes disponibles :"
 
-#: src/scm/webid-oidc/program.scm:316
+#: src/scm/webid-oidc/program.scm:317
 #, scheme-format
 msgid ""
 "\n"
@@ -1530,12 +1530,12 @@ msgstr ""
 "  ~a :\n"
 "      exécute le proxy inverse authentifiant."
 
-#: src/scm/webid-oidc/program.scm:319 src/scm/webid-oidc/program.scm:514
-#: src/scm/webid-oidc/program.scm:714
+#: src/scm/webid-oidc/program.scm:320 src/scm/webid-oidc/program.scm:515
+#: src/scm/webid-oidc/program.scm:715
 msgid "command-line|command|reverse-proxy"
 msgstr "proxy-inversé"
 
-#: src/scm/webid-oidc/program.scm:320
+#: src/scm/webid-oidc/program.scm:321
 #, scheme-format
 msgid ""
 "\n"
@@ -1546,12 +1546,12 @@ msgstr ""
 "  ~a :\n"
 "      exécute un fournisseur d’identité."
 
-#: src/scm/webid-oidc/program.scm:323 src/scm/webid-oidc/program.scm:539
-#: src/scm/webid-oidc/program.scm:735
+#: src/scm/webid-oidc/program.scm:324 src/scm/webid-oidc/program.scm:540
+#: src/scm/webid-oidc/program.scm:736
 msgid "command-line|command|identity-provider"
 msgstr "fournisseur-identité"
 
-#: src/scm/webid-oidc/program.scm:324
+#: src/scm/webid-oidc/program.scm:325
 #, scheme-format
 msgid ""
 "\n"
@@ -1562,12 +1562,12 @@ msgstr ""
 "  ~a :\n"
 "      sert les pages d’une application publique."
 
-#: src/scm/webid-oidc/program.scm:327 src/scm/webid-oidc/program.scm:560
-#: src/scm/webid-oidc/program.scm:776
+#: src/scm/webid-oidc/program.scm:328 src/scm/webid-oidc/program.scm:561
+#: src/scm/webid-oidc/program.scm:777
 msgid "command-line|command|client-service"
 msgstr "service-client"
 
-#: src/scm/webid-oidc/program.scm:328
+#: src/scm/webid-oidc/program.scm:329
 #, scheme-format
 msgid ""
 "\n"
@@ -1580,12 +1580,12 @@ msgstr ""
 "      exécute un serveur complet, avec un fournisseur d’identité et\n"
 "      une fonction de stockage de ressources."
 
-#: src/scm/webid-oidc/program.scm:332 src/scm/webid-oidc/program.scm:586
-#: src/scm/webid-oidc/program.scm:805
+#: src/scm/webid-oidc/program.scm:333 src/scm/webid-oidc/program.scm:587
+#: src/scm/webid-oidc/program.scm:806
 msgid "command-line|command|server"
 msgstr "serveur"
 
-#: src/scm/webid-oidc/program.scm:334
+#: src/scm/webid-oidc/program.scm:335
 msgid ""
 "\n"
 "If no command is specified, run the browser."
@@ -1593,7 +1593,7 @@ msgstr ""
 "\n"
 "Si aucune commande n’est spécifiée, exécute le navigateur."
 
-#: src/scm/webid-oidc/program.scm:337
+#: src/scm/webid-oidc/program.scm:338
 msgid ""
 "\n"
 "General options:"
@@ -1601,7 +1601,7 @@ msgstr ""
 "\n"
 "Options générales :"
 
-#: src/scm/webid-oidc/program.scm:339
+#: src/scm/webid-oidc/program.scm:340
 #, scheme-format
 msgid ""
 "\n"
@@ -1615,7 +1615,7 @@ msgstr ""
 "      correspondant. Par exemple, MOYEN serait une URI pointant vers\n"
 "      l’archive de code."
 
-#: src/scm/webid-oidc/program.scm:344
+#: src/scm/webid-oidc/program.scm:345
 #, scheme-format
 msgid ""
 "\n"
@@ -1626,7 +1626,7 @@ msgstr ""
 "  -h, --~a :\n"
 "      affiche un court message d’aide et quitte."
 
-#: src/scm/webid-oidc/program.scm:348
+#: src/scm/webid-oidc/program.scm:349
 #, scheme-format
 msgid ""
 "\n"
@@ -1637,7 +1637,7 @@ msgstr ""
 "  -v, --~a :\n"
 "      affiche le numéro de version (~a, publiée le ~a) et quitte."
 
-#: src/scm/webid-oidc/program.scm:354
+#: src/scm/webid-oidc/program.scm:355
 #, scheme-format
 msgid ""
 "\n"
@@ -1648,7 +1648,7 @@ msgstr ""
 "      --~a :\n"
 "      décrit le projet dans le vocabulaire DOAP et quitte."
 
-#: src/scm/webid-oidc/program.scm:358
+#: src/scm/webid-oidc/program.scm:359
 #, scheme-format
 msgid ""
 "\n"
@@ -1659,7 +1659,7 @@ msgstr ""
 "  -l FICHIER.journal, --~a=FICHIER.journal :\n"
 "      redirige la sortie standard du programme vers FICHIER.journal."
 
-#: src/scm/webid-oidc/program.scm:362
+#: src/scm/webid-oidc/program.scm:363
 #, scheme-format
 msgid ""
 "\n"
@@ -1670,7 +1670,7 @@ msgstr ""
 "  -e FICHIER.erreurs, --~a=FICHIER.erreurs :\n"
 "      redirige les erreurs du programme vers FICHIER.erreurs."
 
-#: src/scm/webid-oidc/program.scm:367
+#: src/scm/webid-oidc/program.scm:368
 msgid ""
 "\n"
 "General server-side options:"
@@ -1678,7 +1678,7 @@ msgstr ""
 "\n"
 "Options générales pour un serveur :"
 
-#: src/scm/webid-oidc/program.scm:369
+#: src/scm/webid-oidc/program.scm:370
 #, scheme-format
 msgid ""
 "\n"
@@ -1689,7 +1689,7 @@ msgstr ""
 "  -p PORT, --~a=PORT :\n"
 "      définit le port à lier, 8080 par défaut."
 
-#: src/scm/webid-oidc/program.scm:373
+#: src/scm/webid-oidc/program.scm:374
 #, scheme-format
 msgid ""
 "\n"
@@ -1701,7 +1701,7 @@ msgstr ""
 "      définit l’URI publique du serveur (schéma, identifiant de\n"
 "      l’utilisateur, hôte et port)."
 
-#: src/scm/webid-oidc/program.scm:378
+#: src/scm/webid-oidc/program.scm:379
 msgid ""
 "\n"
 "Options for the resource server:"
@@ -1709,7 +1709,7 @@ msgstr ""
 "\n"
 "Options pour le serveur de ressources :"
 
-#: src/scm/webid-oidc/program.scm:380
+#: src/scm/webid-oidc/program.scm:381
 #, scheme-format
 msgid ""
 "\n"
@@ -1724,7 +1724,7 @@ msgstr ""
 "      authentifié, XXX-Agent par défaut. Pour un serveur complet, ceci\n"
 "      désactive l’authentification par Solid-OIDC."
 
-#: src/scm/webid-oidc/program.scm:386
+#: src/scm/webid-oidc/program.scm:387
 #, scheme-format
 msgid ""
 "\n"
@@ -1737,7 +1737,7 @@ msgstr ""
 "      définit l’URI sortante du proxy inversé, seulement pour la\n"
 "      commande proxy-inversé."
 
-#: src/scm/webid-oidc/program.scm:392
+#: src/scm/webid-oidc/program.scm:393
 msgid ""
 "\n"
 "Options for the identity provider:"
@@ -1745,7 +1745,7 @@ msgstr ""
 "\n"
 "Options du fournisseur d’identité :"
 
-#: src/scm/webid-oidc/program.scm:394
+#: src/scm/webid-oidc/program.scm:395
 #, scheme-format
 msgid ""
 "\n"
@@ -1759,7 +1759,7 @@ msgstr ""
 "      nouvelle clé sera générée. Le serveur n’offre pas de service\n"
 "      HTTPS."
 
-#: src/scm/webid-oidc/program.scm:399
+#: src/scm/webid-oidc/program.scm:400
 #, scheme-format
 msgid ""
 "\n"
@@ -1770,7 +1770,7 @@ msgstr ""
 "  -s WEBID, --~a=WEBID :\n"
 "      définit l'identité du sujet."
 
-#: src/scm/webid-oidc/program.scm:403
+#: src/scm/webid-oidc/program.scm:404
 #, scheme-format
 msgid ""
 "\n"
@@ -1781,7 +1781,7 @@ msgstr ""
 "  -w MOT_DE_PASSE_CHIFFRÉ, --~a=MOT_DE_PASSE_CHIFFRÉ :\n"
 "      définit le mot de passe chiffré pour reconnaître l’utilisateur."
 
-#: src/scm/webid-oidc/program.scm:407
+#: src/scm/webid-oidc/program.scm:408
 #, scheme-format
 msgid ""
 "\n"
@@ -1794,7 +1794,7 @@ msgstr ""
 "      lit le mot de passe chiffré de l’utilisateur dans "
 "FICHIER_DE_MOT_DE_PASSE_CHIFFRÉ."
 
-#: src/scm/webid-oidc/program.scm:411
+#: src/scm/webid-oidc/program.scm:412
 #, scheme-format
 msgid ""
 "\n"
@@ -1805,7 +1805,7 @@ msgstr ""
 "  -j URI, --~a=URI :\n"
 "        définit l’URI pour requêter les clés du serveur."
 
-#: src/scm/webid-oidc/program.scm:415
+#: src/scm/webid-oidc/program.scm:416
 #, scheme-format
 msgid ""
 "\n"
@@ -1817,7 +1817,7 @@ msgstr ""
 "      définit l'URI du terminal d'autorisation de l’émetteur\n"
 "      d’identité."
 
-#: src/scm/webid-oidc/program.scm:419
+#: src/scm/webid-oidc/program.scm:420
 #, scheme-format
 msgid ""
 "\n"
@@ -1828,7 +1828,7 @@ msgstr ""
 "  -t URI, --~a=URI :\n"
 "      définit le terminal de jeton de l’émetteur d’identité."
 
-#: src/scm/webid-oidc/program.scm:424
+#: src/scm/webid-oidc/program.scm:425
 msgid ""
 "\n"
 "Options for the client service:"
@@ -1836,7 +1836,7 @@ msgstr ""
 "\n"
 "Options pour le service associé à un client :"
 
-#: src/scm/webid-oidc/program.scm:426
+#: src/scm/webid-oidc/program.scm:427
 #, scheme-format
 msgid ""
 "\n"
@@ -1849,7 +1849,7 @@ msgstr ""
 "      définit l’identifiant web de l’application client, qui est\n"
 "      déréférencé pour une ressource sémantique."
 
-#: src/scm/webid-oidc/program.scm:431
+#: src/scm/webid-oidc/program.scm:432
 #, scheme-format
 msgid ""
 "\n"
@@ -1863,7 +1863,7 @@ msgstr ""
 "      d’autorisation. La page de redirection affiche le code à coller\n"
 "      dans l’application."
 
-#: src/scm/webid-oidc/program.scm:436
+#: src/scm/webid-oidc/program.scm:437
 #, scheme-format
 msgid ""
 "\n"
@@ -1875,7 +1875,7 @@ msgstr ""
 "      définit le nom de l’application visible par l’utilisateur (peut\n"
 "      être trompeur…)."
 
-#: src/scm/webid-oidc/program.scm:440
+#: src/scm/webid-oidc/program.scm:441
 #, scheme-format
 msgid ""
 "\n"
@@ -1888,7 +1888,7 @@ msgstr ""
 "      définit l’URI présentant plus d’informations à propos de\n"
 "      l’application (peut aussi être trompeur)."
 
-#: src/scm/webid-oidc/program.scm:446
+#: src/scm/webid-oidc/program.scm:447
 msgid ""
 "\n"
 "Environment variables:"
@@ -1896,7 +1896,7 @@ msgstr ""
 "\n"
 "Variables d’environnement :"
 
-#: src/scm/webid-oidc/program.scm:448
+#: src/scm/webid-oidc/program.scm:449
 msgid ""
 "\n"
 "  XML_CATALOG_FILES: the server will fetch resources on the web. By\n"
@@ -1915,9 +1915,9 @@ msgstr ""
 "      fichiers depuis le système de fichiers, parce qu’il n’y a pas de\n"
 "      moyen de spécifier le type de contenu."
 
-#: src/scm/webid-oidc/program.scm:456 src/scm/webid-oidc/program.scm:463
-#: src/scm/webid-oidc/program.scm:472 src/scm/webid-oidc/program.scm:480
-#: src/scm/webid-oidc/program.scm:488
+#: src/scm/webid-oidc/program.scm:457 src/scm/webid-oidc/program.scm:464
+#: src/scm/webid-oidc/program.scm:473 src/scm/webid-oidc/program.scm:481
+#: src/scm/webid-oidc/program.scm:489
 #, scheme-format
 msgid ""
 "the-environment-variable|\n"
@@ -1926,7 +1926,7 @@ msgstr ""
 " \n"
 "      Elle vaut actuellement ~s."
 
-#: src/scm/webid-oidc/program.scm:459
+#: src/scm/webid-oidc/program.scm:460
 msgid ""
 "\n"
 "  LANG: set the locale of the user interface (for the server commands,\n"
@@ -1936,7 +1936,7 @@ msgstr ""
 "  LANG : définit la locale de l’interface utilisateur (pour les\n"
 "      commandes serveur, l’utilisateur est l’administrateur système)."
 
-#: src/scm/webid-oidc/program.scm:466
+#: src/scm/webid-oidc/program.scm:467
 msgid ""
 "\n"
 "  XDG_DATA_HOME: where the program stores persistent data. The\n"
@@ -1951,7 +1951,7 @@ msgstr ""
 "      ici. Pour un service système, il est recommandé d’utiliser\n"
 "      /var/lib."
 
-#: src/scm/webid-oidc/program.scm:475
+#: src/scm/webid-oidc/program.scm:476
 msgid ""
 "\n"
 "  XDG_CACHE_HOME: where the program stores and updates the seed file,\n"
@@ -1964,7 +1964,7 @@ msgstr ""
 "      supprimer ce dossier n’importe quand. Le fichier de graine sera\n"
 "      initialisé à partir de /dev/random."
 
-#: src/scm/webid-oidc/program.scm:483
+#: src/scm/webid-oidc/program.scm:484
 msgid ""
 "\n"
 "  HOME: if XDG_DATA_HOME or XDG_CACHE_HOME is not set, they are\n"
@@ -1976,7 +1976,7 @@ msgstr ""
 "      valeur est calculée à partir de la variable d’environnement\n"
 "      HOME. Elle n’est pas utilisée autrement."
 
-#: src/scm/webid-oidc/program.scm:492
+#: src/scm/webid-oidc/program.scm:493
 msgid ""
 "\n"
 "Running a reverse proxy"
@@ -1984,7 +1984,7 @@ msgstr ""
 "\n"
 "Exécution d’un proxy inversé"
 
-#: src/scm/webid-oidc/program.scm:494
+#: src/scm/webid-oidc/program.scm:495
 msgid ""
 "\n"
 "Suppose that you operate data.provider.com. You want to run an\n"
@@ -2006,7 +2006,7 @@ msgstr ""
 "authentifié. https://private.data.provider.com ne doit accepter que\n"
 "les requêtes depuis ce proxy inversé."
 
-#: src/scm/webid-oidc/program.scm:504
+#: src/scm/webid-oidc/program.scm:505
 #, scheme-format
 msgid ""
 "\n"
@@ -2030,7 +2030,7 @@ msgstr ""
 "      --~a '/var/log/proxy.log' \\\n"
 "      --~a '/var/log/proxy.err'"
 
-#: src/scm/webid-oidc/program.scm:519
+#: src/scm/webid-oidc/program.scm:520
 msgid ""
 "\n"
 "Running an identity provider"
@@ -2038,7 +2038,7 @@ msgstr ""
 "\n"
 "Exécution d’un fournisseur d’identité"
 
-#: src/scm/webid-oidc/program.scm:521
+#: src/scm/webid-oidc/program.scm:522
 msgid ""
 "\n"
 "The identity provider running at webid-oidc-demo.planete-kraus.eu is\n"
@@ -2049,7 +2049,7 @@ msgstr ""
 "webid-oidc-demo.planete-kraus.eu est invoqué avec les options\n"
 "suivantes :"
 
-#: src/scm/webid-oidc/program.scm:525
+#: src/scm/webid-oidc/program.scm:526
 #, scheme-format
 msgid ""
 "\n"
@@ -2083,7 +2083,7 @@ msgstr ""
 "      --~a 'https://webid-oidc-demo.planete-kraus.eu/token' \\\n"
 "      --~a $PORT"
 
-#: src/scm/webid-oidc/program.scm:545
+#: src/scm/webid-oidc/program.scm:546
 msgid ""
 "\n"
 "Running the public pages for an application"
@@ -2091,7 +2091,7 @@ msgstr ""
 "\n"
 "Service des pages publiques pour une application"
 
-#: src/scm/webid-oidc/program.scm:547
+#: src/scm/webid-oidc/program.scm:548
 msgid ""
 "\n"
 "The example client application pages for\n"
@@ -2101,7 +2101,7 @@ msgstr ""
 "Les pages de l’application client d’exemple pour\n"
 "webid-oidc-demo.planete-kraus.eu sont servies de cette façon :"
 
-#: src/scm/webid-oidc/program.scm:551
+#: src/scm/webid-oidc/program.scm:552
 #, scheme-format
 msgid ""
 "\n"
@@ -2129,7 +2129,7 @@ msgstr ""
 "html#Running-a-client' \\\n"
 "      --~a $PORT"
 
-#: src/scm/webid-oidc/program.scm:565
+#: src/scm/webid-oidc/program.scm:566
 msgid ""
 "\n"
 "Running a full server"
@@ -2137,7 +2137,7 @@ msgstr ""
 "\n"
 "Exécution d’un serveur complet"
 
-#: src/scm/webid-oidc/program.scm:568
+#: src/scm/webid-oidc/program.scm:569
 msgid ""
 "\n"
 "To run the server with identity provider and\n"
@@ -2149,7 +2149,7 @@ msgstr ""
 "un serveur de ressources pour un utilisateur particulier, vous devez\n"
 "combiner les options des parties."
 
-#: src/scm/webid-oidc/program.scm:572
+#: src/scm/webid-oidc/program.scm:573
 #, scheme-format
 msgid ""
 "\n"
@@ -2183,7 +2183,7 @@ msgstr ""
 "      --~a 'https://data.planete-kraus.eu/token' \\\n"
 "      --~a '...port...'"
 
-#: src/scm/webid-oidc/program.scm:597
+#: src/scm/webid-oidc/program.scm:598
 #, scheme-format
 msgid ""
 "\n"
@@ -2192,7 +2192,7 @@ msgstr ""
 "\n"
 "Si vous trouvez une erreur, veuillez en envoyer un rapport à ~a."
 
-#: src/scm/webid-oidc/program.scm:602
+#: src/scm/webid-oidc/program.scm:603
 #, scheme-format
 msgid ""
 "~a version ~a\n"
@@ -2203,27 +2203,27 @@ msgstr ""
 "\n"
 "Publiée le ~a\n"
 
-#: src/scm/webid-oidc/program.scm:639
+#: src/scm/webid-oidc/program.scm:640
 #, scheme-format
 msgid "The --~a argument must be a number, not ~s.\n"
 msgstr "L’argument de --~a doit être un nombre, pas ~s.\n"
 
-#: src/scm/webid-oidc/program.scm:645
+#: src/scm/webid-oidc/program.scm:646
 #, scheme-format
 msgid "The --~a argument must be an integer, not ~s.\n"
 msgstr "L’argument de --~a doit être un entier, pas ~s.\n"
 
-#: src/scm/webid-oidc/program.scm:651
+#: src/scm/webid-oidc/program.scm:652
 #, scheme-format
 msgid "The --~a argument must be positive, ~s is invalid.\n"
 msgstr "L’argument de --~a doit être positif, ~s est invalide.\n"
 
-#: src/scm/webid-oidc/program.scm:656
+#: src/scm/webid-oidc/program.scm:657
 #, scheme-format
 msgid "The --~a argument must be less than 65536, ~s is invalid.\n"
 msgstr "L’argument de --~a doit être inférieur à 65536, ~s est invalide.\n"
 
-#: src/scm/webid-oidc/program.scm:684
+#: src/scm/webid-oidc/program.scm:685
 msgid ""
 "You specified two different passwords: one directly, and one from a file. "
 "Please set only one password.\n"
@@ -2231,18 +2231,18 @@ msgstr ""
 "Vous avez spécifié deux mots de passe différents : l’un directement,\n"
 "et un autre depuis un fichier. Veuillez n’en spécifier qu’un.\n"
 
-#: src/scm/webid-oidc/program.scm:717 src/scm/webid-oidc/program.scm:738
-#: src/scm/webid-oidc/program.scm:807
+#: src/scm/webid-oidc/program.scm:718 src/scm/webid-oidc/program.scm:739
+#: src/scm/webid-oidc/program.scm:808
 #, scheme-format
 msgid "You must pass --~a to set the server name.\n"
 msgstr "Vous devez passer --~a pour définir le nom du serveur.\n"
 
-#: src/scm/webid-oidc/program.scm:721
+#: src/scm/webid-oidc/program.scm:722
 #, scheme-format
 msgid "You must pass --~a to set the backend URI.\n"
 msgstr "Vous devez passer --~a pour définir l'URI du service d’arrière-plan.\n"
 
-#: src/scm/webid-oidc/program.scm:742 src/scm/webid-oidc/program.scm:811
+#: src/scm/webid-oidc/program.scm:743 src/scm/webid-oidc/program.scm:812
 #, scheme-format
 msgid ""
 "You must pass --~a to set the file where to store the identity provider "
@@ -2251,66 +2251,66 @@ msgstr ""
 "Vous devez passer --~a pour définir le nom du fichier pour sauvegarder\n"
 "la clé du fournisseur d’identité.\n"
 
-#: src/scm/webid-oidc/program.scm:746 src/scm/webid-oidc/program.scm:815
+#: src/scm/webid-oidc/program.scm:747 src/scm/webid-oidc/program.scm:816
 #, scheme-format
 msgid "You must pass --~a to set the subject of the identity provider.\n"
 msgstr ""
 "Vous devez passer --~a pour définir le sujet du fournisseur d’identité.\n"
 
-#: src/scm/webid-oidc/program.scm:750
+#: src/scm/webid-oidc/program.scm:751
 #, scheme-format
 msgid "You must pass --~a or --~a to set the subject’s encrypted password.\n"
 msgstr ""
 "Vous devez passer --~a ou --~a pour définir le mot de passe chiffré du "
 "sujet.\n"
 
-#: src/scm/webid-oidc/program.scm:754 src/scm/webid-oidc/program.scm:823
+#: src/scm/webid-oidc/program.scm:755 src/scm/webid-oidc/program.scm:824
 #, scheme-format
 msgid "You must pass --~a to set the JWKS URI.\n"
 msgstr "Vous devez passer --~a pour définir l'URI du JWKS.\n"
 
-#: src/scm/webid-oidc/program.scm:758 src/scm/webid-oidc/program.scm:827
+#: src/scm/webid-oidc/program.scm:759 src/scm/webid-oidc/program.scm:828
 #, scheme-format
 msgid "You must pass --~a to set the authorization endpoint URI.\n"
 msgstr ""
 "Vous devez passer --~a pour définir l'URI du terminal d'autorisation.\n"
 
-#: src/scm/webid-oidc/program.scm:762 src/scm/webid-oidc/program.scm:831
+#: src/scm/webid-oidc/program.scm:763 src/scm/webid-oidc/program.scm:832
 #, scheme-format
 msgid "You must pass --~a to set the token endpoint URI.\n"
 msgstr "Vous devez passer --~a pour définir l'URI du terminal de jeton.\n"
 
-#: src/scm/webid-oidc/program.scm:779
+#: src/scm/webid-oidc/program.scm:780
 #, scheme-format
 msgid "You must pass --~a to set the application web ID.\n"
 msgstr ""
 "Vous devez passer --~a pour définir l'identifiant web de l’application.\n"
 
-#: src/scm/webid-oidc/program.scm:783
+#: src/scm/webid-oidc/program.scm:784
 #, scheme-format
 msgid "You must pass --~a to set the redirection URI.\n"
 msgstr "Vous devez passer --~a pour définir l'URI de redirection.\n"
 
-#: src/scm/webid-oidc/program.scm:787
+#: src/scm/webid-oidc/program.scm:788
 #, scheme-format
 msgid "You must pass --~a to set the informative client name.\n"
 msgstr ""
 "Vous devez passer --~a pour donner un nom pour l’application à titre "
 "informatif.\n"
 
-#: src/scm/webid-oidc/program.scm:791
+#: src/scm/webid-oidc/program.scm:792
 #, scheme-format
 msgid "You must pass --~a to set the informative client URI.\n"
 msgstr ""
 "Vous devez passer --~a pour définir l'URI du client, à titre informatif.\n"
 
-#: src/scm/webid-oidc/program.scm:819
+#: src/scm/webid-oidc/program.scm:820
 #, scheme-format
 msgid "You must pass --~a to set the subject’s encrypted password.\n"
 msgstr ""
 "Vous devez passer --~a pour définir le mot de passe chiffré du sujet.\n"
 
-#: src/scm/webid-oidc/program.scm:871
+#: src/scm/webid-oidc/program.scm:872
 #, scheme-format
 msgid "Unknown command ~s\n"
 msgstr "Commande inconnue ~s\n"
@@ -2343,47 +2343,47 @@ msgstr "~a : échec d’authentificationn : ~a\n"
 msgid "~a: authentication failure\n"
 msgstr "~a : échec d’authentification\n"
 
-#: src/scm/webid-oidc/resource-server.scm:157
-#: src/scm/webid-oidc/resource-server.scm:342
+#: src/scm/webid-oidc/resource-server.scm:158
+#: src/scm/webid-oidc/resource-server.scm:343
 msgid "reason-phrase|Precondition Failed"
 msgstr "Échec de Précondition"
 
-#: src/scm/webid-oidc/resource-server.scm:172
+#: src/scm/webid-oidc/resource-server.scm:173
 msgid "reason-phrase|Not Modified"
 msgstr "Non Modifié"
 
-#: src/scm/webid-oidc/resource-server.scm:187
+#: src/scm/webid-oidc/resource-server.scm:188
 msgid "The owner is not defined."
 msgstr "Le propriétaire n’est pas défini."
 
-#: src/scm/webid-oidc/resource-server.scm:256
+#: src/scm/webid-oidc/resource-server.scm:257
 msgid "reason-phrase|Created"
 msgstr "Créé"
 
-#: src/scm/webid-oidc/resource-server.scm:279
+#: src/scm/webid-oidc/resource-server.scm:280
 #, scheme-format
 msgid "~a: ignoring a group that cannot be fetched: ~a\n"
 msgstr "~a : j’ignore un groupe qui n’a pas pu être téléchargé : ~a\n"
 
-#: src/scm/webid-oidc/resource-server.scm:283
+#: src/scm/webid-oidc/resource-server.scm:284
 #, scheme-format
 msgid "~a: ignoring a group that cannot be fetched\n"
 msgstr "~a : j’ignore un groupe qui ne peut pas être téléchargé\n"
 
-#: src/scm/webid-oidc/resource-server.scm:307
+#: src/scm/webid-oidc/resource-server.scm:308
 #: src/scm/webid-oidc/token-endpoint.scm:104
 msgid "reason-phrase|Forbidden"
 msgstr "Interdit"
 
-#: src/scm/webid-oidc/resource-server.scm:328
+#: src/scm/webid-oidc/resource-server.scm:329
 msgid "reason-phrase|Conflict"
 msgstr "Conflit"
 
-#: src/scm/webid-oidc/resource-server.scm:335
+#: src/scm/webid-oidc/resource-server.scm:336
 msgid "reason-phrase|Unsupported Media Type"
 msgstr "Type de Média Non Supporté"
 
-#: src/scm/webid-oidc/resource-server.scm:349
+#: src/scm/webid-oidc/resource-server.scm:350
 msgid "reason-phrase|Not Acceptable"
 msgstr "Inacceptable"
 
diff --git a/src/scm/webid-oidc/program.scm b/src/scm/webid-oidc/program.scm
index 00c929a..fc9d746 100644
--- a/src/scm/webid-oidc/program.scm
+++ b/src/scm/webid-oidc/program.scm
@@ -189,7 +189,8 @@
                              ,@(response-headers response))
                  #:port (response-port response)
                  #:validate-headers? #t)
-                response-body)))))))))
+                response-body)))
+           #:unwind? #t))))))
 
 (define (serve-one-client* handler implementation server state)
   ;; Same as serve-one-client, except it is served in a promise.
diff --git a/src/scm/webid-oidc/resource-server.scm b/src/scm/webid-oidc/resource-server.scm
index 50e5b64..d035ec4 100644
--- a/src/scm/webid-oidc/resource-server.scm
+++ b/src/scm/webid-oidc/resource-server.scm
@@ -126,7 +126,8 @@
          (lambda (error)
            (g return error))
        (lambda ()
-         (f return))))))
+         (f return))
+       #:unwind? #t))))
 
 (define (nonrdf-or-turtle server-uri request request-body)
   ;; If the request is an exotic RDF serialization