You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rp...@apache.org on 2019/10/11 14:40:10 UTC
svn commit: r1868295 - /httpd/httpd/trunk/modules/proxy/proxy_util.c
Author: rpluem
Date: Fri Oct 11 14:40:10 2019
New Revision: 1868295
URL: http://svn.apache.org/viewvc?rev=1868295&view=rev
Log:
* Add back logging goodness
Add back logging goodness added by covener in r1865938.
Modified:
httpd/httpd/trunk/modules/proxy/proxy_util.c
Modified: httpd/httpd/trunk/modules/proxy/proxy_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/proxy_util.c?rev=1868295&r1=1868294&r2=1868295&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/trunk/modules/proxy/proxy_util.c Fri Oct 11 14:40:10 2019
@@ -2053,7 +2053,7 @@ PROXY_DECLARE(apr_status_t) ap_proxy_ini
if (worker->tmutex == NULL) {
rv = apr_thread_mutex_create(&(worker->tmutex), APR_THREAD_MUTEX_DEFAULT, p);
if (rv != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, APLOGNO(00928)
+ ap_log_error(APLOG_MARK, APLOG_ERR, rv, s, APLOGNO(00928)
"can not create worker thread mutex");
apr_global_mutex_unlock(proxy_mutex);
return rv;
@@ -2096,7 +2096,7 @@ PROXY_DECLARE(apr_status_t) ap_proxy_ini
rv = connection_constructor(&conn, worker, worker->cp->pool);
worker->cp->conn = conn;
- ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(00931)
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, rv, s, APLOGNO(00931)
"initialized single connection worker in child %" APR_PID_T_FMT " for (%s)",
getpid(), worker->s->hostname_ex);
}
@@ -2365,13 +2365,13 @@ PROXY_DECLARE(int) ap_proxy_acquire_conn
else {
/* create the new connection if the previous was destroyed */
if (!worker->cp->conn) {
- connection_constructor((void **)conn, worker, worker->cp->pool);
+ rv = connection_constructor((void **)conn, worker, worker->cp->pool);
}
else {
*conn = worker->cp->conn;
worker->cp->conn = NULL;
+ rv = APR_SUCCESS;
}
- rv = APR_SUCCESS;
}
if (rv != APR_SUCCESS) {