mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-01-12 18:34:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make sure syslogPipe runs in binary mode on Windows to avoid corrupting the pipe chunking protocol. Backport to 8.0

Browse Source
This commit is contained in:
Andrew Dunstan 2007-08-02 23:15:27 +00:00
parent 494d6f809e
commit b34903453f
2 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/backend/postmaster/postmaster.c
View File

@ -37,7 +37,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.535 2007/07/24 04:54:09 tgl Exp $ * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.536 2007/08/02 23:15:26 adunstan Exp $
* *
* NOTES * NOTES
* *
@ -3385,6 +3385,15 @@ SubPostmasterMain(int argc, char *argv[])
MyProcPid = getpid(); /* reset MyProcPid */ MyProcPid = getpid(); /* reset MyProcPid */
/* make sure stderr is in binary mode before anything can
* possibly be written to it, in case it's actually the syslogger pipe,
* so the pipe chunking protocol isn't disturbed. Non-logpipe data
* gets translated on redirection (e.g. via pg_ctl -l) anyway.
*/
#ifdef WIN32
_setmode(fileno(stderr),_O_BINARY);
#endif
/* Lose the postmaster's on-exit routines (really a no-op) */ /* Lose the postmaster's on-exit routines (really a no-op) */
on_exit_reset(); on_exit_reset();

25
src/backend/postmaster/syslogger.c
View File

@ -18,7 +18,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/postmaster/syslogger.c,v 1.33 2007/07/19 19:13:43 adunstan Exp $ * $PostgreSQL: pgsql/src/backend/postmaster/syslogger.c,v 1.34 2007/08/02 23:15:27 adunstan Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -194,6 +194,15 @@ SysLoggerMain(int argc, char *argv[])
close(fd); close(fd);
} }
/* Syslogger's own stderr can't be the syslogPipe, so set it back to
* text mode if we didn't just close it.
* (It was set to binary in SubPostmasterMain).
*/
#ifdef WIN32
else
_setmode(_fileno(stderr),_O_TEXT);
#endif
/* /*
* Also close our copy of the write end of the pipe. This is needed to * Also close our copy of the write end of the pipe. This is needed to
* ensure we can detect pipe EOF correctly. (But note that in the restart * ensure we can detect pipe EOF correctly. (But note that in the restart
@ -531,14 +540,20 @@ SysLogger_Start(void)
#else #else
int fd; int fd;
/*
* open the pipe in binary mode and make sure
* stderr is binary after it's been dup'ed into, to avoid
* disturbing the pipe chunking protocol.
*/
fflush(stderr); fflush(stderr);
fd = _open_osfhandle((long) syslogPipe[1], fd = _open_osfhandle((long) syslogPipe[1],
_O_APPEND | _O_TEXT); _O_APPEND | _O_BINARY);
if (dup2(fd, _fileno(stderr)) < 0) if (dup2(fd, _fileno(stderr)) < 0)
ereport(FATAL, ereport(FATAL,
(errcode_for_file_access(), (errcode_for_file_access(),
errmsg("could not redirect stderr: %m"))); errmsg("could not redirect stderr: %m")));
close(fd); close(fd);
_setmode(_fileno(stderr),_O_BINARY);
/* Now we are done with the write end of the pipe. */ /* Now we are done with the write end of the pipe. */
CloseHandle(syslogPipe[1]); CloseHandle(syslogPipe[1]);
syslogPipe[1] = 0; syslogPipe[1] = 0;
@ -626,7 +641,7 @@ syslogger_parseArgs(int argc, char *argv[])
fd = atoi(*argv++); fd = atoi(*argv++);
if (fd != 0) if (fd != 0)
{ {
fd = _open_osfhandle(fd, _O_APPEND); fd = _open_osfhandle(fd, _O_APPEND | _O_TEXT);
if (fd > 0) if (fd > 0)
{ {
syslogFile = fdopen(fd, "a"); syslogFile = fdopen(fd, "a");
@ -988,6 +1003,10 @@ logfile_rotate(bool time_based_rotation)
setvbuf(fh, NULL, LBF_MODE, 0); setvbuf(fh, NULL, LBF_MODE, 0);
#ifdef WIN32
_setmode(_fileno(fh), _O_TEXT); /* use CRLF line endings on Windows */
#endif
/* On Windows, need to interlock against data-transfer thread */ /* On Windows, need to interlock against data-transfer thread */
#ifdef WIN32 #ifdef WIN32
EnterCriticalSection(&sysfileSection); EnterCriticalSection(&sysfileSection);