Rename boost_asio files

Builds/VisualStudio2012/beast.vcxproj

@@ -79,42 +79,44 @@
     <ClInclude Include="..\..\beast\mpl\RemoveConstVolatile.h" />
     <ClInclude Include="..\..\beast\mpl\RemoveReference.h" />
     <ClInclude Include="..\..\beast\mpl\RemoveVolatile.h" />
-    <ClInclude Include="..\..\modules\beast_asio\async\beast_ComposedAsyncOperation.h" />
+    <ClInclude Include="..\..\modules\beast_asio\async\ComposedAsyncOperation.h" />
-    <ClInclude Include="..\..\modules\beast_asio\async\beast_SharedHandler.h" />
+    <ClInclude Include="..\..\modules\beast_asio\async\SharedHandler.h" />
-    <ClInclude Include="..\..\modules\beast_asio\async\beast_SharedHandlerAllocator.h" />
+    <ClInclude Include="..\..\modules\beast_asio\async\SharedHandlerAllocator.h" />
-    <ClInclude Include="..\..\modules\beast_asio\async\beast_SharedHandlerPtr.h" />
+    <ClInclude Include="..\..\modules\beast_asio\async\SharedHandlerPtr.h" />
-    <ClInclude Include="..\..\modules\beast_asio\async\beast_SharedHandlerType.h" />
+    <ClInclude Include="..\..\modules\beast_asio\async\SharedHandlerType.h" />
-    <ClInclude Include="..\..\modules\beast_asio\basics\beast_BufferType.h" />
+    <ClInclude Include="..\..\modules\beast_asio\basics\BufferType.h" />
-    <ClInclude Include="..\..\modules\beast_asio\basics\beast_FixedInputBuffer.h" />
+    <ClInclude Include="..\..\modules\beast_asio\basics\FixedInputBuffer.h" />
-    <ClInclude Include="..\..\modules\beast_asio\basics\beast_PeerRole.h" />
+    <ClInclude Include="..\..\modules\beast_asio\basics\PeerRole.h" />
     <ClInclude Include="..\..\modules\beast_asio\basics\SSLContext.h" />
     <ClInclude Include="..\..\modules\beast_asio\beast_asio.h" />
-    <ClInclude Include="..\..\modules\beast_asio\handshake\beast_HandshakeDetectLogic.h" />
+    <ClInclude Include="..\..\modules\beast_asio\client\HttpClient.h" />
-    <ClInclude Include="..\..\modules\beast_asio\handshake\beast_HandshakeDetectLogicPROXY.h" />
-    <ClInclude Include="..\..\modules\beast_asio\handshake\beast_HandshakeDetectLogicSSL2.h" />
-    <ClInclude Include="..\..\modules\beast_asio\handshake\beast_HandshakeDetectLogicSSL3.h" />
-    <ClInclude Include="..\..\modules\beast_asio\handshake\beast_HandshakeDetector.h" />
-    <ClInclude Include="..\..\modules\beast_asio\handshake\beast_InputParser.h" />
-    <ClInclude Include="..\..\modules\beast_asio\handshake\beast_PrefilledReadStream.h" />
     <ClInclude Include="..\..\modules\beast_asio\parsehttp\http_parser.h" />
-    <ClInclude Include="..\..\modules\beast_asio\sockets\beast_Socket.h" />
+    <ClInclude Include="..\..\modules\beast_asio\protocol\HandshakeDetectLogic.h" />
-    <ClInclude Include="..\..\modules\beast_asio\sockets\beast_SocketBase.h" />
+    <ClInclude Include="..\..\modules\beast_asio\protocol\HandshakeDetectLogicPROXY.h" />
-    <ClInclude Include="..\..\modules\beast_asio\sockets\beast_SocketWrapper.h" />
+    <ClInclude Include="..\..\modules\beast_asio\protocol\HandshakeDetectLogicSSL2.h" />
+    <ClInclude Include="..\..\modules\beast_asio\protocol\HandshakeDetectLogicSSL3.h" />
+    <ClInclude Include="..\..\modules\beast_asio\protocol\HandshakeDetector.h" />
+    <ClInclude Include="..\..\modules\beast_asio\protocol\HttpClient.h" />
+    <ClInclude Include="..\..\modules\beast_asio\protocol\InputParser.h" />
+    <ClInclude Include="..\..\modules\beast_asio\protocol\PrefilledReadStream.h" />
+    <ClInclude Include="..\..\modules\beast_asio\sockets\Socket.h" />
+    <ClInclude Include="..\..\modules\beast_asio\sockets\SocketBase.h" />
+    <ClInclude Include="..\..\modules\beast_asio\sockets\SocketWrapper.h" />
     <ClInclude Include="..\..\modules\beast_asio\sockets\SocketWrapperStrand.h" />
     <ClInclude Include="..\..\modules\beast_asio\system\BoostIncludes.h" />
