From d176f58a2003e4231c75f09813125c5a5bb26913 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 23 Jan 2026 16:23:57 +0100 Subject: [PATCH] runtests: pass config filename to stunnel in native format (Windows) Fixing (Seen when enabling stunnel for Cygwin in CI): ``` === Start of file https_stunnel.log [ ] Initializing inetd mode configuration [ ] Running on Windows 6.2 [...] [.] Reading configuration from file /cygdrive/d/a/curl/curl/bld/tests/log/6/server/https_stunnel.conf [!] Cannot open configuration file ``` Ref: https://github.com/curl/curl/actions/runs/21289677523/job/61279662459?pr=20410 Cherry-picked from #20410 Closes #20413 --- tests/secureserver.pl | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/tests/secureserver.pl b/tests/secureserver.pl index 0e34bf1d7c..8471e144e7 100755 --- a/tests/secureserver.pl +++ b/tests/secureserver.pl @@ -284,12 +284,19 @@ if($stunnel_version < 400) { # if($stunnel_version >= 400) { $socketopt = "a:SO_REUSEADDR=1"; - if(($stunnel_version >= 534) && $tstunnel_windows) { - # SO_EXCLUSIVEADDRUSE is on by default on Vista or newer, - # but does not work together with SO_REUSEADDR being on. - $socketopt .= "\nsocket = a:SO_EXCLUSIVEADDRUSE=0"; + my $conffile_cmdline; + if($tstunnel_windows) { + if($stunnel_version >= 534) { + # SO_EXCLUSIVEADDRUSE is on by default on Vista or newer, + # but does not work together with SO_REUSEADDR being on. + $socketopt .= "\nsocket = a:SO_EXCLUSIVEADDRUSE=0"; + } + $conffile_cmdline = pathhelp::sys_native_abs_path($conffile); } - $cmd = "\"$stunnel\" $conffile "; + else { + $conffile_cmdline = $conffile; + } + $cmd = "\"$stunnel\" $conffile_cmdline "; $cmd .= ">$logfile 2>&1"; # setup signal handler $SIG{INT} = \&exit_signal_handler;