[Ehs-devel] SF.net SVN: ehs:[77] trunk/ehs.cpp

[<fe...@us...>]

Revision: 77
          http://ehs.svn.sourceforge.net/ehs/?rev=77&view=rev
Author:   felfert
Date:     2012-01-30 13:32:45 +0000 (Mon, 30 Jan 2012)
Log Message:
-----------
 - Send response body without locking

Modified Paths:
--------------
    trunk/ehs.cpp

Modified: trunk/ehs.cpp
===================================================================
--- trunk/ehs.cpp	2012-01-19 14:02:46 UTC (rev 76)
+++ trunk/ehs.cpp	2012-01-30 13:32:45 UTC (rev 77)
@@ -774,7 +774,7 @@
                         break;
                     case EHSConnection::ADDBUFFER_NORESOURCE:
                         {
-                            // Immediately send a 500 response, then close the connection
+                            // Immediately send a 503 response, then close the connection
                             auto_ptr<HttpResponse> tmp(HttpResponse::Error(HTTPRESPONSECODE_503_SERVICEUNAVAILABLE, 0, *i));
                             (*i)->SendHttpResponse(tmp);
                             (*i)->DoneReading(false);
@@ -802,7 +802,9 @@
         if (m_oHttpResponseMap.end() != i) {
             found = true;
             --m_nActiveRequests;
+            mutex.Unlock();
             SendHttpResponse(auto_ptr<HttpResponse>(i->second));
+            mutex.Lock();
             m_oHttpResponseMap.erase(i);
             ++m_nResponses;
             // set last activity to the current time for idle purposes
@@ -814,6 +816,8 @@
 
 void EHSConnection::SendHttpResponse(auto_ptr<HttpResponse> response)
 {
+    MutexHelper mutex(&m_oMutex);
+
     // only send it if the client isn't disconnected
     if (Disconnected()) {
         return;
@@ -840,6 +844,7 @@
 
     // extra line break signalling end of headers
     oss << "\r\n";
+    mutex.Unlock();
     m_poNetworkAbstraction->Send(
             reinterpret_cast<const void *>(oss.str().c_str()), oss.str().length());
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.