View | Details | Raw Unified | Return to bug 41332
Collapse All | Expand All

(-)jk_ajp_common.c (-8 / +11 lines)
Lines 760-765 Link Here
760
        rc = select((int)ae->sd + 1, &rset, NULL, NULL, &tv);
760
        rc = select((int)ae->sd + 1, &rset, NULL, NULL, &tv);
761
    } while (rc < 0 && errno == EINTR);
761
    } while (rc < 0 && errno == EINTR);
762
762
763
    ae->last_errno = 0;
763
    if (rc == 0) {
764
    if (rc == 0) {
764
        /* Timeout. Set the errno to timeout */
765
        /* Timeout. Set the errno to timeout */
765
#if defined(WIN32) || (defined(NETWARE) && defined(__NOVELL_LIBC__))
766
#if defined(WIN32) || (defined(NETWARE) && defined(__NOVELL_LIBC__))
Lines 767-777 Link Here
767
#else
768
#else
768
        errno = ETIMEDOUT;
769
        errno = ETIMEDOUT;
769
#endif
770
#endif
771
        ae->last_errno = errno;
770
        return JK_FALSE;
772
        return JK_FALSE;
771
    }
773
    }
772
    else if (rc < 0) {
774
    else if (rc < 0) {
775
        ae->last_errno = errno;
773
        jk_log(l, JK_LOG_WARNING,
776
        jk_log(l, JK_LOG_WARNING,
774
               "error during select err=%d", errno);
777
               "error during select, (errno=%d)", ae->last_errno);
775
        return JK_FALSE;
778
        return JK_FALSE;
776
    }
779
    }
777
    else
780
    else
Lines 872-878 Link Here
872
875
873
    jk_log(l, JK_LOG_INFO,
876
    jk_log(l, JK_LOG_INFO,
874
           "Failed opening socket to (%s) with (errno=%d)",
877
           "Failed opening socket to (%s) with (errno=%d)",
875
           jk_dump_hinfo(&ae->worker->worker_inet_addr, buf), errno);
878
           jk_dump_hinfo(&ae->worker->worker_inet_addr, buf), ae->last_errno);
876
    JK_TRACE_EXIT(l);
879
    JK_TRACE_EXIT(l);
877
    return JK_FALSE;
880
    return JK_FALSE;
878
}
881
}
Lines 947-955 Link Here
947
        else {
950
        else {
948
            jk_log(l, JK_LOG_ERROR,
951
            jk_log(l, JK_LOG_ERROR,
949
                   "(%s) can't receive the response message from tomcat, "
952
                   "(%s) can't receive the response message from tomcat, "
950
                   "network problems or tomcat is down (%s), err=%d",
953
                   "network problems or tomcat is down (%s), (errno=%d)",
951
                   ae->worker->name, jk_dump_hinfo(&ae->worker->worker_inet_addr,
954
                   ae->worker->name, jk_dump_hinfo(&ae->worker->worker_inet_addr,
952
                                                   buf), rc);
955
                                                   buf), ae->last_errno);
953
             JK_TRACE_EXIT(l);
956
             JK_TRACE_EXIT(l);
954
        }
957
        }
955
        return JK_FALSE;
958
        return JK_FALSE;
Lines 1015-1023 Link Here
1015
        ae->last_errno = errno;
1018
        ae->last_errno = errno;
1016
        jk_log(l, JK_LOG_ERROR,
1019
        jk_log(l, JK_LOG_ERROR,
1017
               "(%s) can't receive the response message from tomcat, "
1020
               "(%s) can't receive the response message from tomcat, "
1018
               "network problems or tomcat (%s) is down %d",
1021
               "network problems or tomcat (%s) is down, (errno=%d)",
1019
               ae->worker->name, jk_dump_hinfo(&ae->worker->worker_inet_addr, buf),
1022
               ae->worker->name, jk_dump_hinfo(&ae->worker->worker_inet_addr, buf),
1020
                                               rc);
1023
               ae->last_errno);
1021
        JK_TRACE_EXIT(l);
1024
        JK_TRACE_EXIT(l);
1022
        return JK_FALSE;
1025
        return JK_FALSE;
1023
    }
1026
    }
Lines 1544-1551 Link Here
1544
                JK_FALSE) {
1547
                JK_FALSE) {
1545
                jk_log(l, JK_LOG_ERROR,
1548
                jk_log(l, JK_LOG_ERROR,
1546
                       "(%s) Timeout with waiting reply from tomcat. "
1549
                       "(%s) Timeout with waiting reply from tomcat. "
1547
                       "Tomcat is down, stopped or network problems.",
1550
                       "Tomcat is down, stopped or network problems, (errno=%d)",
1548
                       p->worker->name);
1551
                       p->worker->name, p->last_errno);
1549
                if (headeratclient == JK_FALSE) {
1552
                if (headeratclient == JK_FALSE) {
1550
                    if (p->worker->recovery_opts & RECOVER_ABORT_IF_TCGETREQUEST)
1553
                    if (p->worker->recovery_opts & RECOVER_ABORT_IF_TCGETREQUEST)
1551
                        op->recoverable = JK_FALSE;
1554
                        op->recoverable = JK_FALSE;

Return to bug 41332