[Bug 66255] Error state [CLOSE_NOW] on HTTP/2 connections

https://bz.apache.org/bugzilla/show_bug.cgi?id=66255 --- Comment #5 from Matafagafo --- (In reply to Matafagafo from comment #2) > The log file is too large to attach, so I upload to WeTransfer > > URL: https://we.tl/t-QvmXeeWQPe I reduced the log file removing some application messages So ple

[Bug 66255] Error state [CLOSE_NOW] on HTTP/2 connections

https://bz.apache.org/bugzilla/show_bug.cgi?id=66255 --- Comment #4 from Matafagafo --- I have no clear steps to reproduce the problem, because they happen while users are accessing my APP running on Tomcat. I didn't find a way (a sequence) to generate the problem. -- You are receiving this mai

[Bug 66255] Error state [CLOSE_NOW] on HTTP/2 connections

https://bz.apache.org/bugzilla/show_bug.cgi?id=66255 --- Comment #3 from Matafagafo --- (In reply to Mark Thomas from comment #1) > Steps to reproduce from a clean install of the latest stable 9.0.x (or any > other currently supported major version) release please. A Tomcat 9.0.65 configured to

[Bug 66255] Error state [CLOSE_NOW] on HTTP/2 connections

https://bz.apache.org/bugzilla/show_bug.cgi?id=66255 --- Comment #2 from Matafagafo --- The log file is too large to attach, so I upload to WeTransfer URL: https://we.tl/t-QvmXeeWQPe -- You are receiving this mail because: You are the assignee for the bug. -

[tomcat] branch 8.5.x updated: Silence IDE warnings

This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/8.5.x by this push: new 87c3af3d5e Silence IDE warnings 87c3af3d5e is descr

[tomcat] branch main updated: Silence IDE warnings

This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new b69af64cc9 Silence IDE warnings b69af64cc9 is describ

[tomcat] branch 9.0.x updated: Silence IDE warnings

This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/9.0.x by this push: new 95130d64b3 Silence IDE warnings 95130d64b3 is descr

[tomcat] branch 10.0.x updated: Silence IDE warnings

This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.0.x by this push: new 7c15014919 Silence IDE warnings 7c15014919 is des

[Bug 66255] Error state [CLOSE_NOW] on HTTP/2 connections

https://bz.apache.org/bugzilla/show_bug.cgi?id=66255 Mark Thomas changed: What|Removed |Added Status|NEW |NEEDINFO --- Comment #1 from Mark Thomas

[Bug 66255] New: Error state [CLOSE_NOW] on HTTP/2 connections

https://bz.apache.org/bugzilla/show_bug.cgi?id=66255 Bug ID: 66255 Summary: Error state [CLOSE_NOW] on HTTP/2 connections Product: Tomcat 9 Version: 9.0.x Hardware: Other OS: Linux Status: NEW Severity: n

[tomcat] branch 8.5.x updated: Fix IDE errors

This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/8.5.x by this push: new 876ad308eb Fix IDE errors 876ad308eb is described b

[tomcat] branch 9.0.x updated: Fix CheckStyle error

This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/9.0.x by this push: new a584bd7503 Fix CheckStyle error a584bd7503 is descr

[tomcat] branch 10.0.x updated: Fix Checkstyle error

This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.0.x by this push: new 39edad8e7e Fix Checkstyle error 39edad8e7e is des

[tomcat] branch main updated: Fix IDE errors

This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 700046d92d Fix IDE errors 700046d92d is described bel

[tomcat] branch 8.5.x updated: Refactor - remove remaining uses of Vector

This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/8.5.x by this push: new 7b36923a2d Refactor - remove remaining uses of Vect

[tomcat] branch 9.0.x updated: Refactor - remove remaining uses of Vector

This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/9.0.x by this push: new 9cbb4233b7 Refactor - remove remaining uses of Vect

[tomcat] branch 10.0.x updated: Refactor - remove remaining uses of Vector

This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.0.x by this push: new 94be591b68 Refactor - remove remaining uses of Ve

