From 63e15bb55ce4792fc9484b5e22ad7f9b76ed966a Mon Sep 17 00:00:00 2001 From: Yves Rutschle Date: Wed, 10 Sep 2025 15:50:52 +0200 Subject: [PATCH] Prepare for 2.3.0 --- ChangeLog | 5 +++-- echosrv-conf.c | 2 +- echosrv-conf.h | 2 +- example.cfg | 3 +++ sslh-conf.c | 2 +- sslh-conf.h | 2 +- version.h | 5 ----- 7 files changed, 10 insertions(+), 11 deletions(-) delete mode 100644 version.h diff --git a/ChangeLog b/ChangeLog index 5871651..4bd195a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -vNEXT: +v2.3.0: Added `max_connections` setting to `listen` and `protocol` configuration; see the [guide](doc/max_connections.md) for more @@ -6,7 +6,8 @@ vNEXT: accept() is now disabled for some time when ulimit -n is reached. - Support proxyprotocol on incoming connections. + Support proxyprotocol on incoming connections. See + the [guide](doc/proxyprotocol.md) for information. Fix proxyprotocol target field (Thanks to Github user 404-Not-Found) diff --git a/echosrv-conf.c b/echosrv-conf.c index 9907624..790e951 100644 --- a/echosrv-conf.c +++ b/echosrv-conf.c @@ -1,5 +1,5 @@ /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README) - * on Fri Aug 29 20:43:29 2025. + * on Wed Sep 10 15:49:49 2025. # conf2struct: generate libconf parsers that read to structs # Copyright (C) 2018-2024 Yves Rutschle diff --git a/echosrv-conf.h b/echosrv-conf.h index 742485f..db5c3af 100644 --- a/echosrv-conf.h +++ b/echosrv-conf.h @@ -1,5 +1,5 @@ /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README) - * on Fri Aug 29 20:43:29 2025. + * on Wed Sep 10 15:49:49 2025. # conf2struct: generate libconf parsers that read to structs # Copyright (C) 2018-2024 Yves Rutschle diff --git a/example.cfg b/example.cfg index 48399d5..842fa72 100644 --- a/example.cfg +++ b/example.cfg @@ -55,6 +55,9 @@ syslog_facility: "auth"; # is_unix: listen in the UNIX socket domain (default is TCP) # keepalive: set TCP_KEEPALIVE # max_connections: drop incoming connections after this count +# proxyprotocol: [true|false]: this endpoint expects +# proxyprotocol headers on incoming connections. Refer to +# doc/proxyprotocol.md listen: ( { host: "thelonious"; port: "443"; max_connections: 5; }, diff --git a/sslh-conf.c b/sslh-conf.c index b47a10d..b80d5fd 100644 --- a/sslh-conf.c +++ b/sslh-conf.c @@ -1,5 +1,5 @@ /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README) - * on Fri Aug 29 20:43:29 2025. + * on Wed Sep 10 15:49:49 2025. # conf2struct: generate libconf parsers that read to structs # Copyright (C) 2018-2024 Yves Rutschle diff --git a/sslh-conf.h b/sslh-conf.h index 0b6bdb6..f5d8be3 100644 --- a/sslh-conf.h +++ b/sslh-conf.h @@ -1,5 +1,5 @@ /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README) - * on Fri Aug 29 20:43:29 2025. + * on Wed Sep 10 15:49:49 2025. # conf2struct: generate libconf parsers that read to structs # Copyright (C) 2018-2024 Yves Rutschle diff --git a/version.h b/version.h deleted file mode 100644 index 6cd6507..0000000 --- a/version.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifndef VERSION_H -#define VERSION_H - -#define VERSION "v2.2.4-52-geea50a9-dirty" -#endif