hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into mxs-47-fix

Browse Source
This commit is contained in:
Markus Makela
2015-03-19 12:18:44 +02:00
parent 5cb632a74a 3efe5c6b57
commit a9d72001c6
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/core/buffer.c
View File

@ -638,6 +638,8 @@ GWBUF *newbuf;
char *ptr; char *ptr;
int len; int len;
if(orig == NULL)
return NULL;
if (orig->next == NULL) if (orig->next == NULL)
return orig; return orig;

10
server/modules/filter/tee.c
View File

@ -1081,6 +1081,16 @@ clientReply (FILTER* instance, void *session, GWBUF *reply)
my_session->tee_partials[branch] = gwbuf_append(my_session->tee_partials[branch], reply); my_session->tee_partials[branch] = gwbuf_append(my_session->tee_partials[branch], reply);
my_session->tee_partials[branch] = gwbuf_make_contiguous(my_session->tee_partials[branch]); my_session->tee_partials[branch] = gwbuf_make_contiguous(my_session->tee_partials[branch]);
complete = modutil_get_complete_packets(&my_session->tee_partials[branch]); complete = modutil_get_complete_packets(&my_session->tee_partials[branch]);
if(complete == NULL)
{
/** Incomplete packet */
skygw_log_write(LOGFILE_DEBUG,"tee.c: Incomplete packet, "
"waiting for a complete packet before forwarding.");
rc = 1;
goto retblock;
}
complete = gwbuf_make_contiguous(complete); complete = gwbuf_make_contiguous(complete);
if(my_session->tee_partials[branch] && if(my_session->tee_partials[branch] &&