From d107fe0a36dff5029991c3acd4e4b277c322af3e Mon Sep 17 00:00:00 2001 From: Andy Sterland Date: Thu, 14 Apr 2016 14:21:52 -0700 Subject: [PATCH] Updating the /json/version to emit valid version. The data is still incorrect and we need to find APIs from Edge to discover the UA and version. --- EdgeDiagnosticsAdapter/WebSocketHandler.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/EdgeDiagnosticsAdapter/WebSocketHandler.cpp b/EdgeDiagnosticsAdapter/WebSocketHandler.cpp index 244d31e..04de161 100644 --- a/EdgeDiagnosticsAdapter/WebSocketHandler.cpp +++ b/EdgeDiagnosticsAdapter/WebSocketHandler.cpp @@ -136,8 +136,8 @@ void WebSocketHandler::OnHttp(websocketpp::connection_hdl hdl) else if (requestedResource == "/json/version") { // To do: This will need to change to support Edge - CStringA ieVersion = Helpers::GetFileVersion(L"C:\\Windows\\System32\\mshtml.dll"); - CStringA browser = "Internet Explorer " + ieVersion; + CStringA edgeVersion = Helpers::GetFileVersion(L"C:\\Windows\\System32\\edgehtml.dll"); + CStringA browser = "Microsoft Edge " + edgeVersion; browser = Helpers::EscapeJsonString(CString(browser)); @@ -155,10 +155,10 @@ void WebSocketHandler::OnHttp(websocketpp::connection_hdl hdl) CStringA userAgent = Helpers::EscapeJsonString(CString(pszUserAgent)); ss << "{" << endl; - ss << " \"Browser\" : \"" << browser << "\"" << endl; - ss << " \"Protocol-Version\" : \"" << EdgeDiagnosticsAdapter::s_Protocol_Version << "\"" << endl; - ss << " \"User-Agent\" : \"" << userAgent << "\"" << endl; - ss << " \"WebKit-Version\" : \"" << "0" << "\"" << endl; + ss << " \"Browser\" : \"" << browser << "\"" << "," << endl; + ss << " \"Protocol-Version\" : \"" << EdgeDiagnosticsAdapter::s_Protocol_Version << "\"" << "," << endl; + ss << " \"User-Agent\" : \"" << userAgent << "\"" << "," << endl; + ss << " \"WebKit-Version\" : \"" << "0" << "\"" << "" << endl; ss << "}"; }