The latest fixes for http listener

Author: arturl

Release/collateral/Samples/BlackJack/BlackJack_Client/Makefile

@@ -304,10 +304,21 @@ pplx::task<void> http_windows_server::register_listener(_In_ http_listener *pLis
 
 pplx::task<void> http_windows_server::unregister_listener(_In_ http_listener *pListener)
 {
+    http::uri listener_uri = pListener->uri();
+    if (listener_uri.is_port_default())
+    {
+        // Windows HTTP Server API has issues when the port isn't set to 80 here -- it expects a url prefix string
+        // which always includes the port number
+        // http://msdn.microsoft.com/en-us/library/windows/desktop/aa364698(v=vs.85).aspx
+        http::uri_builder builder(listener_uri);
+        builder.set_port(80);
+        listener_uri = builder.to_uri();
+    }
+
     // Windows HTTP Server API will not accept a uri with an empty path, it must have a '/'.
-    const http::uri listener_uri = pListener->uri();
+    // Windows HTTP Server API will only accept decoded uri strings.
     utility::string_t host_uri = web::http::uri::decode(listener_uri.to_string());
-    if(listener_uri.is_path_empty() && host_uri[host_uri.length() - 1] != '/' && listener_uri.query().empty() && listener_uri.fragment().empty())
+    if(host_uri.back() != U('/') && listener_uri.query().empty() && listener_uri.fragment().empty())
     {
         host_uri.append(U("/"));
     }

Release/collateral/Samples/BlackJack/BlackJack_Server/Makefile

@@ -8,12 +8,12 @@
 
   <ItemGroup Condition="'$(DevToolsVersion)'=='110'">
       <ProjectFile Include="VS11\CommonUtilities110.vcxproj" />
-      <ProjectFile Include="VS11.xp\CommonUtilities110.xp.vcxproj" />
+      <ProjectFile Include="VS11.xp\CommonUtilities110.xp.vcxproj"  Condition="'$(Platform)'!='ARM'"/>
   </ItemGroup>
 
   <ItemGroup Condition="'$(DevToolsVersion)'=='120'">
       <ProjectFile Include="VS12\CommonUtilities120.vcxproj" />
-      <ProjectFile Include="VS12.xp\CommonUtilities120.xp.vcxproj" />
+      <ProjectFile Include="VS12.xp\CommonUtilities120.xp.vcxproj"  Condition="'$(Platform)'!='ARM'"/>
   </ItemGroup>
 
   <ItemGroup Condition="'$(OsVersion)|$(DevToolsVersion)'=='6.2|120' or '$(OsVersion)|$(DevToolsVersion)'=='6.3|120'">

Release/src/http/listener/http_windows_server.cpp

@@ -71,6 +71,27 @@ SUITE(connections_and_errors)
     (closeTask && clientTask).wait();
 }
 
+// Note: Run with admin privileges to listen on default port.
+// This test will fail with "Access denied: attempting to add Address.." exception if it is not run as admin.
+TEST(default_port_close, "Ignore", "Manual")
+{
+    uri address(U("http://localhost/portnotspecified"));
+    http_listener listener(address);
+
+    try
+    {
+        listener.open().wait();
+    }
+    catch(const http_exception& ex)
+    {
+        VERIFY_IS_FALSE(true, ex.what());
+        return;
+    }
+
+    // Verify close does not throw an exception while listening on default port
+    listener.close().wait();
+}
+
 TEST_FIXTURE(uri_address, send_response_later)
 {
     http_listener listener(m_uri);
@@ -253,6 +274,8 @@ TEST_FIXTURE(uri_address, close_stream_with_exception, "Ignore:Linux", "760544")
     close_stream_early_impl(m_uri, false);
 }
 
+
+
 }
 
 }}}}