From 3073252a8fab126d58fc35e0a1630483d567c89b Mon Sep 17 00:00:00 2001 From: Rainer Jung Date: Sun, 4 Dec 2011 15:16:45 +0000 Subject: [PATCH] Partially revert r1203859: use a fixed string per module as the proxy_function instead of the macro __FUNCTION__ which is not C89. There's no real loss of information, because all of the calls are in the same scgi handler function. All proxy modules apart form SCGI already use the upper case scheme in the analogous calls. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1210124 13f79535-47bb-0310-9956-ffa450edef68 --- modules/proxy/mod_proxy_scgi.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/proxy/mod_proxy_scgi.c b/modules/proxy/mod_proxy_scgi.c index c457a6f980..f77a986e28 100644 --- a/modules/proxy/mod_proxy_scgi.c +++ b/modules/proxy/mod_proxy_scgi.c @@ -40,6 +40,7 @@ #define SCHEME "scgi" +#define PROXY_FUNCTION "SCGI" #define SCGI_MAGIC "SCGI" #define SCGI_PROTOCOL_VERSION "1" #define SCGI_DEFAULT_PORT (4000) @@ -511,7 +512,7 @@ static int scgi_handler(request_rec *r, proxy_worker *worker, } /* Create space for state information */ - status = ap_proxy_acquire_connection(__FUNCTION__, &backend, worker, + status = ap_proxy_acquire_connection(PROXY_FUNCTION, &backend, worker, r->server); if (status != OK) { goto cleanup; @@ -527,7 +528,7 @@ static int scgi_handler(request_rec *r, proxy_worker *worker, } /* Step Two: Make the Connection */ - if (ap_proxy_connect_backend(__FUNCTION__, backend, worker, r->server)) { + if (ap_proxy_connect_backend(PROXY_FUNCTION, backend, worker, r->server)) { ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00866) "failed to make connection to backend: %s:%u", backend->hostname, backend->port); @@ -546,7 +547,7 @@ static int scgi_handler(request_rec *r, proxy_worker *worker, cleanup: if (backend) { backend->close = 1; /* always close the socket */ - ap_proxy_release_connection(__FUNCTION__, backend, r->server); + ap_proxy_release_connection(PROXY_FUNCTION, backend, r->server); } return status; } -- 2.50.1