提交: 7abe0b21c046c411c01533045b255aae2b83684a - ultramonkey-l7-v3 (git)

UltraMonkey-L7 V3(multi-thread implementation)

Commit MetaInfo

• 修订版: 7abe0b21c046c411c01533045b255aae2b83684a (tree)
• 时间: 2012-08-30 16:58:48
• 作者: 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
@@ -901,14 +901,15 @@ void tcp_session::up_thread_run()
                 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)) {
-                        to_time(LOCKTIMEOUT, xt);
-                        upthread_status_cond.timed_wait(lock, xt);
                         tcp_thread_message *msg = up_thread_message_que.pop();
                         if (msg) {      // message is alive.
                                 msg->message(MESSAGE_PROC);
                                 delete msg;
                                 msg = NULL;
-                        }
+                        }else{
+                                to_time(LOCKTIMEOUT, xt);
+                                upthread_status_cond.timed_wait(lock, xt);
+			}
                 }       // lockmode while loop end.
         }