提交: f12c2655c350bc6884d5a2233f91fb8c6746d1f1 - UltraMonkeyL7_nakano (git)

Commit MetaInfo

• 修訂: f12c2655c350bc6884d5a2233f91fb8c6746d1f1 (tree)
• 時間: 2010-10-15 17:28:10
• 作者: 0809216 <0809216@1ed6...>
• Commiter: 0809216

Log Message

#536 Fixed

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

Change Summary

• modified: l7vsd/module/protocol/protocol_module_sessionless.cpp

差異

--- a/l7vsd/module/protocol/protocol_module_sessionless.cpp
+++ b/l7vsd/module/protocol/protocol_module_sessionless.cpp
@@ -1157,7 +1157,7 @@ protocol_module_base::EVENT_TAG protocol_module_sessionless::handle_accept(const
                         //set return status
                         status = SORRYSERVER_SELECT;
                 }
-                //sorry flag on
+                //sorry flag off
                 else {
                         //set return status
                         status = REALSERVER_SELECT;
@@ -3331,7 +3331,7 @@ protocol_module_base::EVENT_TAG protocol_module_sessionless::handle_sorryserver_
                                         }
                                 }
 
-                                if (forwarded_for == FORWARDED_FOR_ON || session_data->sorry_flag == SORRY_FLAG_ON) {
+                                if (forwarded_for == FORWARDED_FOR_ON) {
                                         //search X-Forwarded-For header
                                         ret = find_http_header(recv_data.receive_buffer + it->send_offset, it->send_possible_size,
                                                                str_forword_for.c_str(), header_offset, header_offset_len);
@@ -7057,8 +7057,8 @@ protocol_module_base::EVENT_TAG protocol_module_sessionless::handle_sorryserver_
                            : session_data->target_endpoint;
                 receive_data_map_it receive_data_it = session_data->receive_data_map.find(endpoint);
                 if (unlikely(receive_data_it == session_data->receive_data_map.end())) {
-                        boost::format formatter("Invalid endpoint. thread id : %d.");
-                        formatter % boost::this_thread::get_id();
+                        boost::format formatter("Invalid endpoint(%s). thread id: %d.");
+                        formatter % endpoint % boost::this_thread::get_id();
                         putLogError(100125, formatter.str(), __FILE__, __LINE__);
                         throw - 1;
                 }