diff --git a/Builds/VisualStudio2013/RippleD.vcxproj b/Builds/VisualStudio2013/RippleD.vcxproj index fc1b5b5ff6..98a966c37f 100644 --- a/Builds/VisualStudio2013/RippleD.vcxproj +++ b/Builds/VisualStudio2013/RippleD.vcxproj @@ -3466,8 +3466,8 @@ - ..\..\src\leveldb\include;..\..\src\rocksdb\include;%(AdditionalIncludeDirectories) - ..\..\src\leveldb\include;..\..\src\rocksdb\include;%(AdditionalIncludeDirectories) + ..\..\src\leveldb\include;..\..\src\rocksdb2\include;%(AdditionalIncludeDirectories) + ..\..\src\leveldb\include;..\..\src\rocksdb2\include;%(AdditionalIncludeDirectories) @@ -3488,8 +3488,8 @@ - ..\..\src\rocksdb;..\..\src\rocksdb\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - ..\..\src\rocksdb;..\..\src\rocksdb\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) + ..\..\src\rocksdb2;..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) + ..\..\src\rocksdb2;..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) @@ -3582,590 +3582,590 @@ - + True - + - + True - + True - + - + True - + - + True - + - + True - + - + True - + True - + - + True - + True - + - + True - + - + True - + - + True - + - + True - + - + True - + - + - + True - + - + True - + - + True - + - + True - + - + - + True - + - + True - + True - + - + - + True - + - + True - + - + True - + - + True - + - + True - + - + True - + - + True - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + True - + - + True - + - + True - + - + True - + - + True - + - + True - + - + True - + - + True - + - + True - + - + True - + - + True - + - + True - + - + True - + - + True - + - + True - + True - + - + True - + - + - + True - + - + True - + - + True - + - + True - + - + True - + - + True - + - + True - + - + - + True - + - + True - + - + - + - + - + - + True - + True - + True - + True - + - + - + True - + True - + - + True - + - + True - + True - + - + - + - + True - + - + True - + - + True - + - + - + True - + - + True - + - + True - + - + True - + True - + - + True - + True - + - + True - + - + True - + True - + True - + True - + True - + - + True - + - + True - + - + True - + - + True - + - + True - + - + True - + - + - + True - + True - + - + True - + - + True - + - + - + True - + True - + True - + - + - + - + True - + - + True - + True - + True - + - + True - + - + - + True - + - + True - + - + True - + - + True - + True - + diff --git a/Builds/VisualStudio2013/RippleD.vcxproj.filters b/Builds/VisualStudio2013/RippleD.vcxproj.filters index 8daa6415f0..6c4b66ea70 100644 --- a/Builds/VisualStudio2013/RippleD.vcxproj.filters +++ b/Builds/VisualStudio2013/RippleD.vcxproj.filters @@ -547,68 +547,68 @@ {663AE0EE-6781-C2F4-8D04-0D5D30AC0773} - - {A6DBE85A-1595-E8FB-25F1-D5A133237168} + + {15B4B65A-0F03-7BA9-38CD-42A5712392CB} - - {CF9BDE04-BD20-28B9-FC91-1BB55ADCACB7} + + {6D89B6B8-9214-EC35-55E9-8F23F38CA4BD} - - {0407E334-3863-9048-3EAF-2AD842D9E4E6} + + {667DE39F-2604-4FE8-A614-819EEB24732D} - - {C0556487-1F23-30EC-158C-1BA7C8B1F6C3} + + {52E62747-3597-E27D-DFB4-56139A352DB9} - - {AD14E1B2-4586-6CDC-2A6F-8476B12F08B0} + + {42869C0B-56BC-B32F-1916-4A4080D2417E} - - {5DA11815-21A8-C90A-3599-C1E61725BE79} + + {D3C48D7F-1D8E-CE9E-27C8-D55F5E5A5B87} - - {B3F3758B-CF66-DE50-EC23-90ABAA4519F1} + + {0E10D53B-8D04-FF58-45C4-0ABCB1D35E7F} - - {BA71F7B0-9208-711E-B1E5-10A2B1C54A59} + + {FC54DB48-EF4D-7E0F-DDFE-B3F38B0B7738} - - {8DCA6950-4D9E-DD56-ABFE-1E3E933FB323} + + {A746507A-5BC2-4D28-1548-27C4A985BA1F} - - {0C0524C1-7BE5-DA20-0E6A-F85A514AB437} + + {07F5949C-8323-60C6-86FA-478527ACA329} - - {1EFA83A1-02CA-BE26-A213-3D536AF039C1} + + {E8713421-1FD0-C069-9337-FA196101F1EB} - - {3564B926-C600-5731-CE0C-426C65C360B2} + + {D1AC8B4A-AD89-99FE-E006-C5216043BF1C} - - {2D0A0363-AA57-11F4-AFCF-2198A26BE7C2} + + {105DC146-D508-21EC-FFEA-1D161832CCEF} - - {6E712E4B-035E-53DF-EF79-D2820B5AC364} + + {9127B497-2610-2304-EEC9-8BEFBE9EA84E} - - {2942472B-8C45-8A9F-C2B7-9AFE833D9A8D} + + {54BB5EB5-AAE6-285E-E486-052F58B9C667} - - {6D2A0108-1F32-B04A-6B16-872AA2C9039D} + + {3B09A7F7-FA71-6AF1-D990-01EB9B1F903D} - - {42C7A482-C4FE-F9D1-6DBC-4BD3443B3D99} + + {0671E6E7-996E-D7C7-CF71-11A7A8F34F1F} - - {BE9A242A-D80D-63CC-4046-4E273BB53562} + + {393C9B81-CD6C-8E75-2B17-ED6ED04E4C28} - - {1B1AA153-E614-C50F-B5FE-E69F86B90CB5} + + {A69B6BFC-CCCF-679E-555F-CE2E562DD85B} - - {8DC59E9F-E114-2DA1-0334-AA83B67C433C} + + {ED8A5019-B4FC-AE9E-E99A-10137DCF03C1} - - {1E3A9D8A-09E6-E3E6-1572-D20E311F5621} + + {395EACFC-5313-28FC-4686-B001C679D86A} {26306562-F81D-B6CD-B192-22BA51E1A96B} @@ -4953,728 +4953,728 @@ ripple\validators - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\db + + rocksdb2\db - - rocksdb\hdfs + + rocksdb2\hdfs - - rocksdb\include\rocksdb + + rocksdb2\include\rocksdb - - rocksdb\include\rocksdb + + rocksdb2\include\rocksdb - - rocksdb\include\rocksdb + + rocksdb2\include\rocksdb - - rocksdb\include\rocksdb + + rocksdb2\include\rocksdb - - rocksdb\include\rocksdb + + rocksdb2\include\rocksdb - - rocksdb\include\rocksdb + + rocksdb2\include\rocksdb - - rocksdb\include\rocksdb + + rocksdb2\include\rocksdb - - rocksdb\include\rocksdb + + rocksdb2\include\rocksdb - - rocksdb\include\rocksdb + + rocksdb2\include\rocksdb - - rocksdb\include\rocksdb + + rocksdb2\include\rocksdb - - rocksdb\include\rocksdb + + rocksdb2\include\rocksdb - - rocksdb\include\rocksdb + + rocksdb2\include\rocksdb - - rocksdb\include\rocksdb + + rocksdb2\include\rocksdb - - rocksdb\include\rocksdb + + rocksdb2\include\rocksdb - - rocksdb\include\rocksdb + + rocksdb2\include\rocksdb - - rocksdb\include\rocksdb + + rocksdb2\include\rocksdb - - rocksdb\include\rocksdb + + rocksdb2\include\rocksdb - - rocksdb\include\rocksdb + + rocksdb2\include\rocksdb - - rocksdb\include\rocksdb + + rocksdb2\include\rocksdb - - rocksdb\include\rocksdb + + rocksdb2\include\rocksdb - - rocksdb\include\rocksdb + + rocksdb2\include\rocksdb - - rocksdb\include\rocksdb + + rocksdb2\include\rocksdb - - rocksdb\include\rocksdb + + rocksdb2\include\rocksdb - - rocksdb\include\rocksdb + + rocksdb2\include\rocksdb - - rocksdb\include\rocksdb + + rocksdb2\include\rocksdb - - rocksdb\include\rocksdb\utilities + + rocksdb2\include\rocksdb\utilities - - rocksdb\include\rocksdb\utilities + + rocksdb2\include\rocksdb\utilities - - rocksdb\include\rocksdb\utilities + + rocksdb2\include\rocksdb\utilities - - rocksdb\include\rocksdb\utilities + + rocksdb2\include\rocksdb\utilities - - rocksdb\include\rocksdb\utilities + + rocksdb2\include\rocksdb\utilities - - rocksdb\include\rocksdb\utilities + + rocksdb2\include\rocksdb\utilities - - rocksdb\include\rocksdb\utilities + + rocksdb2\include\rocksdb\utilities - - rocksdb\include\rocksdb\utilities + + rocksdb2\include\rocksdb\utilities - - rocksdb\include\rocksdb + + rocksdb2\include\rocksdb - - rocksdb\include\rocksdb + + rocksdb2\include\rocksdb - - rocksdb\port + + rocksdb2\port - - rocksdb\port + + rocksdb2\port - - rocksdb\port + + rocksdb2\port - - rocksdb\port + + rocksdb2\port - - rocksdb\port + + rocksdb2\port - - rocksdb\port + + rocksdb2\port - - rocksdb\port + + rocksdb2\port - - rocksdb\table + + rocksdb2\table - - rocksdb\table + + rocksdb2\table - - rocksdb\table + + rocksdb2\table - - rocksdb\table + + rocksdb2\table - - rocksdb\table + + rocksdb2\table - - rocksdb\table + + rocksdb2\table - - rocksdb\table + + rocksdb2\table - - rocksdb\table + + rocksdb2\table - - rocksdb\table + + rocksdb2\table - - rocksdb\table + + rocksdb2\table - - rocksdb\table + + rocksdb2\table - - rocksdb\table + + rocksdb2\table - - rocksdb\table + + rocksdb2\table - - rocksdb\table + + rocksdb2\table - - rocksdb\table + + rocksdb2\table - - rocksdb\table + + rocksdb2\table - - rocksdb\table + + rocksdb2\table - - rocksdb\table + + rocksdb2\table - - rocksdb\table + + rocksdb2\table - - rocksdb\table + + rocksdb2\table - - rocksdb\table + + rocksdb2\table - - rocksdb\table + + rocksdb2\table - - rocksdb\table + + rocksdb2\table - - rocksdb\table + + rocksdb2\table - - rocksdb\table + + rocksdb2\table - - rocksdb\table + + rocksdb2\table - - rocksdb\table + + rocksdb2\table - - rocksdb\table + + rocksdb2\table - - rocksdb\table + + rocksdb2\table - - rocksdb\table + + rocksdb2\table - - rocksdb\table + + rocksdb2\table - - rocksdb\table + + rocksdb2\table - - rocksdb\table + + rocksdb2\table - - rocksdb\table + + rocksdb2\table - - rocksdb\table + + rocksdb2\table - - rocksdb\table + + rocksdb2\table - - rocksdb\table + + rocksdb2\table - - rocksdb\table + + rocksdb2\table - - rocksdb\table + + rocksdb2\table - - rocksdb\table + + rocksdb2\table - - rocksdb\table + + rocksdb2\table - - rocksdb\table + + rocksdb2\table - - rocksdb\table + + rocksdb2\table - - rocksdb\table + + rocksdb2\table - - rocksdb\table + + rocksdb2\table - - rocksdb\table + + rocksdb2\table - - rocksdb\table + + rocksdb2\table - - rocksdb\table + + rocksdb2\table - - rocksdb\table + + rocksdb2\table - - rocksdb\third-party\rapidjson\internal + + rocksdb2\third-party\rapidjson\internal - - rocksdb\third-party\rapidjson\internal + + rocksdb2\third-party\rapidjson\internal - - rocksdb\third-party\rapidjson + + rocksdb2\third-party\rapidjson - - rocksdb\third-party\rapidjson + + rocksdb2\third-party\rapidjson - - rocksdb\utilities\backupable + + rocksdb2\utilities\backupable - - rocksdb\utilities\document + + rocksdb2\utilities\document - - rocksdb\utilities\document + + rocksdb2\utilities\document - - rocksdb\utilities\geodb + + rocksdb2\utilities\geodb - - rocksdb\utilities\geodb + + rocksdb2\utilities\geodb - - rocksdb\utilities + + rocksdb2\utilities - - rocksdb\utilities\merge_operators + + rocksdb2\utilities\merge_operators - - rocksdb\utilities\merge_operators\string_append + + rocksdb2\utilities\merge_operators\string_append - - rocksdb\utilities\merge_operators\string_append + + rocksdb2\utilities\merge_operators\string_append - - rocksdb\utilities\merge_operators\string_append + + rocksdb2\utilities\merge_operators\string_append - - rocksdb\utilities\merge_operators\string_append + + rocksdb2\utilities\merge_operators\string_append - - rocksdb\utilities\merge_operators + + rocksdb2\utilities\merge_operators - - rocksdb\utilities\redis + + rocksdb2\utilities\redis - - rocksdb\utilities\redis + + rocksdb2\utilities\redis - - rocksdb\utilities\redis + + rocksdb2\utilities\redis - - rocksdb\utilities\redis + + rocksdb2\utilities\redis - - rocksdb\utilities\spatialdb + + rocksdb2\utilities\spatialdb - - rocksdb\utilities\spatialdb + + rocksdb2\utilities\spatialdb - - rocksdb\utilities\ttl + + rocksdb2\utilities\ttl - - rocksdb\utilities\ttl + + rocksdb2\utilities\ttl - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util - - rocksdb\util + + rocksdb2\util snappy\config diff --git a/src/beast/beast/asio/ssl.h b/src/beast/beast/asio/ssl.h new file mode 100644 index 0000000000..b9cff3fad4 --- /dev/null +++ b/src/beast/beast/asio/ssl.h @@ -0,0 +1,41 @@ +//------------------------------------------------------------------------------ +/* + This file is part of Beast: https://github.com/vinniefalco/Beast + Copyright 2013, Vinnie Falco + + 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_SSL_H_INCLUDED +#define BEAST_ASIO_SSL_H_INCLUDED + +#include +#include + +namespace beast { +namespace asio { + +/** Returns `true` if the error code is a SSL "short read." */ +inline +bool +is_short_read (boost::system::error_code const& ec) +{ + return (ec.category() == boost::asio::error::get_ssl_category()) + && (ERR_GET_REASON(ec.value()) == SSL_R_SHORT_READ); +} + +} +} + +#endif