Commit aa327cdd authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

merge from 5.1

parents e3e60a41 78eb1d48
...@@ -152,7 +152,10 @@ my_bool my_gethwaddr(uchar *to) ...@@ -152,7 +152,10 @@ my_bool my_gethwaddr(uchar *to)
{ {
if (info->Type == MIB_IF_TYPE_ETHERNET && if (info->Type == MIB_IF_TYPE_ETHERNET &&
info->AddressLength == ETHER_ADDR_LEN) info->AddressLength == ETHER_ADDR_LEN)
{
res= memcpy_and_test(to, info->Address, ETHER_ADDR_LEN); res= memcpy_and_test(to, info->Address, ETHER_ADDR_LEN);
}
info = info->Next;
} }
err: err:
......
...@@ -198,7 +198,7 @@ int Url_http::send(const char* data, size_t data_length) ...@@ -198,7 +198,7 @@ int Url_http::send(const char* data, size_t data_length)
} }
#ifdef HAVE_OPENSSL #ifdef HAVE_OPENSSL
struct st_VioSSLFd *ssl_fd; struct st_VioSSLFd *UNINIT_VAR(ssl_fd);
if (ssl) if (ssl)
{ {
buf[0]= 0; buf[0]= 0;
......
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