Merge branch '2.1' into develop

2017-04-05 11:34:59 +03:00
parent 1fb8cde5d8 e0a98f6539
commit ad1c05b015
51 changed files with 1133 additions and 450 deletions
--- a/server/core/buffer.cc
+++ b/server/core/buffer.cc
@ -337,7 +337,7 @@ GWBUF* gwbuf_clone(GWBUF* buf)
        while (clonebuf && buf->next)
        {
            buf = buf->next;
-            clonebuf->next = gwbuf_clone(buf);
+            clonebuf->next = gwbuf_clone_one(buf);
            clonebuf = clonebuf->next;
        }

@ -638,7 +638,7 @@ gwbuf_rtrim(GWBUF *head, unsigned int n_bytes)
    if (GWBUF_EMPTY(head))
    {
        rval = head->next;
-        gwbuf_free(head);
+        gwbuf_free_one(head);
    }
    return rval;
 }