Commit ac20f84e authored by Sergei Golubchik's avatar Sergei Golubchik

don't make feedback_plugin_send.test as 'big'

don't assume that the http reply packet will arrive in all in one piece
parent f9675754
source t/feedback_plugin_load.test; source t/feedback_plugin_load.test;
source include/big_test.inc;
if (!$MTR_FEEDBACK_PLUGIN) { if (!$MTR_FEEDBACK_PLUGIN) {
skip MTR_FEEDBACK_PLUGIN is not set; skip MTR_FEEDBACK_PLUGIN is not set;
......
...@@ -155,7 +155,7 @@ int Url_http::send(const char* data, size_t data_length) ...@@ -155,7 +155,7 @@ int Url_http::send(const char* data, size_t data_length)
{ {
my_socket fd= INVALID_SOCKET; my_socket fd= INVALID_SOCKET;
char buf[1024]; char buf[1024];
uint len; uint len= 0;
addrinfo *addrs, *addr, filter= {0, AF_UNSPEC, SOCK_STREAM, 6, 0, 0, 0, 0}; addrinfo *addrs, *addr, filter= {0, AF_UNSPEC, SOCK_STREAM, 6, 0, 0, 0, 0};
int res= getaddrinfo(host.str, port.str, &filter, &addrs); int res= getaddrinfo(host.str, port.str, &filter, &addrs);
...@@ -258,7 +258,13 @@ int Url_http::send(const char* data, size_t data_length) ...@@ -258,7 +258,13 @@ int Url_http::send(const char* data, size_t data_length)
Extract the first string between <h1>...</h1> tags Extract the first string between <h1>...</h1> tags
and put it as a server reply into the error log. and put it as a server reply into the error log.
*/ */
len= vio_read(vio, (uchar*)buf, sizeof(buf)-1); for (;;)
{
size_t i= vio_read(vio, (uchar*)buf + len, sizeof(buf) - len - 1);
if ((int)i <= 0)
break;
len+= i;
}
if (len && len < sizeof(buf)) if (len && len < sizeof(buf))
{ {
char *from; char *from;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment