summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Src/exec.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 736bbd76d..a86bf3514 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-05 Frank Terbeck <ft@bewatermyfriend.org>
+
+ * unposted: Src/exec.c: Revert "31372: Do not block SIGWINCH for
+ child processes" as suggested by Bart.
+
2013-05-05 Bart Schaefer <schaefer@zsh.org>
* 31372: Src/exec.c: Do not block SIGWINCH for child processes
diff --git a/Src/exec.c b/Src/exec.c
index c71f3f331..fa148756b 100644
--- a/Src/exec.c
+++ b/Src/exec.c
@@ -303,13 +303,11 @@ zfork(struct timeval *tv)
zerr("fork failed: %e", errno);
return -1;
}
- if (!pid) {
- winch_unblock();
#ifdef HAVE_GETRLIMIT
+ if (!pid)
/* set resource limits for the child process */
setlimits(NULL);
#endif
- }
return pid;
}