[tomcat] branch main updated: Refactor - remove remaining uses of Vector

This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 13c829eb8f Refactor - remove remaining uses of Vector

Re: [tomcat] branch main updated: Avoid potential ConcurrentModificationException by using Iterator.

On 09/09/2022 15:57, li...@apache.org wrote: This is an automated email from the ASF dual-hosted git repository. lihan pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 5c5ad

[tomcat] branch 8.5.x updated: Avoid potential ConcurrentModificationException by using Iterator.

This is an automated email from the ASF dual-hosted git repository. lihan pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/8.5.x by this push: new 38b0faa8d7 Avoid potential ConcurrentModificationEx

[tomcat] branch 9.0.x updated: Avoid potential ConcurrentModificationException by using Iterator.

This is an automated email from the ASF dual-hosted git repository. lihan pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/9.0.x by this push: new d0b641313a Avoid potential ConcurrentModificationEx

[tomcat] branch 10.0.x updated: Avoid potential ConcurrentModificationException by using Iterator.

This is an automated email from the ASF dual-hosted git repository. lihan pushed a commit to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.0.x by this push: new d37106f04d Avoid potential ConcurrentModification

[tomcat] branch main updated: Avoid potential ConcurrentModificationException by using Iterator.

This is an automated email from the ASF dual-hosted git repository. lihan pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 5c5adba7fd Avoid potential ConcurrentModificationExce

[tomcat] branch main updated: Remove use of Vector and associated changes.

This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new f906658a34 Remove use of Vector and associated change

[tomcat] branch 8.5.x updated: Refactoring and clean-up

This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/8.5.x by this push: new 9cdbdc71a7 Refactoring and clean-up 9cdbdc71a7 is d

[tomcat] branch 9.0.x updated: Refactoring and clean-up

This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/9.0.x by this push: new 0005948a92 Refactoring and clean-up 0005948a92 is d

[tomcat] branch 10.0.x updated: Refactoring and clean-up

This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.0.x by this push: new ce172a4e2f Refactoring and clean-up ce172a4e2f is

[tomcat] branch main updated: Refactoring and clean-up

This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 8a83a47d11 Refactoring and clean-up 8a83a47d11 is des

[tomcat] branch 8.5.x updated: Further improve MessageFactory number formatting fix.

This is an automated email from the ASF dual-hosted git repository. kkolinko pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/8.5.x by this push: new f3d2931ea0 Further improve MessageFactory number

[tomcat] branch 9.0.x updated: Further improve MessageFactory number formatting fix.

This is an automated email from the ASF dual-hosted git repository. kkolinko pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/9.0.x by this push: new 2108b6be3c Further improve MessageFactory number

[tomcat] branch 10.0.x updated: Further improve MessageFactory number formatting fix.

This is an automated email from the ASF dual-hosted git repository. kkolinko pushed a commit to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.0.x by this push: new 3c06ea8ddb Further improve MessageFactory numb

[tomcat] branch main updated: Further improve MessageFactory number formatting fix.

This is an automated email from the ASF dual-hosted git repository. kkolinko pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 2671a91333 Further improve MessageFactory number f

[Bug 62312] Add Proxy Authentication support to websocket client

https://bz.apache.org/bugzilla/show_bug.cgi?id=62312 --- Comment #15 from radhika.j...@veritas.com --- Thanks Joe Mokos and Mark Thomas. Really appreciate it. -- You are receiving this mail because: You are the assignee for the bug. --

[Bug 62312] Add Proxy Authentication support to websocket client

https://bz.apache.org/bugzilla/show_bug.cgi?id=62312 --- Comment #14 from Mark Thomas --- It was only so quick due to the great work already done by Joe Mokos. -- You are receiving this mail because: You are the assignee for the bug. -

[tomcat] branch main updated: Remove deprecated code

This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/main by this push: new 0a8c2cfe97 Remove deprecated code 0a8c2cfe97 is descr

[Bug 62312] Add Proxy Authentication support to websocket client