-    <ClInclude Include="..\..\modules\beast_asio\system\beast_OpenSSLIncludes.h" />
+    <ClInclude Include="..\..\modules\beast_asio\system\OpenSSLIncludes.h" />
-    <ClInclude Include="..\..\modules\beast_asio\tests\beast_TestPeer.h" />
+    <ClInclude Include="..\..\modules\beast_asio\tests\TestPeer.h" />
-    <ClInclude Include="..\..\modules\beast_asio\tests\beast_TestPeerBasics.h" />
+    <ClInclude Include="..\..\modules\beast_asio\tests\TestPeerBasics.h" />
-    <ClInclude Include="..\..\modules\beast_asio\tests\beast_TestPeerDetails.h" />
+    <ClInclude Include="..\..\modules\beast_asio\tests\TestPeerDetails.h" />
-    <ClInclude Include="..\..\modules\beast_asio\tests\beast_TestPeerDetailsTcp.h" />
+    <ClInclude Include="..\..\modules\beast_asio\tests\TestPeerDetailsTcp.h" />
-    <ClInclude Include="..\..\modules\beast_asio\tests\beast_TestPeerLogic.h" />
+    <ClInclude Include="..\..\modules\beast_asio\tests\TestPeerLogic.h" />
-    <ClInclude Include="..\..\modules\beast_asio\tests\beast_TestPeerLogicAsyncClient.h" />
+    <ClInclude Include="..\..\modules\beast_asio\tests\TestPeerLogicAsyncClient.h" />
-    <ClInclude Include="..\..\modules\beast_asio\tests\beast_TestPeerLogicAsyncServer.h" />
+    <ClInclude Include="..\..\modules\beast_asio\tests\TestPeerLogicAsyncServer.h" />
-    <ClInclude Include="..\..\modules\beast_asio\tests\beast_TestPeerLogicProxyClient.h" />
+    <ClInclude Include="..\..\modules\beast_asio\tests\TestPeerLogicProxyClient.h" />
-    <ClInclude Include="..\..\modules\beast_asio\tests\beast_TestPeerLogicSyncClient.h" />
+    <ClInclude Include="..\..\modules\beast_asio\tests\TestPeerLogicSyncClient.h" />
-    <ClInclude Include="..\..\modules\beast_asio\tests\beast_TestPeerLogicSyncServer.h" />
+    <ClInclude Include="..\..\modules\beast_asio\tests\TestPeerLogicSyncServer.h" />
-    <ClInclude Include="..\..\modules\beast_asio\tests\beast_PeerTest.h" />
+    <ClInclude Include="..\..\modules\beast_asio\tests\PeerTest.h" />
-    <ClInclude Include="..\..\modules\beast_asio\tests\beast_TestPeerType.h" />
+    <ClInclude Include="..\..\modules\beast_asio\tests\TestPeerType.h" />
     <ClInclude Include="..\..\modules\beast_core\beast_core.h" />
     <ClInclude Include="..\..\modules\beast_core\containers\beast_AbstractFifo.h" />
     <ClInclude Include="..\..\modules\beast_core\containers\beast_Array.h" />
@@ -342,13 +344,13 @@
     <ClInclude Include="BeastConfig.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\modules\beast_asio\async\beast_SharedHandler.cpp">
