You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rj...@apache.org on 2011/12/04 16:20:51 UTC
svn commit: r1210125 - in /httpd/httpd/branches/2.4.x: ./
modules/proxy/mod_proxy_scgi.c
Author: rjung
Date: Sun Dec 4 15:20:51 2011
New Revision: 1210125
URL: http://svn.apache.org/viewvc?rev=1210125&view=rev
Log:
Partially revert r1203861: 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.
Backport of r1210124 from trunk.
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_scgi.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec 4 15:20:51 2011
@@ -1,3 +1,3 @@
/httpd/httpd/branches/revert-ap-ldap:1150158-1150173
/httpd/httpd/branches/wombat-integration:723609-723841
-/httpd/httpd/trunk:1201042,1201111,1201194,1201198,1201202,1202236,1202456,1202886,1203859,1204630,1204968,1204990,1205061,1205075,1205379,1205885,1206291,1206587,1206850,1207719,1208753,1208835,1209053,1209085,1209417,1209432,1209461,1209601,1209603,1209618,1209623,1209741,1209754,1209776,1209797-1209798,1209811-1209812,1209814,1209908,1209910,1209913,1209916-1209917,1209947,1209952,1210080
+/httpd/httpd/trunk:1201042,1201111,1201194,1201198,1201202,1202236,1202456,1202886,1203859,1204630,1204968,1204990,1205061,1205075,1205379,1205885,1206291,1206587,1206850,1207719,1208753,1208835,1209053,1209085,1209417,1209432,1209461,1209601,1209603,1209618,1209623,1209741,1209754,1209776,1209797-1209798,1209811-1209812,1209814,1209908,1209910,1209913,1209916-1209917,1209947,1209952,1210080,1210124
Modified: httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_scgi.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_scgi.c?rev=1210125&r1=1210124&r2=1210125&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_scgi.c (original)
+++ httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_scgi.c Sun Dec 4 15:20:51 2011
@@ -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,
}
/* 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,
}
/* 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,
"failed to make connection to backend: %s:%u",
backend->hostname, backend->port);
@@ -546,7 +547,7 @@ static int scgi_handler(request_rec *r,
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;
}