aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2017-06-19 11:02:45 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2017-06-19 11:02:45 -0400
commitbd61d5a194ac24f0c282ed414e1378846f78dee4 (patch)
treea44ae40d5b4df7f0c26770739968c8a15b81c0e0 /src
parent3bdea167eb01491a4898e977d308508374e97bfa (diff)
downloadpostgresql-bd61d5a194ac24f0c282ed414e1378846f78dee4.tar.gz
postgresql-bd61d5a194ac24f0c282ed414e1378846f78dee4.zip
On Windows, make pg_dump use binary mode for compressed plain text output.
The combination of -Z -Fp and output to stdout resulted in corrupted output data, because we left stdout in text mode, resulting in newline conversion being done on the compressed stream. Switch stdout to binary mode for this case, at the same place where we do it for non-text output formats. Report and patch by Kuntal Ghosh, tested by Ashutosh Sharma and Neha Sharma. Back-patch to all supported branches. Discussion: https://postgr.es/m/CAGz5QCJPvbBjXAmJuGx1B_41yVCetAJhp7rtaDf7XQGWuB1GSw@mail.gmail.com
Diffstat (limited to 'src')
-rw-r--r--src/bin/pg_dump/pg_backup_archiver.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
index 67205957464..0161fc4231a 100644
--- a/src/bin/pg_dump/pg_backup_archiver.c
+++ b/src/bin/pg_dump/pg_backup_archiver.c
@@ -2337,12 +2337,12 @@ _allocAH(const char *FileSpec, const ArchiveFormat fmt,
AH->OF = stdout;
/*
- * On Windows, we need to use binary mode to read/write non-text archive
- * formats. Force stdin/stdout into binary mode if that is what we are
- * using.
+ * On Windows, we need to use binary mode to read/write non-text files,
+ * which include all archive formats as well as compressed plain text.
+ * Force stdin/stdout into binary mode if that is what we are using.
*/
#ifdef WIN32
- if (fmt != archNull &&
+ if ((fmt != archNull || compression != 0) &&
(AH->fSpec == NULL || strcmp(AH->fSpec, "") == 0))
{
if (mode == archModeWrite)