Attachment #31913 for bug #56703

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




        int err = JK_FALSE;
        if (jk_is_socket_connected(ae->sd, l) == JK_FALSE) {
            ae->last_errno = errno;
            jk_log(l, JK_LOG_INFO,
                   "(%s) failed sending request, "
                   "socket %d is not connected any more (errno=%d, connected=%d)",
                   ae->worker->name, ae->sd, ae->last_errno, ae->worker->s->connected);
            ajp_abort_endpoint(ae, JK_FALSE, l);
	    ae->worker->s->connected--;
            err = JK_TRUE;
            err_conn++;
        }

                    if (elapsed > aw->cache_timeout) {
                        time_t rt = 0;
                        n++;
                        rt = time(NULL);
                            rt = time(NULL);
                        aw->ep_cache[i]->reuse = JK_FALSE;
                        m_sock[m_count++] = aw->ep_cache[i]->sd;
                        aw->ep_cache[i]->sd = JK_INVALID_SOCKET;
                        ajp_reset_endpoint(aw->ep_cache[i], l);
                        jk_log(l, JK_LOG_INFO,
                               "(%s) cleaning pool slot=%d elapsed %d in %d",
                               aw->name, i, elapsed, (int)(difftime(time(NULL), rt)));
                                   aw->name, i, elapsed, (int)(difftime(time(NULL), rt)));
                    }
                }
                if (cnt <= aw->ep_mincache_sz + n) {

Return to bug 56703

Lines 1605-1615 Link Here

(-)./common/jk_ajp_common.c-2040812 (-7 / +6 lines)
1605	int err = JK_FALSE;	1605	int err = JK_FALSE;
1606	if (jk_is_socket_connected(ae->sd, l) == JK_FALSE) {	1606	if (jk_is_socket_connected(ae->sd, l) == JK_FALSE) {
1607	ae->last_errno = errno;	1607	ae->last_errno = errno;
1608	jk_log(l, JK_LOG_DEBUG,	1608	jk_log(l, JK_LOG_INFO,
1609	"(%s) failed sending request, "	1609	"(%s) failed sending request, "
1610	"socket %d is not connected any more (errno=%d, connected=%d)",	1610	"socket %d is not connected any more (errno=%d, connected=%d)",
1611	ae->worker->name, ae->sd, ae->last_errno, ae->worker->s->connected);	1611	ae->worker->name, ae->sd, ae->last_errno, ae->worker->s->connected);
1612	ajp_abort_endpoint(ae, JK_FALSE, l);	1612	ajp_abort_endpoint(ae, JK_FALSE, l);
		1613	ae->worker->s->connected--;
1613	err = JK_TRUE;	1614	err = JK_TRUE;
1614	err_conn++;	1615	err_conn++;
1615	}	1616	}
Lines 3347-3362 Link Here
3347	if (elapsed > aw->cache_timeout) {	3348	if (elapsed > aw->cache_timeout) {
3348	time_t rt = 0;	3349	time_t rt = 0;
3349	n++;	3350	n++;
3350	if (JK_IS_DEBUG_LEVEL(l))	3351	rt = time(NULL);
3351	rt = time(NULL);
3352	aw->ep_cache[i]->reuse = JK_FALSE;	3352	aw->ep_cache[i]->reuse = JK_FALSE;
3353	m_sock[m_count++] = aw->ep_cache[i]->sd;	3353	m_sock[m_count++] = aw->ep_cache[i]->sd;
3354	aw->ep_cache[i]->sd = JK_INVALID_SOCKET;	3354	aw->ep_cache[i]->sd = JK_INVALID_SOCKET;
3355	ajp_reset_endpoint(aw->ep_cache[i], l);	3355	ajp_reset_endpoint(aw->ep_cache[i], l);
3356	if (JK_IS_DEBUG_LEVEL(l))	3356	jk_log(l, JK_LOG_INFO,
3357	jk_log(l, JK_LOG_DEBUG,	3357	"(%s) cleaning pool slot=%d elapsed %d in %d",
3358	"(%s) cleaning pool slot=%d elapsed %d in %d",	3358	aw->name, i, elapsed, (int)(difftime(time(NULL), rt)));
3359	aw->name, i, elapsed, (int)(difftime(time(NULL), rt)));
3360	}	3359	}
3361	}	3360	}
3362	if (cnt <= aw->ep_mincache_sz + n) {	3361	if (cnt <= aw->ep_mincache_sz + n) {