Attachment #18031 for bug #38227

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




                                worker->hmax, worker->ttl,
                                connection_constructor, connection_destructor,
                                worker, worker->cp->pool);
ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "0: worker->hmax: %d, worker->cp->res: %s", worker->hmax, (worker->cp->res ? "not null" : "null"));

        apr_pool_cleanup_register(worker->cp->pool, (void *)worker,
                                  conn_pool_cleanup,

        }
    }
#if APR_HAS_THREADS
ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "1: worker->hmax: %d, worker->cp->res: %s", worker->hmax, (worker->cp->res ? "not null" : "null"));
    if (worker->hmax && worker->cp->res) {
        rv = apr_reslist_acquire(worker->cp->res, (void **)conn);
ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "2: calling apr_res_list_acquire conn");
    }
    else
#endif
    {
        /* create the new connection if the previous was destroyed */
        if (!worker->cp->conn) {
            connection_constructor((void **)conn, worker, worker->cp->pool);
ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "2: called connection_constructor");
        } else {
            *conn = worker->cp->conn;
            worker->cp->conn = NULL;
ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "2: used conn = worker->cp->conn");
        }
        rv = APR_SUCCESS;
    }

Return to bug 38227

Lines 1657-1662 Link Here

(-)proxy_util-old.c (-2 / +7 lines)
1657	worker->hmax, worker->ttl,	1657	worker->hmax, worker->ttl,
1658	connection_constructor, connection_destructor,	1658	connection_constructor, connection_destructor,
1659	worker, worker->cp->pool);	1659	worker, worker->cp->pool);
		1660	ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "0: worker->hmax: %d, worker->cp->res: %s", worker->hmax, (worker->cp->res ? "not null" : "null"));
1660		1661
1661	apr_pool_cleanup_register(worker->cp->pool, (void *)worker,	1662	apr_pool_cleanup_register(worker->cp->pool, (void *)worker,
1662	conn_pool_cleanup,	1663	conn_pool_cleanup,
Lines 1729-1746 Link Here
1729	}	1730	}
1730	}	1731	}
1731	#if APR_HAS_THREADS	1732	#if APR_HAS_THREADS
		1733	ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "1: worker->hmax: %d, worker->cp->res: %s", worker->hmax, (worker->cp->res ? "not null" : "null"));
1732	if (worker->hmax && worker->cp->res) {	1734	if (worker->hmax && worker->cp->res) {
1733	rv = apr_reslist_acquire(worker->cp->res, (void **)conn);	1735	rv = apr_reslist_acquire(worker->cp->res, (void **)conn);
		1736	ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "2: calling apr_res_list_acquire conn");
1734	}	1737	}
1735	else	1738	else
1736	#endif	1739	#endif
1737	{	1740	{
1738	/* create the new connection if the previous was destroyed */	1741	/* create the new connection if the previous was destroyed */
1739	if (!worker->cp->conn)	1742	if (!worker->cp->conn) {
1740	connection_constructor((void **)conn, worker, worker->cp->pool);	1743	connection_constructor((void **)conn, worker, worker->cp->pool);
1741	else {	1744	ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "2: called connection_constructor");
		1745	} else {
1742	*conn = worker->cp->conn;	1746	*conn = worker->cp->conn;
1743	worker->cp->conn = NULL;	1747	worker->cp->conn = NULL;
		1748	ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "2: used conn = worker->cp->conn");
1744	}	1749	}
1745	rv = APR_SUCCESS;	1750	rv = APR_SUCCESS;
1746	}	1751	}