httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Gregg L. Smith" <...@gknw.net>
Subject RE: svn commit: r1203859 [2/2] - in /httpd/httpd/trunk/modules/proxy: mod_proxy.c ...
Date Fri, 02 Dec 2011 01:35:21 GMT
> Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_scgi.c
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_scgi.c?rev=1203859&r1=1203858&r2=1203859&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/modules/proxy/mod_proxy_scgi.c (original)
> +++ httpd/httpd/trunk/modules/proxy/mod_proxy_scgi.c Fri Nov 18 21:41:09 2011
> @@ -511,12 +506,12 @@ static int scgi_handler(request_rec *r,
>
>       if (strncasecmp(url, SCHEME "://", sizeof(SCHEME) + 2)) {
>           ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
> -                      "proxy: " PROXY_FUNCTION ": declining URL %s", url);
> +                      "declining URL %s", url);
>           return DECLINED;
>       }
>
>       /* Create space for state information */
> -    status = ap_proxy_acquire_connection(PROXY_FUNCTION,&backend, worker,
> +    status = ap_proxy_acquire_connection(__FUNCTION__,&backend, worker,
>                                            r->server);
>       if (status != OK) {
>           goto cleanup;
> @@ -532,10 +527,10 @@ static int scgi_handler(request_rec *r,
>       }
>
>       /* Step Two: Make the Connection */
> -    if (ap_proxy_connect_backend(PROXY_FUNCTION, backend, worker, r->server)) {
> -        ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
> -                     "proxy: " PROXY_FUNCTION ": failed to make connection "
> -                     "to backend: %s:%u", backend->hostname, backend->port);
> +    if (ap_proxy_connect_backend(__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);
>           status = HTTP_SERVICE_UNAVAILABLE;
>           goto cleanup;
>       }
> @@ -551,7 +546,7 @@ static int scgi_handler(request_rec *r,
>   cleanup:
>       if (backend) {
>           backend->close = 1; /* always close the socket */
> -        ap_proxy_release_connection(PROXY_FUNCTION, backend, r->server);
> +        ap_proxy_release_connection(__FUNCTION__, backend, r->server);
>       }
>       return status;
>   }
>

While googling why one of my compilers would error out on this, it 
revealed that the __FUNCTION__ macro is C99 and not ANSI nor C89, and 
for now westillwant to support C89 AFAIK. I do not remember a go-ahead 
with C99 code. Did I miss that?

Cheers,

Gregg




Mime
View raw message