Merge branch 'develop' into 1.2.1-binlog_router_trx

2015-09-23 18:44:13 +02:00
parent ef15825efb 6a318836fb
commit 653bb57e7f
4 changed files with 39 additions and 96 deletions
--- a/server/modules/protocol/httpd.c
+++ b/server/modules/protocol/httpd.c
@ -383,16 +383,6 @@ int	n_connect = 0;
 static int
 httpd_close(DCB *dcb)
 {
-	if(dcb->dcb_readqueue)
-	{
-	    while((dcb->dcb_readqueue = GWBUF_CONSUME_ALL(dcb->dcb_readqueue)));
-	}
-
-	if(dcb->writeq)
-	{
-	    while((dcb->writeq = GWBUF_CONSUME_ALL(dcb->writeq)));
-	}
-
 	return 0;
 }