--- native/mod_proxy_cluster/mod_proxy_cluster.c	2011-05-24 14:50:13 UTC (rev 591)
+++ native/mod_proxy_cluster/mod_proxy_cluster.c	2011-05-25 13:46:03 UTC (rev 592)
@@ -1280,6 +1280,7 @@
     apr_size_t written = 5;
     apr_interval_time_t org; 
     apr_status_t status;
+    apr_status_t ret;
 
     /* built the cping message */
     buf[0] = 0x12;
@@ -1290,13 +1291,13 @@
 
     status = apr_socket_send(sock, buf, &written);
     if (status != APR_SUCCESS) {
-        ap_log_error(APLOG_MARK, APLOG_ERR, status, NULL,
+        ap_log_error(APLOG_MARK, APLOG_ERR, status, r->server,
                       "ajp_cping_cpong(): send failed");
         return status;
     }
     status = apr_socket_timeout_get(sock, &org);
     if (status != APR_SUCCESS) {
-        ap_log_error(APLOG_MARK, APLOG_ERR, status, NULL,
+        ap_log_error(APLOG_MARK, APLOG_ERR, status, r->server,
                       "ajp_cping_cpong(): apr_socket_timeout_get failed");
         return status;
     }
@@ -1319,11 +1320,11 @@
         status = APR_EGENERAL;
     }
 cleanup:
-    status = apr_socket_timeout_set(sock, org);
-    if (status != APR_SUCCESS) {
+    ret = apr_socket_timeout_set(sock, org);
+    if (ret != APR_SUCCESS) {
         ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
                "ajp_cping_cpong: apr_socket_timeout_set failed");
-        return status;
+        return ret;
     }
 
     ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,