Commit graph

342 commits

Author SHA1 Message Date
PaulEU
ab31df2e9f Merge branch 'phoenix' of https://github.com/InvictusInnovations/fc into phoenix 2014-06-05 10:01:16 +02:00
PaulEU
7b2361518c Use _putenv instead of putenv because on some Windows machines putenv doesn't work properly. 2014-06-05 10:00:50 +02:00
Daniel Larimer
2e109d18c9 Merge branch 'phoenix' of https://github.com/InvictusInnovations/fc into HEAD 2014-06-04 22:18:39 +00:00
Daniel Larimer
df2d013bad fix exceptions when parsing json 2014-06-04 22:17:21 +00:00
Eric Frias
ff04a5a8fb Catch std::ios_base::failure exceptions, which mean EOF when reading JSON from a std::stringstream 2014-06-04 16:55:26 -04:00
Eric Frias
a6ca7042da add to/from variant for fc::microseconds 2014-06-04 13:51:50 -04:00
Eric Frias
8347a7b7fa Merge branch 'phoenix' of https://github.com/InvictusInnovations/fc into phoenix 2014-06-03 19:13:52 -07:00
Eric Frias
d77bdcd3e6 Make HTTP headers case insensitive 2014-06-03 19:12:53 -07:00
Eric Frias
2690a52fe5 Add a function to return the local endpoint of a http server 2014-06-03 19:00:22 -04:00
Daniel Larimer
73dd2d68ea fix for mac 2014-06-03 11:16:29 -04:00
Daniel Larimer
5a0f996333 adding pretty print 2014-06-03 11:09:15 -04:00
vogel76
57e1d60257 [BW]: [Fix] Looks like OpenSSL_config argument doesn't refer to configuration file path, which can be passed only through environment variable unfortunetly. 2014-06-03 17:04:34 +02:00
Eric Frias
2220920126 Fix signed bigint conversion (probably never used) 2014-06-02 17:19:36 -04:00
Eric Frias
2251d0f241 Fix bigint on conversions to and from 64-bit integers on 32-bit platforms
Fixes BitShares/bitshares_toolkit#150
2014-06-02 13:32:42 -04:00
vogel76
04f07aa429 [BW]: [Fix] Eliminated OpenSSL initialization from CRT init time (which caused random problems on windows7 machines leading the application to silent crash). Right now it is done at first use of fc parts using it. Also added method to setup OpenSSL configuration path to custom one (to avoid using path compiled into OpenSSL at configuration & build time). 2014-06-02 17:34:04 +02:00
Eric Frias
9fa6e8a430 Separate the 'bind' operation for tcp_sockets from the 'connect_to' operation so we can tell which operation is throwing an exception in client code. convert a few boost exceptions into fc::exceptions. 2014-06-01 18:08:10 -04:00
Eric Frias
7dde0a705d Add 5 and 6 argument versions of json rpc call functions 2014-05-29 15:54:40 -04:00
Eric Frias
07f131336f Convert boost exceptions caught while parsing fc::time_point strings into fc::exception 2014-05-29 15:54:39 -04:00
dnotestein
54c66bbb86 Merge branch 'phoenix' of https://github.com/InvictusInnovations/fc into phoenix
Conflicts:
	src/crypto/aes.cpp
