- Reuven Wachtfogel made curl -o - properly produce a binary output on windows

  (no newline translations). Use -B/--use-ascii if you rather get the ascii
  approach.

diff --git a/CHANGES b/CHANGES
index 8480c71cb5865dc002063b098e7ff3499e60b82a..95654f20c5ff1b86c434541678263520b815517f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,11 @@
 
                                   Changelog
 
+Daniel Stenberg (16 Jun 2009)
+- Reuven Wachtfogel made curl -o - properly produce a binary output on windows
+  (no newline translations). Use -B/--use-ascii if you rather get the ascii
+  approach.
+
 Michal Marek (16 Jun 2009)
 - When doing non-anonymous ftp via http proxies and the password is not
   provided in the url, add it there (squid needs this).

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 73dbcae612c13a1d2fb8d95f3b8a1be0e5235497..cbb650f1166b7973143bbf945aab8c319c5a3308 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -29,6 +29,7 @@ This release includes the following bugfixes:
  o curl uploading from stdin/pipes now works in non-blocking way so that it
    continues the downloading even when the read stalls
  o ftp credentials are added to the url if needed for http proxies
+ o curl -o - sends data to stdout using binary mode on windows
 
 This release includes the following known bugs:
 
@@ -40,6 +41,6 @@ advice from friends like these:
  Yang Tse, Daniel Fandrich, Kamil Dudka, Caolan McNamara, Frank McGeough,
  Andre Guibert de Bruet, Mike Crowe, Claes Jakobsson, John E. Malmberg,
  Aaron Oneal, Igor Novoseltsev, Eric Wong, Bill Hoffman, Daniel Steinberg,
- Fabian Keil
+ Fabian Keil, Michal Marek, Reuven Wachtfogel
 
         Thanks! (and sorry if I forgot to mention someone)

diff --git a/src/main.c b/src/main.c
index 858910828718b095861a0e70d2707c5663c1ef4e..3d8b54aba895341ef6fc3d5fa528dafa1ea95f0f 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -4584,7 +4584,7 @@ operate(struct Configurable *config, int argc, argv_item_t argv[])
         if(!config->errors)
           config->errors = stderr;
 
-        if(!outfile && !config->use_ascii) {
+        if((!outfile || !strcmp(outfile, "-")) && !config->use_ascii) {
           /* We get the output to stdout and we have not got the ASCII/text
              flag, then set stdout to be binary */
           SET_BINMODE(stdout);