Skip to content

Commit 79d8d57

Browse files
stgatesstgates
committed
Merge branch 'development' of https://git01.codeplex.com/casablanca into encode_query_key_pair
2 parents 5491b4e + bad8797 commit 79d8d57

24 files changed

+134
-99
lines changed

‎Build_android/libiconv/jni/Android.mk

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎Build_android/libiconv/jni/Application.mk

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎Build_android/libiconv/libiconv.patch

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎Build_iOS/.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# iOS folders that dependencies get stored in
2+
boostoniphone/
3+
boost.framework/
4+
ios-cmake/
5+
openssl/
6+
OpenSSL-for-iPhone/

‎CONTRIBUTORS.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ gandziej
2121
adish
2222
LeonidCSIT
2323
LocutusOfBorg
24+
kreuzerkrieg
2425

2526
AutoDesk Inc.
2627
Cyrille Fauvel (cyrillef)

‎Release/include/cpprest/http_client.h

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ class http_client_config
8282
public:
8383
http_client_config() :
8484
m_guarantee_order(false),
85-
m_timeout(utility::seconds(30)),
85+
m_timeout(std::chrono::seconds(30)),
8686
m_chunksize(0)
8787
#if !defined(__cplusplus_winrt)
8888
, m_validate_certificates(true)
@@ -193,16 +193,26 @@ class http_client_config
193193
/// <returns>The timeout (in seconds) used for each send and receive operation on the client.</returns>
194194
utility::seconds timeout() const
195195
{
196-
return m_timeout;
196+
return std::chrono::duration_cast<utility::seconds>(m_timeout);
197197
}
198198

199+
/// <summary>
200+
/// Get the timeout
201+
/// </summary>
202+
/// <returns>The timeout (in whatever duration) used for each send and receive operation on the client.</returns>
203+
template <class T>
204+
T timeout() const
205+
{
206+
return std::chrono::duration_cast<T>(m_timeout);
207+
}
199208
/// <summary>
200209
/// Set the timeout
201210
/// </summary>
202-
/// <param name="timeout">The timeout (in seconds) used for each send and receive operation on the client.</param>
203-
void set_timeout(const utility::seconds &timeout)
211+
/// <param name="timeout">The timeout (duration from microseconds range and up) used for each send and receive operation on the client.</param>
212+
template <class T>
213+
void set_timeout(const T &timeout)
204214
{
205-
m_timeout = timeout;
215+
m_timeout = std::chrono::duration_cast<std::chrono::microseconds>(timeout);
206216
}
207217

208218
/// <summary>
@@ -317,7 +327,7 @@ class http_client_config
317327
// Whether or not to guarantee ordering, i.e. only using one underlying TCP connection.
318328
bool m_guarantee_order;
319329

320-
utility::seconds m_timeout;
330+
std::chrono::microseconds m_timeout;
321331
size_t m_chunksize;
322332

323333
#if !defined(__cplusplus_winrt)

‎Release/src/build/vs12.xp/casablanca120.xp.vcxproj

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,15 @@
3434
<Import Project="$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.1.0.2.0\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.targets" Condition="Exists('$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.1.0.2.0\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.targets')" />
3535
<Import Project="$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.1.0.2.0\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.targets" Condition="Exists('$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.1.0.2.0\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.targets')" />
3636
<Import Project="$(PackagesRoot)\zlib.v120.windesktop.msvcstl.static.rt-dyn.1.2.8.8\build\native\zlib.v120.windesktop.msvcstl.static.rt-dyn.targets" Condition="Exists('$(PackagesRoot)\zlib.v120.windesktop.msvcstl.static.rt-dyn.1.2.8.8\build\native\zlib.v120.windesktop.msvcstl.static.rt-dyn.targets')" />
37+
<Import Project="$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.1.0.2.1\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.targets" Condition="Exists('$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.1.0.2.1\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.targets')" />
38+
<Import Project="$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.1.0.2.1\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.targets" Condition="Exists('$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.1.0.2.1\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.targets')" />
3739
</ImportGroup>
3840
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
3941
<DebugFileSuffix>d</DebugFileSuffix>
4042
</PropertyGroup>
4143
<PropertyGroup>
4244
<TargetName>$(CppRestBaseFileName)120$(DebugFileSuffix)_xp_$(CppRestSDKVersionFileSuffix)</TargetName>
45+
<NuGetPackageImportStamp>58b07c0c</NuGetPackageImportStamp>
4346
</PropertyGroup>
4447
<ItemGroup>
4548
<None Include="packages.config" />
@@ -54,7 +57,6 @@
5457
<RuntimeLibrary Condition="'$(Configuration)'=='Debug'">MultiThreadedDebugDLL</RuntimeLibrary>
5558
<RuntimeLibrary Condition="'$(Configuration)'=='Release'">MultiThreadedDLL</RuntimeLibrary>
5659
<WholeProgramOptimization Condition="'$(Configuration)'=='Release'">true</WholeProgramOptimization>
57-
5860
<!-- Disable warning about decorated name length exceeded, name was truncated. This is due to Boost.Asio and Websocket++ templates. -->
5961
<DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
6062
<DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
@@ -71,4 +73,11 @@
7173
<Import Project="..\common.vcxitems" Label="Shared" Condition="Exists('..\common.vcxitems')" />
7274
<Import Project="..\win32.vcxitems" Label="Shared" Condition="Exists('..\win32.vcxitems')" />
7375
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
76+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
77+
<PropertyGroup>
78+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
79+
</PropertyGroup>
80+
<Error Condition="!Exists('$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.1.0.2.1\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.1.0.2.1\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.targets'))" />
81+
<Error Condition="!Exists('$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.1.0.2.1\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.1.0.2.1\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.targets'))" />
82+
</Target>
7483
</Project>

