Merge branch 'develop' into MAX-309

2014-10-24 09:39:42 +02:00
parent 35996a40cb 42b52c6f51
commit 48423f75f6
20 changed files with 5083 additions and 46 deletions
--- a/server/core/modutil.c
+++ b/server/core/modutil.c
@ -167,6 +167,7 @@ GWBUF	*addition;
 		*ptr++ = (newlength + 1) & 0xff;
 		*ptr++ = ((newlength + 1) >> 8) & 0xff;
 		*ptr++ = ((newlength + 1) >> 16) & 0xff;
+		addition->gwbuf_type = orig->gwbuf_type;
 		orig->next = addition;
 	}