Fixed some compilation errors on MSVC; Added tests for equality when the URI strings are invalid or empty.

Author: glynos

libs/network/src/uri/normalize.cpp

@@ -30,15 +30,15 @@ uri::string_type normalize_path(const uri::const_range_type &path) {
 
 	// remove single dot segments
 	remove_erase_if(path_segments, [] (const uri::string_type &s) {
-			return equal(s, as_literal("."));
+			return equal(s, boost::as_literal("."));
 		});
 
 	// remove double dot segments
 	std::vector<std::string> normalized_segments;
 	auto depth = 0;
 	for_each(path_segments, [&normalized_segments, &depth] (const uri::string_type &s) {
 			assert(depth >= 0);
-			if (equal(s, as_literal(".."))) {
+			if (equal(s, boost::as_literal(".."))) {
 				normalized_segments.pop_back();
 			}
 			else {

libs/network/src/uri/uri.cpp

@@ -10,11 +10,18 @@
 #include <boost/algorithm/string/predicate.hpp>
 #include <map>
 
-#include <iterator>
-#include <iostream>
-
 namespace network {
 bool operator == (const uri &lhs, const uri &rhs) {
+
+	// if both URIs are empty, then we should define them as equal even though they're still invalid.
+	if (boost::empty(lhs) && boost::empty(rhs)) {
+		return true;
+	}
+
+	if (!valid(lhs) || !valid(rhs)) {
+		return false;
+	}
+
 	// the scheme can be compared insensitive to case
 	bool equal = boost::iequals(lhs.scheme_range(), rhs.scheme_range());
 	if (equal) {
@@ -46,7 +53,7 @@ bool operator == (const uri &lhs, const uri &rhs) {
 	}
 
 	if (equal) {
-		// TODO: test normalized paths
+		// test normalized paths
 		equal = boost::iequals(normalize_path(lhs.path_range()), normalize_path(rhs.path_range()));
 	}