[libsoup] Revert "SoupURI: replace NULL password with "" on http"

[Dan Winship <danw src gnome org>]

commit e38317b878708d67ba3a67d3ec2972ab8355fb83
Author: Dan Winship <danw gnome org>
Date:   Mon Jan 21 10:50:16 2013 -0500

    Revert "SoupURI: replace NULL password with "" on http"
    
    This broke CalDAV in evolution. I'm not sure exactly why, but if it
    broke that, it might break other things too, so let's just revert
    this.
    
    This reverts commit 38901ca5e684a8fac75e6ff740d45c82dd44181a.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=692149

 libsoup/soup-uri.c  |    2 --
 tests/uri-parsing.c |   12 ++++++------
 2 files changed, 6 insertions(+), 8 deletions(-)
---
diff --git a/libsoup/soup-uri.c b/libsoup/soup-uri.c
index fdb4378..28b3025 100644
--- a/libsoup/soup-uri.c
+++ b/libsoup/soup-uri.c
@@ -434,8 +434,6 @@ soup_uri_new_with_base (SoupURI *base, const char *uri_string)
 	    uri->scheme == SOUP_URI_SCHEME_HTTPS) {
 		if (!uri->path)
 			uri->path = g_strdup ("/");
-		if (uri->user && !uri->password)
-			uri->password = g_strdup ("");
 		if (!SOUP_URI_VALID_FOR_HTTP (uri)) {
 			soup_uri_free (uri);
 			return NULL;
diff --git a/tests/uri-parsing.c b/tests/uri-parsing.c
index 7992d70..892ee2b 100644
--- a/tests/uri-parsing.c
+++ b/tests/uri-parsing.c
@@ -23,15 +23,15 @@ static struct {
 	{ "ftp://user:password host", "ftp://user host",
 	  { "ftp", "user", "password", "host", 21, "", NULL, NULL } },
 	{ "http://us%65r host", "http://user host/",
-	  { "http", "user", "", "host", 80, "/", NULL, NULL } },
+	  { "http", "user", NULL, "host", 80, "/", NULL, NULL } },
 	{ "http://us%40r host", "http://us%40r host/",
-	  { "http", "us\x40r", "", "host", 80, "/", NULL, NULL } },
+	  { "http", "us\x40r", NULL, "host", 80, "/", NULL, NULL } },
 	{ "http://us%3ar host", "http://us%3Ar host/",
-	  { "http", "us\x3ar", "", "host", 80, "/", NULL, NULL } },
+	  { "http", "us\x3ar", NULL, "host", 80, "/", NULL, NULL } },
 	{ "http://us%2fr host", "http://us%2Fr host/",
-	  { "http", "us\x2fr", "", "host", 80, "/", NULL, NULL } },
+	  { "http", "us\x2fr", NULL, "host", 80, "/", NULL, NULL } },
 	{ "http://us%3fr host", "http://us%3Fr host/",
-	  { "http", "us\x3fr", "", "host", 80, "/", NULL, NULL } },
+	  { "http", "us\x3fr", NULL, "host", 80, "/", NULL, NULL } },
 	{ "http://host?query";, "http://host/?query";,
 	  { "http", NULL, NULL, "host", 80, "/", "query", NULL } },
 	{ "http://host/path?query=http%3A%2F%2Fhost%2Fpath%3Fchildparam%3Dchildvalue&param=value";,
@@ -122,7 +122,7 @@ static struct {
 	  { "http", NULL, NULL, "", 80, "//////////////", NULL, NULL } },
 
 	{ "http://@host";, "http://@host/";,
-	  { "http", "", "", "host", 80, "/", NULL, NULL } },
+	  { "http", "", NULL, "host", 80, "/", NULL, NULL } },
 	{ "http://:@host";, "http://@host/";,
 	  { "http", "", "", "host", 80, "/", NULL, NULL } },