https://bz.apache.org/bugzilla/show_bug.cgi?id=62312 --- Comment #13 from radhika.j...@veritas.com --- Wow, Thanks so much for quick resolution.. -- You are receiving this mail because: You are the assignee for the bug. - To un

[tomcat] branch 8.5.x updated: Fix backport (jakarta -> javax)

This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/8.5.x by this push: new 1cd3ab7106 Fix backport (jakarta -> javax) 1cd3ab71

[tomcat] branch 9.0.x updated: Fix backport (jakarta -> javax)

This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/9.0.x by this push: new d62b7d5e94 Fix backport (jakarta -> javax) d62b7d5e

[Bug 62312] Add Proxy Authentication support to websocket client

https://bz.apache.org/bugzilla/show_bug.cgi?id=62312 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|---

[tomcat] 01/06: Rename / refactor in preparation for fixing BZ 62312

This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit def74b34a1a132e85d7045be05008a7d001fc2b9 Author: Mark Thomas AuthorDate: Fri Sep 9 08:50:37 2022 +0100 Rename / refac

[tomcat] branch 8.5.x updated (27cbe3dcae -> 52b39f4931)

This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from 27cbe3dcae Clean-up / improve naming. No functional change. new def74b34a1 Rename / refactor in preparation for fix

[tomcat] 05/06: More refactoring in preparation for the BZ 62312 fix

This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit f5f44d6da7d4c626e4a73acae0124fc0ea39187d Author: Mark Thomas AuthorDate: Fri Sep 9 09:27:33 2022 +0100 More refactori

[tomcat] 04/06: Refactor in preparation for fixinf BZ 62312

This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit b0852cf81344b0f95212336ec829505d0ca8313c Author: Mark Thomas AuthorDate: Fri Sep 9 09:16:04 2022 +0100 Refactor in pr

[tomcat] 02/06: Refactor and use i18n for exception messages

This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit d559d9ea120b789e0b1b0830d0f343169d94d0c0 Author: Mark Thomas AuthorDate: Fri Sep 9 08:56:40 2022 +0100 Refactor and u

[tomcat] 06/06: Fix BZ 62312 - add support for forward proxy authentication to WebSocket

This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 52b39f493174f8b0c42aafbe0fa28056c0352a6c Author: Mark Thomas AuthorDate: Fri Sep 9 09:39:24 2022 +0100 Fix BZ 62312 -

[tomcat] 03/06: Add support for optionally validating the authentication realm

This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 453f2522155dffbd28f26fdede40fce8cfcb8f91 Author: Mark Thomas AuthorDate: Fri Sep 9 09:03:01 2022 +0100 Add support fo

[tomcat] 05/06: More refactoring in preparation for the BZ 62312 fix

This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit c6dfc6f618128f43add50a05a4c9551c09af4991 Author: Mark Thomas AuthorDate: Fri Sep 9 09:27:33 2022 +0100 More refactori

[tomcat] 01/06: Rename / refactor in preparation for fixing BZ 62312

This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit c544039a9caca2a6a13f2ca0c7787ce36df3ab95 Author: Mark Thomas AuthorDate: Fri Sep 9 08:50:37 2022 +0100 Rename / refac

[tomcat] 04/06: Refactor in preparation for fixinf BZ 62312

This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 2518db9de403a525efba330731a42d9e8b560fb6 Author: Mark Thomas AuthorDate: Fri Sep 9 09:16:04 2022 +0100 Refactor in pr

[tomcat] 03/06: Add support for optionally validating the authentication realm

This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 547f0203814eb7e7f99ffa31833bf502c5ffa4fb Author: Mark Thomas AuthorDate: Fri Sep 9 09:03:01 2022 +0100 Add support fo

[tomcat] 02/06: Refactor and use i18n for exception messages

This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 6f24053507d6f87aa03f9657c83371726dafb6bd Author: Mark Thomas AuthorDate: Fri Sep 9 08:56:40 2022 +0100 Refactor and u

[tomcat] branch 9.0.x updated (d674f52104 -> eeb505625d)

This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from d674f52104 Clean-up / improve naming. No functional change. new c544039a9c Rename / refactor in preparation for fix

