SDYパッチ適用、ゴミ文字列削除

git-svn-id: http://10.144.169.20/repos/um/branches/l7vsd-3.x-ramiel-epoll-cond@10103 1ed66053-1c2d-0410-8867-f7571e6e31d3

diff --git a/l7vsd/init.d/l7vsd b/l7vsd/init.d/l7vsd
index e00b8ec..2b18bc1 100644 (file)
--- a/l7vsd/init.d/l7vsd
+++ b/l7vsd/init.d/l7vsd
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh
 # Start/Stop script for l7vsd
 #
 # chkconfig: - 95 34

diff --git a/l7vsd/src/tcp_session.cpp b/l7vsd/src/tcp_session.cpp
index 90100c0..8b00dc6 100644 (file)
--- a/l7vsd/src/tcp_session.cpp
+++ b/l7vsd/src/tcp_session.cpp
@@ -1002,7 +1002,7 @@ void tcp_session::up_thread_run()
                                 Logger::putLogDebug(LOG_CAT_L7VSD_SESSION, 999, formatter.str(), __FILE__, __LINE__);
                         }
                         to_time(LOCKTIMEOUT, xt);
-                        downthread_status_cond.wait(lock);
+                        downthread_status_cond.wait(lock, xt);
                 }
         }