+    <ClCompile Include="..\..\modules\beast_asio\async\SharedHandler.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_asio\basics\beast_PeerRole.cpp">
+    <ClCompile Include="..\..\modules\beast_asio\basics\PeerRole.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -359,85 +361,85 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\modules\beast_asio\beast_asio.cpp" />
-    <ClCompile Include="..\..\modules\beast_asio\handshake\beast_HandshakeDetectLogicPROXY.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\modules\beast_asio\parsehttp\http_parser.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_asio\sockets\beast_Socket.cpp">
+    <ClCompile Include="..\..\modules\beast_asio\protocol\HandshakeDetectLogicPROXY.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_asio\sockets\beast_SocketBase.cpp">
+    <ClCompile Include="..\..\modules\beast_asio\sockets\Socket.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_asio\system\beast_BoostUnitTests.cpp">
+    <ClCompile Include="..\..\modules\beast_asio\sockets\SocketBase.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_asio\tests\beast_TestPeerLogic.cpp">
+    <ClCompile Include="..\..\modules\beast_asio\system\BoostUnitTests.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_asio\tests\beast_TestPeerLogicAsyncClient.cpp">
+    <ClCompile Include="..\..\modules\beast_asio\tests\TestPeerLogic.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_asio\tests\beast_TestPeerLogicAsyncServer.cpp">
+    <ClCompile Include="..\..\modules\beast_asio\tests\TestPeerLogicAsyncClient.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_asio\tests\beast_TestPeerLogicProxyClient.cpp">
+    <ClCompile Include="..\..\modules\beast_asio\tests\TestPeerLogicAsyncServer.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_asio\tests\beast_TestPeerLogicSyncClient.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_asio\tests\beast_TestPeerLogicSyncServer.cpp">
+    <ClCompile Include="..\..\modules\beast_asio\tests\TestPeerLogicProxyClient.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\beast_asio\tests\TestPeerLogicSyncClient.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_asio\tests\beast_PeerTest.cpp">
+    <ClCompile Include="..\..\modules\beast_asio\tests\TestPeerLogicSyncServer.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_asio\tests\beast_TestPeerUnitTests.cpp">
+    <ClCompile Include="..\..\modules\beast_asio\tests\PeerTest.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_asio\tests\beast_TestPeerBasics.cpp">
+    <ClCompile Include="..\..\modules\beast_asio\tests\TestPeerUnitTests.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\beast_asio\tests\TestPeerBasics.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>

Builds/VisualStudio2012/beast.vcxproj.filters

@@ -137,9 +137,6 @@
     <Filter Include="beast_asio\basics">
       <UniqueIdentifier>{ccdc0c8e-f77a-486e-ba2f-29c10ec97f18}</UniqueIdentifier>
     </Filter>
-    <Filter Include="beast_asio\handshake">
-      <UniqueIdentifier>{4856837a-fa72-4252-8e8f-a112c1dbb3d2}</UniqueIdentifier>
-    </Filter>
     <Filter Include="beast_asio\async">
       <UniqueIdentifier>{beb81776-4aad-401d-8826-81478dbbf30b}</UniqueIdentifier>
     </Filter>
@@ -176,6 +173,9 @@
     <Filter Include="beast_asio\parsehttp">
       <UniqueIdentifier>{ac367054-ddbf-4118-a41a-07bea34d32c8}</UniqueIdentifier>
     </Filter>
+    <Filter Include="beast_asio\protocol">
+      <UniqueIdentifier>{c0724499-ab69-40c3-90e2-65242dbd2eaa}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\modules\beast_core\beast_core.h">
@@ -677,108 +677,15 @@
     <ClInclude Include="..\..\modules\beast_core\diagnostic\beast_SemanticVersion.h">
       <Filter>beast_core\diagnostic</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_asio\sockets\beast_SocketBase.h">
