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

Merge branch '2.2' into 2.3

Browse Source
This commit is contained in:
Markus Mäkelä 2019-06-24 15:07:18 +03:00
commit a51e094cd5
No known key found for this signature in database
GPG Key ID: 72D48FCE664F7B19
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/core/admin.cc
View File

@ -189,7 +189,7 @@ bool Client::auth(MHD_Connection* connection, const char* url, const char* metho
method,
url);
}
send_auth_error(connection);
rval = false;
}
else if (!admin_user_is_inet_admin(user) && modifies_data(connection, method))
@ -271,7 +271,7 @@ int handle_client(void* cls,
// Authentication has failed, an error will be sent to the client
rval = MHD_YES;
if (*upload_data_size)
if (*upload_data_size || (state == Client::INIT && request_data_length(connection)))
{
// The client is uploading data, discard it so we can send the error
*upload_data_size = 0;