Mercurial > hg > octave-jordi

changeset 10377:fb62fbbe28c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
urlwrite: don't set CURLOPT_USERPWD if userpwd is empty
author David Bateman <dbateman@free.fr>
date Sun, 28 Feb 2010 23:27:09 -0500
parents 1ed7cc046c52
children eeb6c09ec51a
files src/ChangeLog src/DLD-FUNCTIONS/urlwrite.cc
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-28  David Bateman  <dbateman@free.fr>
+
+	* DLD-FUNCTIONS/urlwrite.cc (curl_handle::init): Don't set
+	CURLOPT_USERPWD if userpwd is empty.
+
 2010-02-28  John W. Eaton  <jwe@octave.org>
 
 	* Makefile.am ($(srcdir)/DLD-FUNCTIONS/module.mk): New target.
--- a/src/DLD-FUNCTIONS/urlwrite.cc
+++ b/src/DLD-FUNCTIONS/urlwrite.cc
@@ -563,7 +563,8 @@
       std::string userpwd = user;
       if (! passwd.empty ())
         userpwd += ":" + passwd;
-      setopt (CURLOPT_USERPWD, userpwd.c_str ());
+      if (! userpwd.empty ())
+        setopt (CURLOPT_USERPWD, userpwd.c_str ());
 
       // Define our callback to get called when there's data to be written.
       setopt (CURLOPT_WRITEFUNCTION, write_data);