Merge branch 'develop' of https://github.com/watson-developer-cloud/unity-sdk into develop

Author: mediumTaj

ThirdParty/WebSocketSharp/AssemblyInfo.cs

@@ -0,0 +1,26 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+// Information about this assembly is defined by the following attributes. 
+// Change them to the values specific to your project.
+
+[assembly: AssemblyTitle("websocket-sharp")]
+[assembly: AssemblyDescription("A C# implementation of the WebSocket protocol client and server")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("websocket-sharp.dll")]
+[assembly: AssemblyCopyright("sta.blockhead")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
+// The form "{Major}.{Minor}.*" will automatically update the build and revision,
+// and "{Major}.{Minor}.{Build}.*" will update just the revision.
+
+[assembly: AssemblyVersion("1.0.2.*")]
+
+// The following attributes are used to specify the signing key for the assembly, 
+// if desired. See the Mono documentation for more information about signing.
+
+//[assembly: AssemblyDelaySign(false)]
+//[assembly: AssemblyKeyFile("")]

ThirdParty/WebSocketSharp/AssemblyInfo.cs.meta

@@ -4,7 +4,7 @@
  *
  * The MIT License
  *
- * Copyright (c) 2012-2014 sta.blockhead
+ * Copyright (c) 2012-2015 sta.blockhead
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -31,16 +31,16 @@
 namespace WebSocketSharp
 {
   /// <summary>
-  /// Contains the values that indicate whether the byte order is a Little-endian or Big-endian.
+  /// Specifies the byte order.
   /// </summary>
-  public enum ByteOrder : byte
+  public enum ByteOrder
   {
     /// <summary>
-    /// Indicates a Little-endian.
+    /// Specifies Little-endian.
     /// </summary>
     Little,
     /// <summary>
-    /// Indicates a Big-endian.
+    /// Specifies Big-endian.
     /// </summary>
     Big
   }

ThirdParty/WebSocketSharp/ByteOrder.cs

@@ -27,21 +27,20 @@
 #endregion
 
 using System;
-using System.Text;
 
 namespace WebSocketSharp
 {
   /// <summary>
-  /// Contains the event data associated with a <see cref="WebSocket.OnClose"/> event.
+  /// Represents the event data for the <see cref="WebSocket.OnClose"/> event.
   /// </summary>
   /// <remarks>
   ///   <para>
-  ///   A <see cref="WebSocket.OnClose"/> event occurs when the WebSocket connection has been
-  ///   closed.
+  ///   A <see cref="WebSocket.OnClose"/> event occurs when the WebSocket connection
+  ///   has been closed.
   ///   </para>
   ///   <para>
   ///   If you would like to get the reason for the close, you should access
-  ///   the <see cref="CloseEventArgs.Code"/> or <see cref="CloseEventArgs.Reason"/> property.
+  ///   the <see cref="Code"/> or <see cref="Reason"/> property.
   ///   </para>
   /// </remarks>
   public class CloseEventArgs : EventArgs
@@ -51,7 +50,6 @@ public class CloseEventArgs : EventArgs
     private bool        _clean;
     private ushort      _code;
     private PayloadData _payloadData;
-    private byte[]      _rawData;
     private string      _reason;
 
     #endregion
@@ -61,14 +59,12 @@ public class CloseEventArgs : EventArgs
     internal CloseEventArgs ()
     {
       _code = (ushort) CloseStatusCode.NoStatus;
-      _payloadData = new PayloadData ();
-      _rawData = _payloadData.ApplicationData;
+      _payloadData = PayloadData.Empty;
     }
 
     internal CloseEventArgs (ushort code)
     {
       _code = code;
-      _rawData = code.InternalToByteArray (ByteOrder.Big);
     }
 
     internal CloseEventArgs (CloseStatusCode code)
@@ -79,23 +75,22 @@ internal CloseEventArgs (CloseStatusCode code)
     internal CloseEventArgs (PayloadData payloadData)
     {
       _payloadData = payloadData;
-      _rawData = payloadData.ApplicationData;
 
-      var len = _rawData.Length;
+      var data = payloadData.ApplicationData;
+      var len = data.Length;
       _code = len > 1
-              ? _rawData.SubArray (0, 2).ToUInt16 (ByteOrder.Big)
+              ? data.SubArray (0, 2).ToUInt16 (ByteOrder.Big)
               : (ushort) CloseStatusCode.NoStatus;
 
       _reason = len > 2
-                ? _rawData.SubArray (2, len - 2).UTF8Decode ()
+                ? data.SubArray (2, len - 2).UTF8Decode ()
                 : String.Empty;
     }
 
     internal CloseEventArgs (ushort code, string reason)
     {
       _code = code;
       _reason = reason;
-      _rawData = code.Append (reason);
     }
 
     internal CloseEventArgs (CloseStatusCode code, string reason)
@@ -109,13 +104,7 @@ internal CloseEventArgs (CloseStatusCode code, string reason)
 
     internal PayloadData PayloadData {
       get {
-        return _payloadData ?? (_payloadData = new PayloadData (_rawData));
-      }
-    }
-
-    internal byte[] RawData {
-      get {
-        return _rawData;
+        return _payloadData ?? (_payloadData = new PayloadData (_code.Append (_reason)));
       }
     }
 
@@ -148,10 +137,10 @@ public string Reason {
     }
 
     /// <summary>
-    /// Gets a value indicating whether the WebSocket connection has been closed cleanly.
+    /// Gets a value indicating whether the connection has been closed cleanly.
     /// </summary>
     /// <value>
-    /// <c>true</c> if the WebSocket connection has been closed cleanly; otherwise, <c>false</c>.
+    /// <c>true</c> if the connection has been closed cleanly; otherwise, <c>false</c>.
     /// </value>
     public bool WasClean {
       get {

ThirdParty/WebSocketSharp/ByteOrder.cs.meta

@@ -31,92 +31,84 @@
 namespace WebSocketSharp
 {
   /// <summary>
-  /// Contains the values of the status code for the WebSocket connection close.
+  /// Indicates the status code for the WebSocket connection close.
   /// </summary>
   /// <remarks>
   ///   <para>
-  ///   The values of the status code are defined in
+  ///   The values of this enumeration are defined in
   ///   <see href="http://tools.ietf.org/html/rfc6455#section-7.4">Section 7.4</see> of RFC 6455.
   ///   </para>
   ///   <para>
-  ///   "Reserved value" must not be set as a status code in a close control frame by
+  ///   "Reserved value" must not be set as a status code in a connection close frame by
   ///   an endpoint. It's designated for use in applications expecting a status code to
   ///   indicate that the connection was closed due to the system grounds.
   ///   </para>
   /// </remarks>
   public enum CloseStatusCode : ushort
   {
     /// <summary>
-    /// Equivalent to close status 1000.
-    /// Indicates a normal close.
+    /// Equivalent to close status 1000. Indicates normal close.
     /// </summary>
     Normal = 1000,
     /// <summary>
-    /// Equivalent to close status 1001.
-    /// Indicates that an endpoint is going away.
+    /// Equivalent to close status 1001. Indicates that an endpoint is going away.
     /// </summary>
     Away = 1001,
     /// <summary>
-    /// Equivalent to close status 1002.
-    /// Indicates that an endpoint is terminating the connection due to a protocol error.
+    /// Equivalent to close status 1002. Indicates that an endpoint is terminating
+    /// the connection due to a protocol error.
     /// </summary>
     ProtocolError = 1002,
     /// <summary>
-    /// Equivalent to close status 1003.
-    /// Indicates that an endpoint is terminating the connection because it has received
-    /// a type of data that it cannot accept.
+    /// Equivalent to close status 1003. Indicates that an endpoint is terminating
+    /// the connection because it has received a type of data that it cannot accept.
     /// </summary>
     UnsupportedData = 1003,
     /// <summary>
-    /// Equivalent to close status 1004.
-    /// Still undefined. A Reserved value.
+    /// Equivalent to close status 1004. Still undefined. A Reserved value.
     /// </summary>
     Undefined = 1004,
     /// <summary>
-    /// Equivalent to close status 1005.
-    /// Indicates that no status code was actually present. A Reserved value.
+    /// Equivalent to close status 1005. Indicates that no status code was actually present.
+    /// A Reserved value.
     /// </summary>
     NoStatus = 1005,
     /// <summary>
-    /// Equivalent to close status 1006.
-    /// Indicates that the connection was closed abnormally. A Reserved value.
+    /// Equivalent to close status 1006. Indicates that the connection was closed abnormally.
+    /// A Reserved value.
     /// </summary>
     Abnormal = 1006,
     /// <summary>
-    /// Equivalent to close status 1007.
-    /// Indicates that an endpoint is terminating the connection because it has received
-    /// a message that contains data that isn't consistent with the type of the message.
+    /// Equivalent to close status 1007. Indicates that an endpoint is terminating
+    /// the connection because it has received a message that contains data that
+    /// isn't consistent with the type of the message.
     /// </summary>
     InvalidData = 1007,
     /// <summary>
-    /// Equivalent to close status 1008.
-    /// Indicates that an endpoint is terminating the connection because it has received
-    /// a message that violates its policy.
+    /// Equivalent to close status 1008. Indicates that an endpoint is terminating
+    /// the connection because it has received a message that violates its policy.
     /// </summary>
     PolicyViolation = 1008,
     /// <summary>
-    /// Equivalent to close status 1009.
-    /// Indicates that an endpoint is terminating the connection because it has received
-    /// a message that is too big to process.
+    /// Equivalent to close status 1009. Indicates that an endpoint is terminating
+    /// the connection because it has received a message that is too big to process.
     /// </summary>
     TooBig = 1009,
     /// <summary>
-    /// Equivalent to close status 1010.
-    /// Indicates that a client is terminating the connection because it has expected
-    /// the server to negotiate one or more extension, but the server didn't return
-    /// them in the handshake response.
+    /// Equivalent to close status 1010. Indicates that a client is terminating
+    /// the connection because it has expected the server to negotiate one or more extension,
+    /// but the server didn't return them in the handshake response.
     /// </summary>
     MandatoryExtension = 1010,
     /// <summary>
-    /// Equivalent to close status 1011.
-    /// Indicates that a server is terminating the connection because it has encountered
-    /// an unexpected condition that prevented it from fulfilling the request.
+    /// Equivalent to close status 1011. Indicates that a server is terminating
+    /// the connection because it has encountered an unexpected condition that
+    /// prevented it from fulfilling the request.
     /// </summary>
     ServerError = 1011,
     /// <summary>
-    /// Equivalent to close status 1015.
-    /// Indicates that the connection was closed due to a failure to perform a TLS handshake.
-    /// A Reserved value.
+    /// Equivalent to close status 1015. Indicates that the connection was closed
+    /// due to a failure to perform a TLS handshake. A Reserved value.
     /// </summary>
     TlsHandshakeFailure = 1015
   }

ThirdParty/WebSocketSharp/CloseEventArgs.cs

@@ -4,7 +4,7 @@
  *
  * The MIT License
  *
- * Copyright (c) 2013-2014 sta.blockhead
+ * Copyright (c) 2013-2015 sta.blockhead
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -31,22 +31,21 @@
 namespace WebSocketSharp
 {
   /// <summary>
-  /// Contains the values of the compression method used to compress the message on the WebSocket
-  /// connection.
+  /// Specifies the compression method used to compress a message on the WebSocket connection.
   /// </summary>
   /// <remarks>
-  /// The values of the compression method are defined in
-  /// <see href="http://tools.ietf.org/html/draft-ietf-hybi-permessage-compression-09">Compression
-  /// Extensions for WebSocket</see>.
+  /// The compression methods are defined in
+  /// <see href="http://tools.ietf.org/html/draft-ietf-hybi-permessage-compression-19">
+  /// Compression Extensions for WebSocket</see>.
   /// </remarks>
   public enum CompressionMethod : byte
   {
     /// <summary>
-    /// Indicates non compression.
+    /// Specifies non compression.
     /// </summary>
     None,
     /// <summary>
-    /// Indicates using DEFLATE.
+    /// Specifies DEFLATE.
     /// </summary>
     Deflate
   }