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

dcb->data is allocated before poll_add_dcb in httpd_accept()

Browse Source 
This will prevent dcb->data to be NULL with threads
This commit is contained in:
Massimiliano Pinto
2013-08-20 11:37:57 +02:00
parent 21dabda848
commit 73ffa5a648
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/modules/protocol/httpd.c
View File

@ -330,16 +330,16 @@ int n_connect = 0;
client->state = DCB_STATE_IDLE; client->state = DCB_STATE_IDLE;
/* create the session data for HTTPD */
client_data = (HTTPD_session *)calloc(1, sizeof(HTTPD_session));
client->data = client_data;
if (poll_add_dcb(client) == -1) if (poll_add_dcb(client) == -1)
{ {
return n_connect; return n_connect;
} }
n_connect++; n_connect++;
/* create the session data for HTTPD */
client_data = (HTTPD_session *)calloc(1, sizeof(HTTPD_session));
client->data = client_data;
client->state = DCB_STATE_POLLING; client->state = DCB_STATE_POLLING;
} }
} }