Граф коммитов

1830 Коммитов

Автор SHA1 Сообщение Дата
Kelvin Lee 956068953c Ignore a bunch of temporary files from cmake/ninja. 2017-06-28 09:44:56 +10:00
Robert Schumacher e1933685bc Update README.md 2017-06-20 11:32:42 -07:00
Robert Schumacher 0a9ca2c332 Merge pull request #449 from eburkitt/upmaster
Supply missing WindowsTargetPlatformVersion setting...
2017-05-31 14:55:28 -07:00
Robert Schumacher 8d459d44bb Update readme to include basic CMake usage 2017-05-30 18:04:36 -07:00
Robert Schumacher f15e613633 Merge pull request #454 from gladkovdmitry17/suppress_intel_comp_warn
Suppress Intel C++ Compiler 17.0 warning
2017-05-30 15:33:27 -07:00
Robert Schumacher 2ebf9b93fe Merge pull request #456 from EdgarWahn/patch-1
fix syntax error in cmake file
2017-05-30 05:57:27 -07:00
Markus Warg 8ca304a5db fix syntax error in cmake file
missing closing > for target_link_libraries and target_include_directories
2017-05-30 11:19:37 +02:00
Dmitry Gladkov e3f81c436f Suppress Intel C++ Compiler 17.0 warning 2017-05-30 08:35:42 +03:00
Robert Schumacher 5c708f48da Merge pull request #450 from vinniefalco/master
Fix http_request::method doc
2017-05-27 18:07:31 -07:00
Vinnie Falco 62d44030f1
Fix http_request::method doc 2017-05-27 15:30:23 -07:00
Evan Burkitt ce5595d77d Supply missing WindowsTargetPlatformVersion setting that vs2017 insists be there
Add some NuGet droppings to .gitignore

Conflicts:
	.gitignore
