Merge branch 'development' of https://git01.codeplex.com/casablanca into removepoco

Author: stgates

Release/CMakeLists.txt

@@ -59,7 +59,14 @@ elseif(ANDROID)
 elseif(UNIX) # This includes OSX
   find_package(Boost REQUIRED COMPONENTS random chrono system thread locale regex filesystem)
   find_package(Threads REQUIRED)
-  find_package(OpenSSL REQUIRED)
+  if(APPLE AND NOT OPENSSL_ROOT_DIR)
+    # Prefer a homebrew version of OpenSSL over the one in /usr/lib
+    file(GLOB OPENSSL_ROOT_DIR /usr/local/Cellar/openssl/*)
+    # Prefer the latest (make the latest one first)
+    list(REVERSE OPENSSL_ROOT_DIR)
+  endif()
+  # This should prevent linking against the system provided 0.9.8y
+  find_package(OpenSSL 1.0.0 REQUIRED)
 
   option(BUILD_SHARED_LIBS "Build shared Libraries." ON)
   option(BUILD_TESTS "Build tests." ON)

Release/include/cpprest/astreambuf.h

@@ -96,7 +96,10 @@ namespace std {
 }
 #endif // _MS_WINDOWS
 
-namespace Concurrency { namespace streams
+namespace Concurrency 
+{ 
+/// Library for asychronous streams.
+namespace streams
 {
     /// <summary>
     /// Extending the standard char_traits type with one that adds values and types

Release/include/cpprest/asyncrt_utils.h

@@ -50,27 +50,14 @@ namespace pplx = Concurrency;
 #include <boost/algorithm/string.hpp>
 #endif
 
+/// Various utilities for string conversions and date and time manipulation.
 namespace utility
 {
 
-#if  !defined(_MS_WINDOWS) || (_MSC_VER >= 1700) // Post VS10 and Linux
+// Left over from VS2010 support, remains to avoid breaking.
 typedef std::chrono::seconds seconds;
-#else // VS10
-/// <summary>
-/// A type used to represent timeouts for Azure storage APIs
-/// </summary>
-// The chrono header is not present on Visual Studio with versions < 1700 so we define a 'seconds' type for timeouts
-class seconds
-{
-public:
-    explicit seconds(__int64 time = 0): m_count(time) {}
-    __int64 count() const { return m_count; }
-
-private:
-    __int64 m_count;
-};
-#endif
 
+/// Functions for converting to/from std::chrono::seconds to xml string.
 namespace timespan
 {
     /// <summary>
@@ -86,6 +73,7 @@ namespace timespan
     _ASYNCRTIMP utility::seconds __cdecl xml_duration_to_seconds(utility::string_t timespanString);
 }
 
+/// Functions for string conversions.
 namespace conversions
 {
     /// <summary>

Release/include/cpprest/base_uri.h

@@ -316,6 +316,7 @@ namespace web {
         /// A default port is one where the port is unspecified, and will be determined by the operating system.
         /// The choice of default port may be dictated by the scheme (http -> 80) or not.
         /// </summary>
+        /// <returns><c>true</c> if this URI instance has a default port, <c>false</c> otherwise.</returns>
         bool is_port_default() const
         {
             return !is_empty() && this->port() == 0;

Release/include/cpprest/filestream.h

@@ -100,7 +100,7 @@ namespace details {
 
     /// <summary>
     /// Private stream buffer implementation for file streams.
-        /// The class itself should not be used in application code, it is used by the stream definitions farther down in the header file.
+    /// The class itself should not be used in application code, it is used by the stream definitions farther down in the header file.
     /// </summary>
     template<typename _CharType>
     class basic_file_buffer : public details::streambuf_state_manager<_CharType>

Release/include/cpprest/http_client.h

@@ -65,10 +65,13 @@ namespace pplx = Concurrency;
 
 #include "cpprest/oauth2.h"
 
+/// The web namespace contains functionality common to multiple protocols like HTTP and WebSockets.
 namespace web 
 {
+/// Declarations and functionality for the HTTP protocol.
 namespace http
 {
+/// HTTP client side library.
 namespace client
 {
 
@@ -263,7 +266,7 @@ class http_client_config
     /// <summary>
     /// Sets the server certificate validation property.
     /// </summary>
-    /// <param name="validate_cert">False to turn ignore all server certificate validation errors, true otherwise.</param>
+    /// <param name="validate_certs">False to turn ignore all server certificate validation errors, true otherwise.</param>
     /// <remarks>Note ignoring certificate errors can be dangerous and should be done with caution.</remarks>
     void set_validate_certificates(bool validate_certs)
     {

Release/include/cpprest/http_listener.h

@@ -37,19 +37,14 @@
 
 #include "cpprest/http_msg.h"
 
-namespace web { 
-
-/// <summary>
-/// Declaration to avoid making a dependency on IISHost.
-/// </summary>
-namespace iis_host
-{
-    class http_iis_receiver;
-}
-
+namespace web 
+{ 
 namespace http
 {
-namespace experimental {
+/// HTTP listener is currently in beta.
+namespace experimental 
+{
+/// HTTP server side library.
 namespace listener
 {
 

Release/include/cpprest/http_msg.h

@@ -51,18 +51,11 @@ namespace pplx = Concurrency;
 #include <boost/algorithm/string/predicate.hpp>
 #endif
 
-namespace web {
-
-/// <summary>
-/// Declaration to avoid making a dependency on IISHost.
-/// </summary>
-namespace iis_host
+namespace web 
 {
-    class http_iis_receiver;
-}
-
 namespace http
 {
+
 // URI class has been moved from web::http namespace to web namespace.
 // The below using declarations ensure we dont break existing code.
 // Please use the web::uri class going forward.
@@ -79,6 +72,10 @@ namespace client
 /// HTTP 1.1 specification.
 /// </summary>
 typedef utility::string_t method;
+
+/// <summary>
+/// Common HTTP methods.
+/// </summary>
 class methods
 {
 public:
@@ -191,6 +188,10 @@ class http_exception : public std::exception
         return m_msg.c_str();
     }
 
+    /// <summary>
+    /// Retrieves the underlying error code causing this exception.
+    /// </summary>
+    /// <returns>A std::error_code.</returns>
     const std::error_code & error_code() const
     {
         return m_errorCode;

Release/include/cpprest/json.h

@@ -39,7 +39,10 @@
 #include "cpprest/basic_types.h"
 #include "cpprest/asyncrt_utils.h"
 
-namespace web { namespace json
+namespace web 
+{
+/// Library for parsing and serializing JSON values to and from C++ types.
+namespace json
 {
 
     // Various forward declarations.

Release/include/cpprest/oauth1.h

@@ -35,6 +35,7 @@ namespace web
 {
 namespace http
 {
+/// oAuth 1.0 library.
 namespace oauth1
 {
 namespace details
@@ -91,6 +92,7 @@ class oauth1_strings
 
 } // namespace web::http::oauth1::details
 
+/// oAuth functionality is currently in beta.
 namespace experimental
 {