merge srs2

@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // current release version
 // current release version
 #define VERSION_MAJOR       3
 #define VERSION_MAJOR       3
 #define VERSION_MINOR       0
 #define VERSION_MINOR       0
-#define VERSION_REVISION    216
+#define VERSION_REVISION    217
 
 
 // generated by configure, only macros.
 // generated by configure, only macros.
 #include <srs_auto_headers.hpp>
 #include <srs_auto_headers.hpp>

@@ -1765,7 +1765,7 @@ string srs_client_type_string(SrsRtmpConnType type)
 {
 {
     switch (type) {
     switch (type) {
         case SrsRtmpConnPlay: return "Play";
         case SrsRtmpConnPlay: return "Play";
-        case SrsRtmpConnFlashPublish: return "flash-publish)";
+        case SrsRtmpConnFlashPublish: return "flash-publish";
         case SrsRtmpConnFMLEPublish: return "fmle-publish";
         case SrsRtmpConnFMLEPublish: return "fmle-publish";
         default: return "Unknown";
         default: return "Unknown";
     }
     }