2017-05-26 20:00:03 -07:00
Robert Schumacher 381f5aa92d Merge pull request #422
Fixed non-conformant extra qualification on member function declarations
2017-04-28 02:36:31 -07:00
Robert Schumacher 67e4d626f5 Merge pull request #415 from HEPTACOM/master
Handled uncaught exception when request contains bad encoded URI
2017-04-28 02:35:54 -07:00
Robert Schumacher 01d1ab1f59 Merge pull request #393 from ChristophAlbert/cpprestsdk
Race condition in ws_client_wspp.cpp
2017-04-28 02:34:44 -07:00
Robert Schumacher 31b0e47b3a Remove qualification on member function definitions. Merges PR #422. 2017-04-28 02:22:39 -07:00
Robert Schumacher c5eeac3dd7 Rework PR #415 onto ASIO refactor 2017-04-28 02:18:55 -07:00
Robert Schumacher c327a61a98 Merge pull request #408 from c72578/remove_exec_perm_2017-04-06
remove spurious executable permissions
2017-04-27 18:12:55 -07:00
Robert Schumacher 42b7a9352f Share thread-safe outgoing queue implementation between wspp and winrt. 2017-04-25 18:43:53 -07:00
Robert Schumacher 8b878f7059 Merge branch 'master' of https://github.com/ChristophAlbert/cpprestsdk into ws-race 2017-04-25 18:12:31 -07:00
Robert Schumacher ae700b3e26 Improve proxy tests 2017-04-25 17:12:05 -07:00
Robert Schumacher 5f487ba414 Handle wchar_t-, fixes #179 2017-04-25 17:12:04 -07:00
Robert Schumacher aa2d08f202 Merge branch 'master' into HEAD 2017-04-25 17:10:57 -07:00
Robert Schumacher 8b33dcc777 Fix invoking unset nativehandle callbacks 2017-04-24 17:46:13 -07:00
Robert Schumacher 7de91c0d23 Always use PUBLIC/PRIVATE for target_link_libraries. 2017-04-24 17:45:23 -07:00
Robert Schumacher ebf39000ee Export websocketpp interface forwarder when available. 2017-04-24 17:45:02 -07:00
Robert Schumacher ad8a3b4114 Rework CMake build to use INTERFACE targets to handle dependencies.
This centralizes the workaround for older cmake versions which don't export new-style IMPORTED targets.
2017-04-23 07:13:44 -07:00
Robert Schumacher b1194f3006 Merge pull request #376 from xqp/master 2017-04-21 18:10:16 -07:00
Robert Schumacher d72c5f903f Minor cleanup. 2017-04-21 18:09:22 -07:00
Robert Schumacher 305e116385 Inline open_if_required() into the single point of use. 2017-04-21 18:08:51 -07:00
Robert Schumacher a6bdbca915 Tweaks for PR #376
Rename invoke_nativesessionhandle -> _invoke_nativesessionhandle to indicate that it is internal.
Do not try/catch around _invoke_nativesessionhandle. The caller will handle it and the request error appropriately.
Indicate in the comments that session callback only works on WinHTTP.
2017-04-21 18:08:21 -07:00
Robert Schumacher 7476388280 Merge branch 'master' of https://github.com/xqp/cpprestsdk into xqp-master 2017-04-21 17:41:18 -07:00
Robert Schumacher cccb245929 Merge pull request #365 from pnemere/patch-1
Use 1.0.2k openssl library - Play store rejects 1.0.2d
2017-04-21 17:35:44 -07:00
Robert Schumacher 039b5b9c64 Merge branch 'testing' 2017-04-21 17:32:49 -07:00
Robert Schumacher c0d375eb56 Re-add diagnostic suppressions around boost. 2017-04-21 13:43:09 -07:00
Robert Schumacher a936968978 Hide server includes behind #ifdef to avoid inclusion on XP/UWP. 2017-04-20 18:23:44 -07:00
Robert Schumacher b2d37ef169 Merge pull request #336 from reneme/fix/asio_default_host_header
Don't add default port to 'Host' header in ASIO
2017-04-20 18:20:03 -07:00
Robert Schumacher 15ce76dd76 Remove old include -- file was renamed. 2017-04-20 16:23:03 -07:00
Robert Schumacher e3ea6b8b0b Add missing includes to http_server_impl.h 2017-04-20 16:21:28 -07:00
Robert Schumacher 0e4108ccec Merge pull request #319 from HolgerStrauss/master
Solution does not compile in folders with spaces in the path
2017-04-19 16:34:28 -07:00
Robert Schumacher 13049fc080 Fix vcxitems 2017-04-19 16:31:05 -07:00
Robert Schumacher 256fe993fb Refactor http_server_httpsys/http_server_asio to be internal-only. 2017-04-19 16:27:52 -07:00
Robert Schumacher d0ef0b78de Fix regressions in PR #251 2017-04-19 13:59:16 -07:00
Robert Schumacher 38d916a638 Rename listener::details::connection -> listener::details::asio_server_connection.
Move implementation to internal cpp instead of header file.
Use return values to track async lifetime and ensure proper cleanup.
2017-04-19 12:43:15 -07:00
Robert Schumacher 33edea3fd2 Add _SCL_SECURE_NO_WARNINGS because websockets++ does not compile cleanly 2017-04-19 12:33:47 -07:00
Robert Schumacher 363376e17a Merge pull request #251 from JasonYang-MSFT/development
Improve the performance of conversion between UTF16 and UTF8 strings.
2017-04-19 06:17:13 -07:00
Robert Schumacher 96433698fb Merge pull request #246 from nilfrisk/windows_7_8_tls_fix
Enable TLS 1.1 and 1.2
2017-04-19 06:10:16 -07:00
Robert Schumacher 09984d5995 Merge improve-asio
These changes enable a for-testing-and-debugging-only mode that uses the boost-asio implementations of http-client and http-listener on Windows.
2017-04-19 06:03:46 -07:00
Robert Schumacher 0d1d5d16ee Improve test robustness across the board.
Themes are:
- Always wait on tasks so testing can continue on failure
- Add aggressive timeouts to drastically reduce time taken by failing tests
- Reduce races
2017-04-19 05:59:57 -07:00
Robert Schumacher 115b226fc2 [test-http-server] Unify test server interfaces/impls 2017-04-19 05:55:50 -07:00
Robert Schumacher 9d9102051e [threadpool] Disable the asio-backed threadpool when (windows & !websockets) 2017-04-19 05:45:58 -07:00