For #1537, #1282, sync with state-threads/srs
For #1537, #1282, sync with state-threads/srs

ossrs/srs,winlinvip/srs,winlinvip/simple-rtmp-server,ossrs/srs,winlinvip/srs,winlinvip/srs,winlinvip/srs,ossrs/srs,ossrs/srs,ossrs/srs,winlinvip/srs,winlinvip/srs,ossrs/srs