-      <Filter>beast_asio\sockets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_asio\sockets\beast_SocketWrapper.h">
-      <Filter>beast_asio\sockets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_asio\sockets\beast_Socket.h">
-      <Filter>beast_asio\sockets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_asio\tests\beast_TestPeer.h">
-      <Filter>beast_asio\tests</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_asio\tests\beast_TestPeerBasics.h">
-      <Filter>beast_asio\tests</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_asio\tests\beast_TestPeerLogic.h">
-      <Filter>beast_asio\tests</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_asio\tests\beast_TestPeerDetails.h">
-      <Filter>beast_asio\tests</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_asio\tests\beast_TestPeerLogicAsyncServer.h">
-      <Filter>beast_asio\tests</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_asio\tests\beast_TestPeerLogicSyncClient.h">
-      <Filter>beast_asio\tests</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_asio\tests\beast_TestPeerLogicSyncServer.h">
-      <Filter>beast_asio\tests</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_asio\tests\beast_TestPeerType.h">
-      <Filter>beast_asio\tests</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_asio\tests\beast_TestPeerDetailsTcp.h">
-      <Filter>beast_asio\tests</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_asio\tests\beast_TestPeerLogicAsyncClient.h">
-      <Filter>beast_asio\tests</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_asio\tests\beast_PeerTest.h">
-      <Filter>beast_asio\tests</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_asio\tests\beast_TestPeerLogicProxyClient.h">
-      <Filter>beast_asio\tests</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_asio\basics\beast_BufferType.h">
-      <Filter>beast_asio\basics</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_asio\basics\beast_PeerRole.h">
-      <Filter>beast_asio\basics</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\modules\beast_core\maths\beast_uint24.h">
       <Filter>beast_core\maths</Filter>
     </ClInclude>
     <ClInclude Include="..\..\modules\beast_core\memory\beast_ByteSwap.h">
       <Filter>beast_core\memory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_asio\handshake\beast_HandshakeDetectLogic.h">
-      <Filter>beast_asio\handshake</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_asio\basics\beast_FixedInputBuffer.h">
-      <Filter>beast_asio\basics</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_asio\handshake\beast_HandshakeDetectLogicSSL2.h">
-      <Filter>beast_asio\handshake</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_asio\handshake\beast_HandshakeDetectLogicSSL3.h">
-      <Filter>beast_asio\handshake</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_asio\handshake\beast_HandshakeDetectLogicPROXY.h">
-      <Filter>beast_asio\handshake</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\modules\beast_core\memory\beast_ContainerDeletePolicy.h">
       <Filter>beast_core\memory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_asio\system\beast_OpenSSLIncludes.h">
-      <Filter>beast_asio\system</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_asio\handshake\beast_HandshakeDetector.h">
-      <Filter>beast_asio\handshake</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_asio\handshake\beast_PrefilledReadStream.h">
-      <Filter>beast_asio\handshake</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_asio\async\beast_ComposedAsyncOperation.h">
-      <Filter>beast_asio\async</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_asio\async\beast_SharedHandler.h">
-      <Filter>beast_asio\async</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_asio\async\beast_SharedHandlerAllocator.h">
-      <Filter>beast_asio\async</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_asio\async\beast_SharedHandlerPtr.h">
-      <Filter>beast_asio\async</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_asio\async\beast_SharedHandlerType.h">
-      <Filter>beast_asio\async</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\beast_asio\handshake\beast_InputParser.h">
-      <Filter>beast_asio\handshake</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\modules\beast_core\diagnostic\MeasureFunctionCallTime.h">
       <Filter>beast_core\diagnostic</Filter>
     </ClInclude>
@@ -989,6 +896,105 @@
     <ClInclude Include="..\..\modules\beast_asio\parsehttp\http_parser.h">
       <Filter>beast_asio\parsehttp</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\modules\beast_asio\async\ComposedAsyncOperation.h">
