提交: 7929006fbb79c032d662de4e400cecb97374b57e - ultramonkey-l7-v3 (git)

UltraMonkey-L7 V3(multi-thread implementation)

Commit MetaInfo

• 修订版: 7929006fbb79c032d662de4e400cecb97374b57e (tree)
• 时间: 2012-08-31 15:22:15
• 作者: Hiroaki Nakano <nakano.hiroaki@nttc...>
• Commiter: Hiroaki Nakano

Log Message

Merge branch 'ssl_fix_by_CW'

更改概述

• modified: l7vsd/src/tcp_session.cpp

差异

--- a/l7vsd/src/tcp_session.cpp
+++ b/l7vsd/src/tcp_session.cpp
@@ -897,11 +897,20 @@ void tcp_session::up_thread_run()
 
         if (ssl_flag) {
                 client_ssl_socket.wait_async_event_all_end();
+
+                // clear messages
+
+                tcp_thread_message *msg = up_thread_message_que.pop();
+                while (msg) {
+                        delete msg;
+                        msg = up_thread_message_que.pop();
+                }
+
                 upthread_status = UPTHREAD_LOCK;
                 parent_dispatcher.post(boost::bind(&tcp_session::up_thread_client_ssl_socket_clear_socket_handler,this));
                 boost::mutex::scoped_lock lock(upthread_status_mutex);
                 while (unlikely(upthread_status == UPTHREAD_LOCK)) {
-                        tcp_thread_message *msg = up_thread_message_que.pop();
+                        msg = up_thread_message_que.pop();
                         if (msg) {      // message is alive.
                                 msg->message(MESSAGE_PROC);
                                 delete msg;