aboutsummaryrefslogtreecommitdiff
path: root/src/backend/tcop/postgres.c
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2009-12-16 23:05:00 +0000
committerPeter Eisentraut <peter_e@gmx.net>2009-12-16 23:05:00 +0000
commitd6de43099ac0bddb4b1da40088487616da892164 (patch)
tree2705bf475ff118af9b6c25484db0945d731bc18d /src/backend/tcop/postgres.c
parentb63b967a7e68c0f157958406aaa78285ba6e5dd7 (diff)
downloadpostgresql-d6de43099ac0bddb4b1da40088487616da892164.tar.gz
postgresql-d6de43099ac0bddb4b1da40088487616da892164.zip
Don't unblock SIGQUIT in the SIGQUIT handler
This was possibly linked to a deadlock-like situation in glibc syslog code invoked by the ereport call in quickdie(). In any case, a signal handler should not unblock its own signal unless there is a specific reason to.
Diffstat (limited to 'src/backend/tcop/postgres.c')
-rw-r--r--src/backend/tcop/postgres.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 884748c9b12..f2e892374b0 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.577 2009/12/16 22:55:33 petere Exp $
+ * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.578 2009/12/16 23:05:00 petere Exp $
*
* NOTES
* this is the "main" module of the postgres backend and
@@ -2538,6 +2538,7 @@ drop_unnamed_stmt(void)
void
quickdie(SIGNAL_ARGS)
{
+ sigaddset(&BlockSig, SIGQUIT); /* prevent nested calls */
PG_SETMASK(&BlockSig);
/*