Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 625571bf authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6429305 from c4f506d7 to rvc-release 

Change-Id: Ia41ffd41223c42c7791427329b22d95cbc744fa5
parents 3b2fa079 c4f506d7

DnsTlsSocket.cpp

+1 −1
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ bssl::UniquePtr<SSL> DnsTlsSocket::sslConnect(int fd) { 
    // This file descriptor is owned by mSslFd, so don't let libssl close it.

    bssl::UniquePtr<BIO> bio(BIO_new_socket(fd, BIO_NOCLOSE));

    SSL_set_bio(ssl.get(), bio.get(), bio.get());

    bio.release();

    (void)bio.release();



    if (!mCache->prepareSsl(ssl.get())) {

        return nullptr;

getaddrinfo.cpp

+0 −2
Original line number Diff line number Diff line
@@ -731,8 +731,6 @@ static int get_port(const struct addrinfo* ai, const char* servname, int matchon 
            return EAI_SERVICE;

        case SOCK_DGRAM:

        case SOCK_STREAM:

            allownumeric = 1;

            break;

        case ANY:

            allownumeric = 1;

            break;

res_comp.cpp

+1 −3
Original line number Diff line number Diff line
@@ -148,9 +148,7 @@ bool res_hnok(const char* dn) { 


        if (periodchar(ch)) {

            ;

        } else if (periodchar(pch)) {

            if (!borderchar(ch)) return false;

        } else if (periodchar(nch) || nch == '\0') {

        } else if (periodchar(pch) || periodchar(nch) || nch == '\0') {

            if (!borderchar(ch)) return false;

        } else {

            if (!middlechar(ch)) return false;

res_send.cpp

+2 −2
Original line number Diff line number Diff line
@@ -866,7 +866,7 @@ retry: 
    else

        timeout = evConsTime(0L, 0L);

    struct pollfd fds = {.fd = sock, .events = events};

    int n = ppoll(&fds, 1, &timeout, /*sigmask=*/NULL);

    int n = ppoll(&fds, 1, &timeout, /*__mask=*/NULL);

    if (n == 0) {

        LOG(INFO) << __func__ << ": " << sock << " retrying_poll timeout";

        errno = ETIMEDOUT;
@@ -905,7 +905,7 @@ static Result<std::vector<int>> udpRetryingPoll(res_state statp, const timespec* 
        timespec timeout = (evCmpTime(*finish, start_time) > 0) ? evSubTime(*finish, start_time)

                                                                : evConsTime(0L, 0L);

        std::vector<pollfd> fdset = extractUdpFdset(statp);

        const int n = ppoll(fdset.data(), fdset.size(), &timeout, /*sigmask=*/nullptr);

        const int n = ppoll(fdset.data(), fdset.size(), &timeout, /*__mask=*/nullptr);

        if (n <= 0) {

            if (errno == EINTR && n < 0) continue;

            if (n == 0) errno = ETIMEDOUT;