- Eric Wong fixed --no-buffer to actually switch off output buffering. Been

  broken since 7.19.0

diff --git a/CHANGES b/CHANGES
index a3254a45d855a5cc830c262ba84f18917f4ea82b..4f691a8af3e7da54e7fef3a27db3bbe1c19d9037 100644 (file)
--- 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 f4627998431579645922991de666f4bdc9275ca0..a97cb76b32e13be25f8fce6f7e03487abe4021ea 100644 (file)
--- 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 586d00e2a48002302f882013a432a295d9cf029b..b47dced067fbf2e7d6b975dd53f5e7d96973e04d 100644 (file)
--- 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 */