Merge branch '2.0release' into develop

@@ -38,7 +38,7 @@ failed_msg(){
 
 
 function check_log(){
 function check_log(){
     log_dir="`dirname $log`"
     log_dir="`dirname $log`"
-    (mkdir -p ${log_dir} && sudo chmod 777 ${log_dir} && touch $log)
+    (mkdir -p ${log_dir} && chmod 777 ${log_dir} && touch $log)
     ret=$?; if [[ $ret -ne 0 ]]; then failed_msg "create log failed, ret=$ret"; return $ret; fi
     ret=$?; if [[ $ret -ne 0 ]]; then failed_msg "create log failed, ret=$ret"; return $ret; fi
     ok_msg "create log( ${log} ) success"
     ok_msg "create log( ${log} ) success"
     
     

@@ -346,6 +346,7 @@ bool SrsHlsMuxer::is_segment_overflow()
 
 
 bool SrsHlsMuxer::is_segment_absolutely_overflow()
 bool SrsHlsMuxer::is_segment_absolutely_overflow()
 {
 {
+    // @see https://github.com/winlinvip/simple-rtmp-server/issues/151#issuecomment-83553950
     srs_assert(current);
     srs_assert(current);
     return current->duration >= hls_aof_ratio * hls_fragment;
     return current->duration >= hls_aof_ratio * hls_fragment;
 }
 }