Merge branch 'develop' into 1.2.1-binlog_router_trx

2015-08-21 16:35:37 +02:00
parent 4242d28e13 8a362d6668
commit c53f7fc76d
3 changed files with 12 additions and 1 deletions
--- a/server/modules/protocol/httpd.c
+++ b/server/modules/protocol/httpd.c
@ -383,6 +383,16 @@ 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;
 }