[git.ipfire.org] IPFire 2.x development tree branch, master, updated. d451f131ff19cc090d78712adc9309dd5bed2990

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. d451f131ff19cc090d78712adc9309dd5bed2990

[Michael Tremer]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, master has been updated
       via  d451f131ff19cc090d78712adc9309dd5bed2990 (commit)
      from  f1e4331fa76b628c91057aca8e501c87de90283b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d451f131ff19cc090d78712adc9309dd5bed2990
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Thu Oct 16 18:40:08 2025 +0200

    general-functions.pl: Read output first before we wait for the process to terminate
    
    When generating IPS reports, the reporter could not write to the output,
    therefore blocked and the CGI script timed out.
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/cfgroot/general-functions.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Difference in files:
diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl
index 94d0e7440..1c3374d86 100644
--- a/config/cfgroot/general-functions.pl
+++ b/config/cfgroot/general-functions.pl
@@ -66,13 +66,13 @@ sub system_output($) {
 		die "Could not execute @command: $!";
 	}
 
-	waitpid($pid, 0);
-
 	while (<OUTPUT>) {
 		push(@output, $_);
 	}
 	close(OUTPUT);
 
+	waitpid($pid, 0);
+
 	return @output;
 }
 


hooks/post-receive
--
IPFire 2.x development tree