Merge pull request apache#50 from Edge/ts-3266

Alan M. Carroll · Alan M. Carroll · commit 0137caf2e657 · 2015-06-23T22:04:45.000-05:00
TS-3266:  Add logic to move control to the session pool.
Reviewed by solidwallofcode
diff --git a/iocore/net/UnixNetVConnection.cc b/iocore/net/UnixNetVConnection.cc
@@ -632,9 +632,11 @@ UnixNetVConnection::do_io_close(int alerrno /* = -1 */)
   read.vio.buffer.clear();
   read.vio.nbytes = 0;
   read.vio.op = VIO::NONE;
+  read.vio._cont = NULL;
   write.vio.buffer.clear();
   write.vio.nbytes = 0;
   write.vio.op = VIO::NONE;
+  write.vio._cont = NULL;
 
   EThread *t = this_ethread();
   bool close_inline = !recursion && nh->mutex->thread_holding == t;
diff --git a/proxy/http/HttpSM.h b/proxy/http/HttpSM.h
@@ -55,7 +55,7 @@
  * IMPORTANT NOTE: enable/disable LAZY_BUF_ALLOC in HttpServerSession.h
  * as well.
  */
-#define LAZY_BUF_ALLOC
+//#define LAZY_BUF_ALLOC
 
 #define HTTP_API_CONTINUE (INK_API_EVENT_EVENTS_START + 0)
 #define HTTP_API_ERROR (INK_API_EVENT_EVENTS_START + 1)
diff --git a/proxy/http/HttpServerSession.cc b/proxy/http/HttpServerSession.cc
@@ -168,6 +168,10 @@ HttpServerSession::release()
     return;
   }
 
+  // Drop the read on the VC before we transfer control to the session pool
+  // TS-3266
+  this->do_io_read(NULL,  0, NULL);
+
   HSMresult_t r = httpSessionManager.release_session(this);
 
 
diff --git a/proxy/http/HttpServerSession.h b/proxy/http/HttpServerSession.h
@@ -42,7 +42,7 @@
 *
 * IMPORTANT NOTE: enable/disable LAZY_BUF_ALLOC in HttpSM.h as well.
 */
-#define LAZY_BUF_ALLOC
+//#define LAZY_BUF_ALLOC
 
 #include "P_Net.h"
 

Original file line number	Diff line number	Diff line change
`@@ -168,6 +168,10 @@ HttpServerSession::release()`
`168`	`168`	`return;`
`169`	`169`	`}`
`170`	`170`
	`171`	`+ // Drop the read on the VC before we transfer control to the session pool`
	`172`	`+ // TS-3266`
	`173`	`+ this->do_io_read(NULL, 0, NULL);`
	`174`	`+`
`171`	`175`	`HSMresult_t r = httpSessionManager.release_session(this);`
`172`	`176`
`173`	`177`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@`
`42`	`42`	`*`
`43`	`43`	`* IMPORTANT NOTE: enable/disable LAZY_BUF_ALLOC in HttpSM.h as well.`
`44`	`44`	`*/`
`45`		`-#define LAZY_BUF_ALLOC`
	`45`	`+//#define LAZY_BUF_ALLOC`
`46`	`46`
`47`	`47`	`#include "P_Net.h"`
`48`	`48`