+      <Filter>beast_asio\async</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_asio\async\SharedHandler.h">
+      <Filter>beast_asio\async</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_asio\async\SharedHandlerAllocator.h">
+      <Filter>beast_asio\async</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_asio\async\SharedHandlerPtr.h">
+      <Filter>beast_asio\async</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_asio\async\SharedHandlerType.h">
+      <Filter>beast_asio\async</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_asio\basics\BufferType.h">
+      <Filter>beast_asio\basics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_asio\basics\FixedInputBuffer.h">
+      <Filter>beast_asio\basics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_asio\basics\PeerRole.h">
+      <Filter>beast_asio\basics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_asio\sockets\Socket.h">
+      <Filter>beast_asio\sockets</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_asio\sockets\SocketBase.h">
+      <Filter>beast_asio\sockets</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_asio\sockets\SocketWrapper.h">
+      <Filter>beast_asio\sockets</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_asio\system\OpenSSLIncludes.h">
+      <Filter>beast_asio\system</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_asio\tests\PeerTest.h">
+      <Filter>beast_asio\tests</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_asio\tests\TestPeer.h">
+      <Filter>beast_asio\tests</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_asio\tests\TestPeerBasics.h">
+      <Filter>beast_asio\tests</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_asio\tests\TestPeerDetails.h">
+      <Filter>beast_asio\tests</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_asio\tests\TestPeerDetailsTcp.h">
+      <Filter>beast_asio\tests</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_asio\tests\TestPeerLogic.h">
+      <Filter>beast_asio\tests</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_asio\tests\TestPeerLogicAsyncClient.h">
+      <Filter>beast_asio\tests</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_asio\tests\TestPeerLogicAsyncServer.h">
+      <Filter>beast_asio\tests</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_asio\tests\TestPeerLogicProxyClient.h">
+      <Filter>beast_asio\tests</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_asio\tests\TestPeerLogicSyncClient.h">
+      <Filter>beast_asio\tests</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_asio\tests\TestPeerLogicSyncServer.h">
+      <Filter>beast_asio\tests</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_asio\tests\TestPeerType.h">
+      <Filter>beast_asio\tests</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_asio\client\HttpClient.h">
+      <Filter>beast_asio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_asio\protocol\HandshakeDetectLogic.h">
+      <Filter>beast_asio\protocol</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_asio\protocol\HandshakeDetectLogicPROXY.h">
+      <Filter>beast_asio\protocol</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_asio\protocol\HandshakeDetectLogicSSL2.h">
+      <Filter>beast_asio\protocol</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_asio\protocol\HandshakeDetectLogicSSL3.h">
+      <Filter>beast_asio\protocol</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_asio\protocol\HandshakeDetector.h">
+      <Filter>beast_asio\protocol</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_asio\protocol\HttpClient.h">
+      <Filter>beast_asio\protocol</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_asio\protocol\InputParser.h">
+      <Filter>beast_asio\protocol</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_asio\protocol\PrefilledReadStream.h">
+      <Filter>beast_asio\protocol</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\modules\beast_core\beast_core.cpp">
@@ -1357,51 +1363,6 @@
     <ClCompile Include="..\..\modules\beast_asio\beast_asio.cpp">
       <Filter>beast_asio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_asio\tests\beast_TestPeerBasics.cpp">
-      <Filter>beast_asio\tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_asio\sockets\beast_Socket.cpp">
-      <Filter>beast_asio\sockets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_asio\sockets\beast_SocketBase.cpp">
-      <Filter>beast_asio\sockets</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_asio\tests\beast_TestPeerLogic.cpp">
-      <Filter>beast_asio\tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_asio\tests\beast_TestPeerLogicSyncClient.cpp">
-      <Filter>beast_asio\tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_asio\tests\beast_TestPeerLogicSyncServer.cpp">
-      <Filter>beast_asio\tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_asio\tests\beast_TestPeerLogicAsyncClient.cpp">
-      <Filter>beast_asio\tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_asio\tests\beast_TestPeerLogicAsyncServer.cpp">
-      <Filter>beast_asio\tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_asio\tests\beast_PeerTest.cpp">
-      <Filter>beast_asio\tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_asio\tests\beast_TestPeerUnitTests.cpp">
-      <Filter>beast_asio\tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_asio\tests\beast_TestPeerLogicProxyClient.cpp">
-      <Filter>beast_asio\tests</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_asio\basics\beast_PeerRole.cpp">
-      <Filter>beast_asio\basics</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_asio\handshake\beast_HandshakeDetectLogicPROXY.cpp">
-      <Filter>beast_asio\handshake</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_asio\system\beast_BoostUnitTests.cpp">
-      <Filter>beast_asio\system</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_asio\async\beast_SharedHandler.cpp">
-      <Filter>beast_asio\async</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\modules\beast_core\threads\beast_ReadWriteMutex.cpp">
       <Filter>beast_core\threads</Filter>
     </ClCompile>
@@ -1477,6 +1438,51 @@
     <ClCompile Include="..\..\modules\beast_asio\parsehttp\http_parser.c">
       <Filter>beast_asio\parsehttp</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\modules\beast_asio\async\SharedHandler.cpp">
