# HG changeset patch # User David Bateman # Date 1267417629 18000 # Node ID fb62fbbe28c0da5694e1da13a1abebcf7f429591 # Parent 1ed7cc046c52aa87a2021930b648750225b2be2e urlwrite: don't set CURLOPT_USERPWD if userpwd is empty diff --git a/src/ChangeLog b/src/ChangeLog --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2010-02-28 David Bateman + + * DLD-FUNCTIONS/urlwrite.cc (curl_handle::init): Don't set + CURLOPT_USERPWD if userpwd is empty. + 2010-02-28 John W. Eaton * Makefile.am ($(srcdir)/DLD-FUNCTIONS/module.mk): New target. diff --git a/src/DLD-FUNCTIONS/urlwrite.cc b/src/DLD-FUNCTIONS/urlwrite.cc --- 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);