diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index f6ce1ae74..78bf1cfae 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 "40" +#define VERSION_REVISION "41" #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_rtmp_stack.cpp b/trunk/src/rtmp/srs_protocol_rtmp_stack.cpp index 0d272f7fe..76473caec 100644 --- a/trunk/src/rtmp/srs_protocol_rtmp_stack.cpp +++ b/trunk/src/rtmp/srs_protocol_rtmp_stack.cpp @@ -1752,11 +1752,13 @@ int SrsConnectAppPacket::decode(SrsStream* stream) srs_error("amf0 decode connect transaction_id failed. ret=%d", ret); return ret; } + + // some client donot send id=1.0, so we only warn user if not match. if (transaction_id != 1.0) { ret = ERROR_RTMP_AMF0_DECODE; - srs_error("amf0 decode connect transaction_id failed. " + srs_warn("amf0 decode connect transaction_id failed. " "required=%.1f, actual=%.1f, ret=%d", 1.0, transaction_id, ret); - return ret; + ret = ERROR_SUCCESS; } if ((ret = command_object->read(stream)) != ERROR_SUCCESS) { @@ -1845,11 +1847,13 @@ int SrsConnectAppResPacket::decode(SrsStream* stream) srs_error("amf0 decode connect transaction_id failed. ret=%d", ret); return ret; } + + // some client donot send id=1.0, so we only warn user if not match. if (transaction_id != 1.0) { ret = ERROR_RTMP_AMF0_DECODE; - srs_error("amf0 decode connect transaction_id failed. " + srs_warn("amf0 decode connect transaction_id failed. " "required=%.1f, actual=%.1f, ret=%d", 1.0, transaction_id, ret); - return ret; + ret = ERROR_SUCCESS; } if ((ret = props->read(stream)) != ERROR_SUCCESS) {