[tomcat] 01/06: Rename / refactor in preparation for fixing BZ 62312

This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 40b38dc3cdb973bc1838104734d951ea95ca Author: Mark Thomas AuthorDate: Fri Sep 9 08:50:37 2022 +0100 Rename / refa

[tomcat] 06/06: Fix BZ 62312 - add support for forward proxy authentication to WebSocket

This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit eeb505625d65c3ce6f16c478c2bcff7614afbbfd Author: Mark Thomas AuthorDate: Fri Sep 9 09:39:24 2022 +0100 Fix BZ 62312 -

[tomcat] 04/06: Refactor in preparation for fixinf BZ 62312

This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit be9f3532e67c734698a31fbf191b156e102f3abd Author: Mark Thomas AuthorDate: Fri Sep 9 09:16:04 2022 +0100 Refactor in p

[tomcat] 05/06: More refactoring in preparation for the BZ 62312 fix

This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit e0351b4474b25e1d3b2230c72e59cb12ed3f9ed8 Author: Mark Thomas AuthorDate: Fri Sep 9 09:27:33 2022 +0100 More refactor

[tomcat] 03/06: Add support for optionally validating the authentication realm

This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 90b2a3de90d1885c6932185c33ec7d52a2ea5ed4 Author: Mark Thomas AuthorDate: Fri Sep 9 09:03:01 2022 +0100 Add support f

[tomcat] branch 10.0.x updated (e0e1e6d45e -> 02ca95e7ec)

This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from e0e1e6d45e Clean-up / improve naming. No functional change. new 40b38dc3cd Rename / refactor in preparation for fi

[tomcat] 06/06: Fix BZ 62312 - add support for forward proxy authentication to WebSocket

This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 02ca95e7ec1f745fb0ef798e7ac17d86f882f704 Author: Mark Thomas AuthorDate: Fri Sep 9 09:39:24 2022 +0100 Fix BZ 62312

[tomcat] 02/06: Refactor and use i18n for exception messages

This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 39233d1a715735ee2df262fa7ea8eeafa5154c7e Author: Mark Thomas AuthorDate: Fri Sep 9 08:56:40 2022 +0100 Refactor and

[tomcat] 01/06: Rename / refactor in preparation for fixing BZ 62312

This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 14832c677a1efb4ced9e011c1c256669bc48eb0c Author: Mark Thomas AuthorDate: Fri Sep 9 08:50:37 2022 +0100 Rename / refact

[tomcat] 05/06: More refactoring in preparation for the BZ 62312 fix

This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git commit ed7bc9110220bb620da4a16c599d4e6b5fb6bc97 Author: Mark Thomas AuthorDate: Fri Sep 9 09:27:33 2022 +0100 More refactorin

[tomcat] 03/06: Add support for optionally validating the authentication realm

This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git commit d67968c4f5e221f9e32ced8aaff2bb6722ec09f7 Author: Mark Thomas AuthorDate: Fri Sep 9 09:03:01 2022 +0100 Add support for

[tomcat] branch main updated (116d9babd8 -> 69e1c84ea1)

This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git from 116d9babd8 More clean-up new 14832c677a Rename / refactor in preparation for fixing BZ 62312 new dcf48fb742 Ref

[tomcat] 02/06: Refactor and use i18n for exception messages

This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git commit dcf48fb74276bde9828faa310be4d4ec3fce916f Author: Mark Thomas AuthorDate: Fri Sep 9 08:56:40 2022 +0100 Refactor and us

[tomcat] 06/06: Fix BZ 62312 - add support for forward proxy authentication to WebSocket

This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 69e1c84ea172d0229acc1bacb355c9fc0102f47f Author: Mark Thomas AuthorDate: Fri Sep 9 09:39:24 2022 +0100 Fix BZ 62312 -

[tomcat] 04/06: Refactor in preparation for fixinf BZ 62312

This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git commit a747a41f509df1568c5467ece9d9db65f31f0adf Author: Mark Thomas AuthorDate: Fri Sep 9 09:16:04 2022 +0100 Refactor in pre