Call OnStreamSocketWrite() once per write event

[user/henk/code/inspircd.git] / src / inspsocket.cpp

diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp
index b8f8949dd202e7100212b94fd391c3afadf2d0f2..436cbb6bb9a24f85af959c05000a112ba6055bc7 100644 (file)
--- a/src/inspsocket.cpp
+++ b/src/inspsocket.cpp
@@ -202,33 +202,12 @@ void StreamSocket::DoWrite()
        if (GetIOHook())
        {
                {
-                       while (error.empty() && !sendq.empty())
                        {
-                               if (sendq.size() > 1 && sendq.front().length() < 1024)
-                               {
-                                       // Avoid multiple repeated SSL encryption invocations
-                                       // This adds a single copy of the queue, but avoids
-                                       // much more overhead in terms of system calls invoked
-                                       // by the IOHook.
-                                       //
-                                       // The length limit of 1024 is to prevent merging strings
-                                       // more than once when writes begin to block.
-                                       std::string tmp;
-                                       tmp.reserve(1280);
-                                       while (!sendq.empty() && tmp.length() < 1024)
-                                       {
-                                               tmp.append(sendq.front());
-                                               sendq.pop_front();
-                                       }
-                                       sendq.push_front(tmp);
-                               }
-
                                {
                                        int rv = GetIOHook()->OnStreamSocketWrite(this);
                                        if (rv > 0)
                                        {
                                                // consumed the entire string, and is ready for more
-                                               sendq.pop_front();
                                        }
                                        else if (rv == 0)
                                        {