X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FServer.cc;h=7ea4bf19089b0605372d5f122c0c841b76fd764b;hb=refs%2Fheads%2Fmaster;hp=6bb4aae3b3007b01f0e3357fd58152a631b5d7c8;hpb=1342c5d49ca8bd523c9fdf7d89b40448cdfd394b;p=senf.git

diff --git a/senf/Utils/Console/Server.cc b/senf/Utils/Console/Server.cc
index 6bb4aae..7ea4bf1 100644
--- a/senf/Utils/Console/Server.cc
+++ b/senf/Utils/Console/Server.cc
@@ -56,7 +56,7 @@
 namespace {
     senf::console::SysInfo::Proxy addSysInfo (
             "SENF: The Simple and Extensible Network Framework\n"
-            "  © 2006-2011 Fraunhofer Institute for Open Communication Systems, Network Research\n"
+            "  (c) 2006-2011 Fraunhofer Institute for Open Communication Systems (FOKUS)\n"
             "  Contact: senf-dev@lists.berlios.de\n"
             "  Version: " SENF_LIB_VERSION " Revision number: " SENF_REVISION "\n"
             "  Build-type: " BUILD_TYPE ", SenfLog compile time limit: " +
@@ -262,7 +262,7 @@ senf::console::detail::NoninteractiveClientReader::streamBufferMaxSize()
 
 prefix_ void senf::console::detail::NoninteractiveClientReader::v_write(std::string const & data)
 {
-    if( sendQueue_.size() > streamBufferMaxSize_)
+    if (sendQueue_.size() > streamBufferMaxSize_)
         return;
     sendQueue_.insert( sendQueue_.end(), data.begin(), data.end());
     writeHandler(scheduler::FdEvent::EV_WRITE);
@@ -345,7 +345,7 @@ prefix_ senf::console::Client::Client(Server & server, ClientHandle handle)
               false),
       name_ (server.name()), reader_ (), mode_ (server.mode())
 {
-    handle_.facet<senf::TCPSocketProtocol>().nodelay();
+    handle_.facet<senf::TCPSocketProtocol>().nodelay(true);
     handle_.blocking(false);
     executor_.chroot(root());
     switch (mode_) {
@@ -415,7 +415,9 @@ prefix_ std::string::size_type senf::console::Client::handleInput(std::string da
         if (i != std::string::npos) {
             backtrace_ = msg.substr(0,i);
             msg = msg.substr(i+4);
-        } else
+        } else {
+            backtrace_.clear();
+        }
 
         stream() << msg << std::endl;
     }