+      <Filter>beast_asio\async</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\beast_asio\basics\PeerRole.cpp">
+      <Filter>beast_asio\basics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\beast_asio\sockets\Socket.cpp">
+      <Filter>beast_asio\sockets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\beast_asio\sockets\SocketBase.cpp">
+      <Filter>beast_asio\sockets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\beast_asio\system\BoostUnitTests.cpp">
+      <Filter>beast_asio\system</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\beast_asio\tests\PeerTest.cpp">
+      <Filter>beast_asio\tests</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\beast_asio\tests\TestPeerBasics.cpp">
+      <Filter>beast_asio\tests</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\beast_asio\tests\TestPeerLogic.cpp">
+      <Filter>beast_asio\tests</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\beast_asio\tests\TestPeerLogicAsyncClient.cpp">
+      <Filter>beast_asio\tests</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\beast_asio\tests\TestPeerLogicAsyncServer.cpp">
+      <Filter>beast_asio\tests</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\beast_asio\tests\TestPeerLogicProxyClient.cpp">
+      <Filter>beast_asio\tests</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\beast_asio\tests\TestPeerLogicSyncClient.cpp">
+      <Filter>beast_asio\tests</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\beast_asio\tests\TestPeerLogicSyncServer.cpp">
+      <Filter>beast_asio\tests</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\beast_asio\tests\TestPeerUnitTests.cpp">
+      <Filter>beast_asio\tests</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\beast_asio\protocol\HandshakeDetectLogicPROXY.cpp">
+      <Filter>beast_asio\protocol</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Text Include="..\..\TODO.txt" />

modules/beast_asio/beast_asio.cpp

@@ -19,53 +19,47 @@
 
 #include "BeastConfig.h"
 
-#include "system/beast_OpenSSLIncludes.h"
+#include "system/OpenSSLIncludes.h"
 
 #include "beast_asio.h"
 
-namespace http_parser
-{
-#include "parsehttp/http_parser.h"
-}
-
 namespace beast
 {
 
-#include "async/beast_SharedHandler.cpp"
+#include "async/SharedHandler.cpp"
 
-#include "basics/beast_PeerRole.cpp"
+#include "basics/PeerRole.cpp"
 #include "basics/SSLContext.cpp"
 
-#include "sockets/beast_SocketBase.cpp"
+#include "sockets/SocketBase.cpp"
-#include "sockets/beast_Socket.cpp"
+#include "sockets/Socket.cpp"
 
-#include "handshake/beast_HandshakeDetectLogicPROXY.cpp"
+#include "protocol/HandshakeDetectLogicPROXY.cpp"
 
-#include "tests/beast_PeerTest.cpp"
+#include "parsehttp/http_parser.h"
-#include "tests/beast_TestPeerBasics.cpp"
-#include "tests/beast_TestPeerLogic.cpp"
-#include "tests/beast_TestPeerLogicProxyClient.cpp"
-#include "tests/beast_TestPeerLogicSyncServer.cpp"
-#include "tests/beast_TestPeerLogicSyncClient.cpp"
-#include "tests/beast_TestPeerLogicAsyncServer.cpp"
-#include "tests/beast_TestPeerLogicAsyncClient.cpp"
-#include "tests/beast_TestPeerUnitTests.cpp"
 
-#include "system/beast_BoostUnitTests.cpp"
+#include "tests/PeerTest.cpp"
+#include "tests/TestPeerBasics.cpp"
+#include "tests/TestPeerLogic.cpp"
+#include "tests/TestPeerLogicProxyClient.cpp"
+#include "tests/TestPeerLogicSyncServer.cpp"
+#include "tests/TestPeerLogicSyncClient.cpp"
+#include "tests/TestPeerLogicAsyncServer.cpp"
+#include "tests/TestPeerLogicAsyncClient.cpp"
+#include "tests/TestPeerUnitTests.cpp"
 
-}
+#include "system/BoostUnitTests.cpp"
-
-//------------------------------------------------------------------------------
 
 #ifdef _MSC_VER
 #pragma warning (push)
 #pragma warning (disable: 4127) // conditional expression is constant
 #pragma warning (disable: 4244) // integer conversion, possible loss of data
 #endif
