Merge branch 'develop' into MXS-329

2015-09-24 17:59:36 +03:00
parent 89667294b3 2f0ef4ad31
commit 2dfb9e3c11
24 changed files with 1937 additions and 529 deletions
--- a/server/modules/protocol/httpd.c
+++ b/server/modules/protocol/httpd.c
@ -381,16 +381,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;
 }