Temporarily removed output buffering as an experiment

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@3683 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/src/socket.cpp b/src/socket.cpp
index 2ab7d7a571c017944799addfaac2037df3349848..06e01f54c20a8653e2c92b52871dbe286295cdfc 100644 (file)
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -256,10 +256,14 @@ int InspSocket::Write(const std::string &data)
 {
        if (this->ClosePending)
                return false;
+
+       write(this->fd,data.c_str(),data.length());
+       return true;
+
        /* Try and append the data to the back of the queue, and send it on its way
         */
-       outbuffer.push_back(data);
-       return (!this->FlushWriteBuffer());
+       //outbuffer.push_back(data);
+       //return (!this->FlushWriteBuffer());
 }
 
 bool InspSocket::FlushWriteBuffer()
@@ -267,7 +271,7 @@ bool InspSocket::FlushWriteBuffer()
        if (this->ClosePending)
                return true;
 
-       if ((this->fd > -1) && (this->state == I_CONNECTED))
+       /*if ((this->fd > -1) && (this->state == I_CONNECTED))
        {
                if (outbuffer.size())
                {
@@ -278,9 +282,9 @@ bool InspSocket::FlushWriteBuffer()
                                log(DEBUG,"Wrote %d to socket",result);
                                if ((unsigned int)result == outbuffer[0].length())
                                {
-                                       /* The whole block was written (usually a line)
+                                        * The whole block was written (usually a line)
                                         * Pop the block off the front of the queue
-                                        */
+                                        *
                                        log(DEBUG,"Popping front item, now %d items left",outbuffer.size());
                                        outbuffer.pop_front();
                                }
@@ -300,7 +304,7 @@ bool InspSocket::FlushWriteBuffer()
                                return true;
                        }
                }
-       }
+       }*/
        return false;
 }
 

diff --git a/src/svn-rev.sh b/src/svn-rev.sh
index 04d9d21e0a73c296892b8585b1cb4b085e6d43a3..e40d3378206942ac3570288d001e72f302d2e742 100755 (executable)
--- a/src/svn-rev.sh
+++ b/src/svn-rev.sh
@@ -1 +1 @@
-echo 3678
+echo 3682