Convert http_versions::from_string to use UTF-8

Author: ras0219-msft

Release/include/cpprest/http_msg.h

@@ -63,7 +63,7 @@ struct http_version
     /// Creates <c>http_version</c> from an HTTP-Version string, "HTTP" "/" 1*DIGIT "." 1*DIGIT.
     /// </summary>
     /// <returns>Returns a <c>http_version</c> of {0, 0} if not successful.</returns>
-    static _ASYNCRTIMP http_version __cdecl from_string(const utility::string_t& http_version_string);
+    static _ASYNCRTIMP http_version __cdecl from_string(const std::string& http_version_string);
 
     /// <summary>
     /// Returns the string representation of the <c>http_version</c>.

Release/src/http/common/http_msg.cpp

@@ -254,18 +254,18 @@ void parse_headers_string(_Inout_z_ utf16char *headersStr, http_headers &headers
 
 }
 
-http_version __cdecl http_version::from_string(const utility::string_t& http_version_string)
+http_version __cdecl http_version::from_string(const std::string& http_version_string)
 {
-    utility::istringstream_t str(http_version_string);
+    std::stringstream str(http_version_string);
     str.imbue(std::locale::classic());
 
-    utility::string_t http; std::getline(str, http, _XPLATSTR('/'));
+    std::string http; std::getline(str, http, '/');
     unsigned int major = 0; str >> major;
-    utility::char_t dot = _XPLATSTR('\0'); str >> dot;
+    char dot = '\0'; str >> dot;
     unsigned int minor = 0; str >> minor;
 
     // check no failure, fully consumed, and correct fixed text
-    if (!str.fail() && str.eof() && _XPLATSTR("HTTP") == http && _XPLATSTR('.') == dot)
+    if (!str.fail() && str.eof() && "HTTP" == http && '.' == dot)
     {
         return{ (uint8_t)major, (uint8_t)minor };
     }

Release/tests/functional/http/listener/request_handler_tests.cpp

@@ -456,22 +456,22 @@ TEST_FIXTURE(uri_address, http_version)
     VERIFY_IS_TRUE("HTTP/1.1" == http_versions::HTTP_1_1.to_utf8string());
     VERIFY_IS_TRUE("HTTP/12.3" == (http_version{ 12, 3 }).to_utf8string());
     // parsing should succeed
-    VERIFY_IS_TRUE(http_version::from_string(U("HTTP/0.9")) == http_versions::HTTP_0_9);
-    VERIFY_IS_TRUE(http_version::from_string(U("HTTP/1.0")) == http_versions::HTTP_1_0);
-    VERIFY_IS_TRUE(http_version::from_string(U("HTTP/1.1")) == http_versions::HTTP_1_1);
-    VERIFY_IS_TRUE((http_version::from_string(U("HTTP/12.3")) == http_version{ 12, 3 }));
+    VERIFY_IS_TRUE(http_version::from_string("HTTP/0.9") == http_versions::HTTP_0_9);
+    VERIFY_IS_TRUE(http_version::from_string("HTTP/1.0") == http_versions::HTTP_1_0);
+    VERIFY_IS_TRUE(http_version::from_string("HTTP/1.1") == http_versions::HTTP_1_1);
+    VERIFY_IS_TRUE((http_version::from_string("HTTP/12.3") == http_version{ 12, 3 }));
     // parsing should fail
     http_version unknown = { 0, 0 };
-    VERIFY_IS_TRUE(http_version::from_string(U("http/12.3")) == unknown);
-    VERIFY_IS_TRUE(http_version::from_string(U("HTTP/12.3foo")) == unknown);
-    VERIFY_IS_TRUE(http_version::from_string(U("HTTP/12.")) == unknown);
-    VERIFY_IS_TRUE(http_version::from_string(U("HTTP/12")) == unknown);
-    VERIFY_IS_TRUE(http_version::from_string(U("HTTP/.3")) == unknown);
-    VERIFY_IS_TRUE(http_version::from_string(U("HTTP/")) == unknown);
-    VERIFY_IS_TRUE(http_version::from_string(U("HTTP")) == unknown);
-    VERIFY_IS_TRUE(http_version::from_string(U("HTTP")) == unknown);
-    VERIFY_IS_TRUE(http_version::from_string(U("foo")) == unknown);
-    VERIFY_IS_TRUE(http_version::from_string(U("")) == unknown);
+    VERIFY_IS_TRUE(http_version::from_string("http/12.3") == unknown);
+    VERIFY_IS_TRUE(http_version::from_string("HTTP/12.3foo") == unknown);
+    VERIFY_IS_TRUE(http_version::from_string("HTTP/12.") == unknown);
+    VERIFY_IS_TRUE(http_version::from_string("HTTP/12") == unknown);
+    VERIFY_IS_TRUE(http_version::from_string("HTTP/.3") == unknown);
+    VERIFY_IS_TRUE(http_version::from_string("HTTP/") == unknown);
+    VERIFY_IS_TRUE(http_version::from_string("HTTP") == unknown);
+    VERIFY_IS_TRUE(http_version::from_string("HTTP") == unknown);
+    VERIFY_IS_TRUE(http_version::from_string("foo") == unknown);
+    VERIFY_IS_TRUE(http_version::from_string("") == unknown);
 
     http_listener listener(U("http://localhost:45678/path1"));
     listener.open().wait();