Merge branch 'master' of github.com:jedmccaleb/NewCoin

This commit is contained in:
JoelKatz
2012-10-16 13:56:56 -07:00
3 changed files with 16 additions and 12 deletions

View File

@@ -49,7 +49,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>BOOST_TEST_ALTERNATIVE_INIT_API;BOOST_TEST_NO_MAIN;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0501;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\OpenSSL\include;..\boost_1_47_0;..\protobuf-2.4.1\src\</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.\obj;..\OpenSSL\include;..\boost_1_47_0;..\protobuf-2.4.1\src\</AdditionalIncludeDirectories>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
@@ -93,7 +93,7 @@
<ClCompile Include="json\json_reader.cpp" />
<ClCompile Include="json\json_value.cpp" />
<ClCompile Include="json\json_writer.cpp" />
<ClCompile Include="obj\src\newcoin.pb.cc" />
<ClCompile Include="obj\src\ripple.pb.cc" />
<ClCompile Include="src\AccountState.cpp" />
<ClCompile Include="src\Amount.cpp" />
<ClCompile Include="src\Application.cpp" />
@@ -268,13 +268,13 @@
<SubType>Designer</SubType>
</None>
<None Include="newcoind.cfg" />
<CustomBuild Include="src\newcoin.proto">
<FileType>Document</FileType>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\protoc-2.4.1-win32\protoc -I=..\newcoin\src --cpp_out=..\newcoin\obj\src ..\newcoin\src\newcoin.proto</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">obj\src\newcoin.pb.h</Outputs>
</CustomBuild>
<None Include="README" />
<None Include="SConstruct" />
<CustomBuild Include="src\ripple.proto">
<FileType>Document</FileType>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">d:/code/protoc-2.4.1-win32/protoc -I=..\newcoin --cpp_out=D:\code\newcoin\obj\ ..\newcoin/src/ripple.proto</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">D:\code\newcoin\obj\src\ripple.pb.h</Outputs>
</CustomBuild>
<None Include="test\buster.js" />
<None Include="test\server.js" />
<None Include="test\standalone-test.js" />

View File

@@ -201,9 +201,6 @@
<ClCompile Include="database\win\windatabase.cpp">
<Filter>Source Files\database</Filter>
</ClCompile>
<ClCompile Include="obj\src\newcoin.pb.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\RippleState.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -303,6 +300,9 @@
<ClCompile Include="src\TransactionErr.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="obj\src\ripple.pb.cc">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="KnownNodeList.h">
@@ -567,8 +567,12 @@
<None Include="newcoind.cfg" />
<None Include="validators.txt" />
<None Include="README" />
<None Include="test\buster.js" />
<None Include="test\server.js" />
<None Include="test\standalone-test.js" />
<None Include="test\utils.js" />
</ItemGroup>
<ItemGroup>
<CustomBuild Include="src\newcoin.proto" />
<CustomBuild Include="src\ripple.proto" />
</ItemGroup>
</Project>

View File

@@ -133,7 +133,7 @@ void RPCServer::handle_read(const boost::system::error_code& e,
}
else if (!result)
{ // bad request
std::cout << "bad request" << std::endl;
std::cout << "bad request: " << mIncomingRequest.mBody <<std::endl;
}
else
{ // not done keep reading