merge from 2.0

@@ -65,8 +65,6 @@ SrsForwarder::SrsForwarder(SrsSource* s)
 
 
 SrsForwarder::~SrsForwarder()
 SrsForwarder::~SrsForwarder()
 {
 {
-    on_unpublish();
-    
     srs_freep(sdk);
     srs_freep(sdk);
     srs_freep(pthread);
     srs_freep(pthread);
     srs_freep(queue);
     srs_freep(queue);

@@ -567,6 +567,7 @@ void srs_close_stfd(st_netfd_t& stfd)
         // we must ensure the close is ok.
         // we must ensure the close is ok.
         int err = st_netfd_close(stfd);
         int err = st_netfd_close(stfd);
         srs_assert(err != -1);
         srs_assert(err != -1);
+        stfd = NULL;
     }
     }
 }
 }