2014-05-27 09:44:54 -04:00
dnotestein
d1c3637a9f Fix variable name (input parameter to function is length of cipher text, not decoded plain text) and function comments (looks like it was some copy/paste error). 2014-05-27 09:40:23 -04:00
Daniel Larimer
ac03a71f3d improve variant cast error reporting 2014-05-25 14:18:26 -04:00
Daniel Larimer
9f6b52eac2 fix build on OS X 2014-05-23 21:54:59 -04:00
Eric Frias
b9050b589d Merge branch 'phoenix' into tcp_rate_limiting 2014-05-23 18:04:05 -04:00
Vikram Rajkumar
375aa098eb Merge github.com:vikramrajkumar/fc into phoenix 2014-05-22 03:55:45 -04:00
Daniel Larimer
e6007b88cd Merge pull request #26 from HackFisher/patch-3
Fix issue #25
2014-05-21 09:53:45 -04:00
Vikram Rajkumar
379b0791e3 Merge github.com:vikramrajkumar/fc into phoenix 2014-05-20 19:03:01 -04:00
Eric Frias
5719d28a19 Move/rename git revision info compiled into FC to be more self-explanatory 2014-05-20 18:02:20 -04:00
Daniel Larimer
17aefe29de using explicit bool operator for optional 2014-05-20 11:25:31 -04:00
HackFisher
174096c3ab Fix issue #25
eofbit std exception is replaced by eof_exception, checked in peek(), so no need to throw std exception when encounter EOF.
2014-05-20 19:17:19 +08:00
Daniel Larimer
8a8ff28221 adding '/' to token chars to support paths 2014-05-19 16:59:01 -04:00
Eric Frias
c4770f0819 Restore correct parsing of json keywords (true/false/null) 2014-05-19 14:12:49 -04:00
Vikram Rajkumar
6b455ab850 Fix typos 2014-05-19 02:52:21 -04:00
Daniel Larimer
fd00bddcb4 update logging to create parent directory if it does not exist 2014-05-17 16:38:32 -04:00
Vikram Rajkumar
e8326ca66c Make objectFromStream always throw parse_error_exception when throwing 2014-05-17 03:30:49 -04:00
Daniel Larimer
8c370b06e6 update json error handling 2014-05-15 17:44:38 -04:00
Daniel Larimer
7078ebf382 expanding token chars 2014-05-15 14:07:19 -04:00
Daniel Larimer
c27ea9ba13 fix bugs parsing json tokens 2014-05-15 13:52:21 -04:00
Daniel Larimer
271fe8b909 found major bug in parsing, fixed it 2014-05-15 13:35:49 -04:00
Eric Frias
2837892ec0 Upgrade to new version of city_hash library. This version has performance improvements, plus implements a variant with 32-bit output which will quiet some compiler warnings on win32. 2014-05-14 17:11:36 -04:00
Eric Frias
873a0ea70d Merge branch 'phoenix' into tcp_rate_limiting 2014-05-14 16:26:34 -04:00
Eric Frias
50ac462471 Enable SO_REUSEPORT on Linux as well as OS X 2014-05-14 16:02:41 -04:00
Eric Frias
db7b1bdd69 Add an optional timeout parameter when waiting for a local process to exit 2014-05-14 08:51:30 -04:00
Eric Frias
eb501387e8 Set the SO_REUSEPORT flag on OS X whenever we set the SO_REUSEADDR 2014-05-13 21:14:40 -07:00
Daniel Larimer
8d4fccba5f update pretty print save to file 2014-05-11 20:33:08 -04:00
Eric Frias
37330ca005 change the naming of invalidOperation exception to the more fc-friendly
invalid_operation, and add an implementation so it can be used.
2014-05-09 11:50:32 -04:00
Eric Frias
62b479568e Get rate limiting mostly working 2014-05-08 15:13:49 -04:00
Eric Frias
bc4361bf64 Merge branch 'phoenix' into tcp_rate_limiting
Conflicts:
	include/fc/network/tcp_socket.hpp
	src/network/tcp_socket.cpp
2014-05-08 09:04:45 -04:00
valzav
102e0c4ab8 fixed a bug in configure_logging that made adding more than one logger impossible 2014-05-07 20:58:54 -07:00
valzav
687eaa98f2 Merge remote-tracking branch 'upstream/phoenix' into http-server-improvements 2014-05-07 20:48:23 -07:00
Daniel Larimer
9378f6c7aa Merge branch 'phoenix' of https://github.com/InvictusInnovations/fc into phoenix 2014-05-07 21:27:48 -04:00