From 9324f1c29f31e68ffb716e32450ce9f2f9239654 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Sun, 7 Jun 2009 22:21:22 +0000
Subject: [PATCH] - Eric Wong fixed --no-buffer to actually switch off output
 buffering. Been   broken since 7.19.0

---
 CHANGES       | 4 ++++
 RELEASE-NOTES | 3 ++-
 src/main.c    | 5 +++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index a3254a45d..4f691a8af 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,10 @@
 
                                   Changelog
 
+Daniel Stenberg (8 June 2009)
+- Eric Wong fixed --no-buffer to actually switch off output buffering. Been
+  broken since 7.19.0
+
 Yang Tse (5 Jun 2009)
 - John E. Malmberg provided VMS specific patch: "This fixes an existing bug
   in urlglob.c where it was not converting the Curl Unix exit code to a VMS
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index f46279984..a97cb76b3 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -23,6 +23,7 @@ This release includes the following bugfixes:
  o set Content-Length: with POST and PUT failed with NTLM auth
  o allow building libcurl for VxWorks
  o curl tool exit codes fixed for VMS
+ o --no-buffer treated correctly
 
 This release includes the following known bugs:
 
@@ -33,6 +34,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
+ Aaron Oneal, Igor Novoseltsev, Eric Wong
 
         Thanks! (and sorry if I forgot to mention someone)
diff --git a/src/main.c b/src/main.c
index 586d00e2a..b47dced06 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2634,8 +2634,9 @@ static ParameterError getparameter(char *flag, /* f or -long-flag */
       }
       break;
     case 'N':
-      /* disable the output I/O buffering */
-      config->nobuffer = (bool)(!toggle);
+      /* disable the output I/O buffering. note that the option is called
+         --buffer but is mostly used in the negative form: --no-buffer */
+      config->nobuffer = (bool)(longopt ? !toggle : toggle);
       break;
     case 'O': /* --remote-name */
       if(subletter == 'a') { /* --remote-name-all */