Added a normalize function in a new file uri/normalize.hpp

Author: idleman

boost/network/protocol/http/server/async_connection.hpp

@@ -447,7 +447,7 @@ namespace boost { namespace network { namespace http {
                             thread_pool().post(
                                 boost::bind(
                                     &Handler::operator(),
-                                    handler,
+                                    &handler,
                                     cref(request_),
                                     async_connection<Tag,Handler>::shared_from_this()));
                             return;

libs/network/test/uri/uri_test.cpp

@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 // Copyright 2009, 2010, 2011, 2012 Dean Michael Berris, Jeroen Habraken, Glyn Matthews, Fredrik Olofsson.
+=======
+// Copyright 2009, 2010, 2011 Dean Michael Berris, Jeroen Habraken, Glyn Matthews, Fredrik Olofsson.
+>>>>>>> 0c90ce044e6de485f66dd657a6d4ff9bba18279d
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt of copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -7,6 +11,7 @@
 #include <boost/config/warning_disable.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/network/uri.hpp>
+#include <boost/network/uri/utility.hpp>
 #include <boost/network/uri/uri.hpp>
 #include <boost/network/uri/uri_io.hpp>
 #include <boost/network/uri/normalize.hpp>
@@ -465,6 +470,7 @@ BOOST_AUTO_TEST_CASE(issue_104_test) {
 	BOOST_CHECK_EQUAL(uri::scheme(copy), "http");
 }
 
+<<<<<<< HEAD
 BOOST_AUTO_TEST_CASE(normalize_empty_string) {
 	BOOST_CHECK_EQUAL(uri::normalize(""), "/");
 }
@@ -476,4 +482,15 @@ BOOST_AUTO_TEST_CASE(normalize_relative_string) {
 }
 BOOST_AUTO_TEST_CASE(normalize_slashend_string) {
 	BOOST_CHECK_EQUAL(uri::normalize("/test/"), "/test");
+=======
+BOOST_AUTO_TEST_CASE(normalize_string) {
+	BOOST_CHECK_EQUAL(uri::normalize(""), "/");
+	BOOST_CHECK_EQUAL(uri::normalize("/"), "/");
+	BOOST_CHECK_EQUAL(uri::normalize("/../"), "/");
+	BOOST_CHECK_EQUAL(uri::normalize("/test/../../../"), "/");
+	BOOST_CHECK_EQUAL(uri::normalize("../../test"), "/test");
+	BOOST_CHECK_EQUAL(uri::normalize("/test/"), "/test");
+	BOOST_CHECK_EQUAL(uri::normalize("/test/test/../"), "/test");
+	BOOST_CHECK_EQUAL(uri::normalize("/../?test=test&param2=../p"), "/?test=test&param2=../p");
+>>>>>>> 0c90ce044e6de485f66dd657a6d4ff9bba18279d
 }