From fa9870db96a9dde26eb6c6ce0baa95700832ebff Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Thu, 8 May 2014 11:51:49 +0800
Subject: [PATCH] fix bug #59: edge for FMS, always use schema1(digest-key) for
 FMS, or connect failed.

---
 trunk/src/core/srs_core.hpp               | 2 +-
 trunk/src/rtmp/srs_protocol_handshake.cpp | 3 ++-
 trunk/src/rtmp/srs_protocol_handshake.hpp | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp
index 1cb2ed8dd..06e0a2fde 100644
--- a/trunk/src/core/srs_core.hpp
+++ b/trunk/src/core/srs_core.hpp
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // current release version
 #define VERSION_MAJOR "0"
 #define VERSION_MINOR "9"
-#define VERSION_REVISION "90"
+#define VERSION_REVISION "91"
 #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
 // server info.
 #define RTMP_SIG_SRS_KEY "srs"
diff --git a/trunk/src/rtmp/srs_protocol_handshake.cpp b/trunk/src/rtmp/srs_protocol_handshake.cpp
index 34cb088ad..e61c2a7cb 100644
--- a/trunk/src/rtmp/srs_protocol_handshake.cpp
+++ b/trunk/src/rtmp/srs_protocol_handshake.cpp
@@ -1188,7 +1188,8 @@ int SrsComplexHandshake::handshake_with_server(SrsHandshakeBytes* hs_bytes, ISrs
     
     // sign c1
     c1s1 c1;
-    if ((ret = c1.c1_create(srs_schema0)) != ERROR_SUCCESS) {
+    // @remark, FMS requires the schema1(digest-key), or connect failed.
+    if ((ret = c1.c1_create(srs_schema1)) != ERROR_SUCCESS) {
         return ret;
     }
     c1.dump(hs_bytes->c0c1 + 1);
diff --git a/trunk/src/rtmp/srs_protocol_handshake.hpp b/trunk/src/rtmp/srs_protocol_handshake.hpp
index 156107c39..2a445ace5 100644
--- a/trunk/src/rtmp/srs_protocol_handshake.hpp
+++ b/trunk/src/rtmp/srs_protocol_handshake.hpp
@@ -43,6 +43,7 @@ namespace srs
     */
     enum srs_schema_type {
         srs_schema0 = 0, // key-digest sequence
+        // @remark, FMS requires the schema1(digest-key), or connect failed.
         srs_schema1 = 1, // digest-key sequence
         srs_schema_invalid = 2,
     };