diff -ur a/src/transports/pipe.c b/src/transports/pipe.c --- a/src/transports/pipe.c 2009-11-16 20:50:39.000000000 +0100 +++ b/src/transports/pipe.c 2010-11-28 03:32:44.000000000 +0100 @@ -41,6 +41,8 @@ (void *)offsetof(pipe_transport_options_block, escape_string) }, { "freeze_exec_fail", opt_bool, (void *)offsetof(pipe_transport_options_block, freeze_exec_fail) }, + { "freeze_signal", opt_bool, + (void *)offsetof(pipe_transport_options_block, freeze_signal) }, { "ignore_status", opt_bool, (void *)offsetof(pipe_transport_options_block, ignore_status) }, { "log_defer_output", opt_bool | opt_public, @@ -109,6 +111,7 @@ 60*60, /* timeout */ 0, /* options */ FALSE, /* freeze_exec_fail */ + FALSE, /* freeze_signal */ FALSE, /* ignore_status */ FALSE, /* restrict_to_path */ FALSE, /* timeout_defer */ @@ -939,11 +942,20 @@ /* Either the process completed, but yielded a non-zero (necessarily positive) status, or the process was terminated by a signal (rc will contain the negation of the signal number). Treat killing by signal as failure unless - status is being ignored. */ + status is being ignored. By default, the message is bounced back, unless + freeze_signal is set, in which case it is frozen instead. */ else if (rc < 0) { - if (!ob->ignore_status) + if (ob->freeze_signal) + { + addr->transport_return = DEFER; + addr->special_action = SPECIAL_FREEZE; + addr->message = string_sprintf("Child process of %s transport (running " + "command \"%s\") was terminated by signal %d (%s)%s", tblock->name, cmd, + -rc, os_strsignal(-rc), tmsg); + } + else if (!ob->ignore_status) { addr->transport_return = FAIL; addr->message = string_sprintf("Child process of %s transport (running " diff -ur a/src/transports/pipe.h b/src/transports/pipe.h --- a/src/transports/pipe.h 2009-11-16 20:56:54.000000000 +0100 +++ b/src/transports/pipe.h 2010-11-28 03:09:22.000000000 +0100 @@ -24,6 +24,7 @@ int timeout; int options; BOOL freeze_exec_fail; + BOOL freeze_signal; BOOL ignore_status; BOOL restrict_to_path; BOOL timeout_defer;