merge from 2.0

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       3
 #define VERSION_MINOR       0
-#define VERSION_REVISION    212
+#define VERSION_REVISION    213
 
 // generated by configure, only macros.
 #include <srs_auto_headers.hpp>

trunk/src/protocol/srs_rtmp_handshake.cpp

@@ -151,6 +151,11 @@ namespace _srs_internal
     }
     
     SrsDH::~SrsDH()
+    {
+        close();
+    }
+    
+    void SrsDH::close()
     {
         if (pdh != NULL) {
             if (pdh->p != NULL) {
@@ -251,6 +256,8 @@ namespace _srs_internal
         
         int32_t bits_count = 1024;
         
+        close();
+        
         //1. Create the DH
         if ((pdh = DH_new()) == NULL) {
             ret = ERROR_OpenSslCreateDH; 

trunk/src/protocol/srs_rtmp_handshake.hpp

@@ -59,6 +59,8 @@ namespace _srs_internal
     public:
         SrsDH();
         virtual ~SrsDH();
+    private:
+        virtual void close();
     public:
         /**
         * initialize dh, generate the public and private key.