‎Release/src/build/vs12.xp/packages.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<package id="boost_regex-vc120" version="1.58.0.0" targetFramework="Native" developmentDependency="true" />
77
<package id="boost_system-vc120" version="1.58.0.0" targetFramework="Native" developmentDependency="true" />
88
<package id="boost_thread-vc120" version="1.58.0.0" targetFramework="Native" developmentDependency="true" />
9-
<package id="openssl.v120.windesktop.msvcstl.static.rt-dyn.x64" version="1.0.2.0" targetFramework="native" developmentDependency="true" userInstalled="true" />
10-
<package id="openssl.v120.windesktop.msvcstl.static.rt-dyn.x86" version="1.0.2.0" targetFramework="native" developmentDependency="true" userInstalled="true" />
11-
<package id="openssl.v120.windesktop.msvcstl.static.rt-dyn" version="1.0.2.0" targetFramework="Native" developmentDependency="true" />
9+
<package id="openssl.v120.windesktop.msvcstl.static.rt-dyn" version="1.0.2.1" targetFramework="Native" developmentDependency="true" />
10+
<package id="openssl.v120.windesktop.msvcstl.static.rt-dyn.x64" version="1.0.2.1" targetFramework="Native" developmentDependency="true" />
11+
<package id="openssl.v120.windesktop.msvcstl.static.rt-dyn.x86" version="1.0.2.1" targetFramework="Native" developmentDependency="true" />
1212
<package id="zlib.v120.windesktop.msvcstl.static.rt-dyn" version="1.2.8.8" targetFramework="Native" developmentDependency="true" />
1313
</packages>

‎Release/src/build/vs12/casablanca120.vcxproj

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,15 @@
2727
<Import Project="$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.1.0.2.0\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.targets" Condition="Exists('$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.1.0.2.0\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.targets')" />
2828
<Import Project="$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.1.0.2.0\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.targets" Condition="Exists('$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.1.0.2.0\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.targets')" />
2929
<Import Project="$(PackagesRoot)\zlib.v120.windesktop.msvcstl.static.rt-dyn.1.2.8.8\build\native\zlib.v120.windesktop.msvcstl.static.rt-dyn.targets" Condition="Exists('$(PackagesRoot)\zlib.v120.windesktop.msvcstl.static.rt-dyn.1.2.8.8\build\native\zlib.v120.windesktop.msvcstl.static.rt-dyn.targets')" />
30+
<Import Project="$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.1.0.2.1\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.targets" Condition="Exists('$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.1.0.2.1\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.targets')" />
31+
<Import Project="$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.1.0.2.1\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.targets" Condition="Exists('$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.1.0.2.1\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.targets')" />
3032
</ImportGroup>
3133
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
3234
<DebugFileSuffix>d</DebugFileSuffix>
3335
</PropertyGroup>
3436
<PropertyGroup>
3537
<TargetName>$(CppRestBaseFileName)120$(DebugFileSuffix)_$(CppRestSDKVersionFileSuffix)</TargetName>
36-
<NuGetPackageImportStamp>d5171ca1</NuGetPackageImportStamp>
38+
<NuGetPackageImportStamp>1af61e94</NuGetPackageImportStamp>
3739
<CharacterSet>Unicode</CharacterSet>
3840
</PropertyGroup>
3941
<ItemGroup>
@@ -67,4 +69,11 @@
6769
<Import Project="..\common.vcxitems" Label="Shared" Condition="Exists('..\common.vcxitems')" />
6870
<Import Project="..\win32.vcxitems" Label="Shared" Condition="Exists('..\win32.vcxitems')" />
6971
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
72+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
73+
<PropertyGroup>
74+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
75+
</PropertyGroup>
76+
<Error Condition="!Exists('$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.1.0.2.1\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.1.0.2.1\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.targets'))" />
77+
<Error Condition="!Exists('$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.1.0.2.1\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.1.0.2.1\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.targets'))" />
78+
</Target>
7079
</Project>

‎Release/src/build/vs12/packages.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<package id="boost_regex-vc120" version="1.58.0.0" targetFramework="Native" developmentDependency="true" />
77
<package id="boost_system-vc120" version="1.58.0.0" targetFramework="Native" developmentDependency="true" />
88
<package id="boost_thread-vc120" version="1.58.0.0" targetFramework="Native" developmentDependency="true" />
9-
<package id="openssl.v120.windesktop.msvcstl.static.rt-dyn.x64" version="1.0.2.0" targetFramework="native" developmentDependency="true" userInstalled="true" />
10-
<package id="openssl.v120.windesktop.msvcstl.static.rt-dyn.x86" version="1.0.2.0" targetFramework="native" developmentDependency="true" userInstalled="true" />
11-
<package id="openssl.v120.windesktop.msvcstl.static.rt-dyn" version="1.0.2.0" targetFramework="Native" developmentDependency="true" />
9+
<package id="openssl.v120.windesktop.msvcstl.static.rt-dyn" version="1.0.2.1" targetFramework="Native" developmentDependency="true" />
10+
<package id="openssl.v120.windesktop.msvcstl.static.rt-dyn.x64" version="1.0.2.1" targetFramework="Native" developmentDependency="true" />
11+
<package id="openssl.v120.windesktop.msvcstl.static.rt-dyn.x86" version="1.0.2.1" targetFramework="Native" developmentDependency="true" />
1212
<package id="zlib.v120.windesktop.msvcstl.static.rt-dyn" version="1.2.8.8" targetFramework="Native" developmentDependency="true" />
1313
</packages>

0 commit comments

Comments
 (0)