-namespace http_parser
-{
 #include "parsehttp/http_parser.c"
-}
 #ifdef _MSC_VER
 #pragma warning (pop)
 #endif
+
+}
+
+//------------------------------------------------------------------------------

modules/beast_asio/beast_asio.h

@@ -64,42 +64,42 @@ namespace beast
 {
 
 // Order matters
-  #include "async/beast_SharedHandler.h"
+#  include "async/SharedHandler.h"
- #include "async/beast_SharedHandlerType.h"
+# include "async/SharedHandlerType.h"
- #include "async/beast_SharedHandlerPtr.h"
+# include "async/SharedHandlerPtr.h"
- #include "async/beast_ComposedAsyncOperation.h"
+# include "async/ComposedAsyncOperation.h"
-#include "async/beast_SharedHandlerAllocator.h"
+#include "async/SharedHandlerAllocator.h"
 
-#include "basics/beast_BufferType.h"
+#include "basics/BufferType.h"
-#include "basics/beast_FixedInputBuffer.h"
+#include "basics/FixedInputBuffer.h"
-#include "basics/beast_PeerRole.h"
+#include "basics/PeerRole.h"
 #include "basics/SSLContext.h"
 
-   #include "sockets/beast_SocketBase.h"
+#   include "sockets/SocketBase.h"
-  #include "sockets/beast_Socket.h"
+#  include "sockets/Socket.h"
- #include "sockets/beast_SocketWrapper.h"
+# include "sockets/SocketWrapper.h"
 #include "sockets/SocketWrapperStrand.h"
 
-  #include "handshake/beast_InputParser.h"
+#  include "protocol/InputParser.h"
- #include "handshake/beast_HandshakeDetectLogic.h"
+# include "protocol/HandshakeDetectLogic.h"
-#include "handshake/beast_HandshakeDetectLogicPROXY.h"
+#include "protocol/HandshakeDetectLogicPROXY.h"
-#include "handshake/beast_HandshakeDetectLogicSSL2.h"
+#include "protocol/HandshakeDetectLogicSSL2.h"
-#include "handshake/beast_HandshakeDetectLogicSSL3.h"
+#include "protocol/HandshakeDetectLogicSSL3.h"
-#include "handshake/beast_HandshakeDetector.h"
+#include "protocol/HandshakeDetector.h"
-#include "handshake/beast_PrefilledReadStream.h"
+#include "protocol/PrefilledReadStream.h"
 
-#include "tests/beast_TestPeerBasics.h"
+#include "tests/TestPeerBasics.h"
-#include "tests/beast_TestPeer.h"
+#include "tests/TestPeer.h"
-#include "tests/beast_TestPeerDetails.h"
+#include "tests/TestPeerDetails.h"
-#include "tests/beast_TestPeerLogic.h"
+#include "tests/TestPeerLogic.h"
-#include "tests/beast_TestPeerLogicSyncServer.h"
+#include "tests/TestPeerLogicSyncServer.h"
-#include "tests/beast_TestPeerLogicSyncClient.h"
+#include "tests/TestPeerLogicSyncClient.h"
-#include "tests/beast_TestPeerLogicProxyClient.h"
+#include "tests/TestPeerLogicProxyClient.h"
-#include "tests/beast_TestPeerLogicAsyncServer.h"
+#include "tests/TestPeerLogicAsyncServer.h"
-#include "tests/beast_TestPeerLogicAsyncClient.h"
+#include "tests/TestPeerLogicAsyncClient.h"
-#include "tests/beast_TestPeerType.h"
+#include "tests/TestPeerType.h"
-#include "tests/beast_TestPeerDetailsTcp.h"
+#include "tests/TestPeerDetailsTcp.h"
-#include "tests/beast_PeerTest.h"
+#include "tests/PeerTest.h"
 
 }
 

modules/beast_asio/protocol/HttpClient.h

@@ -0,0 +1,23 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_ASIO_PROTOCOL_HTTPCLIENT_H_INCLUDED
+#define BEAST_ASIO_PROTOCOL_HTTPCLIENT_H_INCLUDED
+
+#endif