Author: jfrederic.clere(a)jboss.com Date: 2008-11-24 06:07:05 -0500 (Mon, 24 Nov 2008) New Revision: 2067 Modified: trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c Log: Allow to deferenciate our cping/cpong to the mdo_proxy ones. Modified: trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c =================================================================== --- trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c 2008-11-23 18:13:03 UTC (rev 2066) +++ trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c 2008-11-24 11:07:05 UTC (rev 2067) @@ -1037,13 +1037,13 @@ status = apr_socket_send(sock, buf, &written); if (status != APR_SUCCESS) { ap_log_error(APLOG_MARK, APLOG_ERR, status, NULL, - "ajp_handle_cping_cpong(): send failed"); + "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, - "ajp_handle_cping_cpong(): apr_socket_timeout_get failed"); + "ajp_cping_cpong(): apr_socket_timeout_get failed"); return status; } status = apr_socket_timeout_set(sock, timeout); @@ -1051,12 +1051,12 @@ status = apr_socket_recv(sock, buf, &written); if (status != APR_SUCCESS) { ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server, - "ajp_handle_cping_cpong: apr_socket_recv failed"); + "ajp_cping_cpong: apr_socket_recv failed"); goto cleanup; } if (buf[0] != 0x41 || buf[1] != 0x42 || buf[2] != 0 || buf[3] != 1 || buf[4] != (unsigned char)9) { ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server, - "ajp_handle_cping_cpong: awaited CPONG, received %02x %02x %02x %02x %02x", + "ajp_cping_cpong: awaited CPONG, received %02x %02x %02x %02x %02x", buf[0] & 0xFF, buf[1] & 0xFF, buf[2] & 0xFF, @@ -1068,12 +1068,12 @@ status = apr_socket_timeout_set(sock, org); if (status != APR_SUCCESS) { ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server, - "ajp_handle_cping_cpong: apr_socket_timeout_set failed"); + "ajp_cping_cpong: apr_socket_timeout_set failed"); return status; } ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, - "ajp_handle_cping_cpong: Done"); + "ajp_cping_cpong: Done"); return status; } static apr_status_t proxy_cluster_try_pingpong(request_rec *r, proxy_worker *worker, char *scheme)