You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by "Gregg L. Smith" <gl...@gknw.net> on 2011/12/02 02:35:21 UTC
RE: svn commit: r1203859 [2/2] - in /httpd/httpd/trunk/modules/proxy:
mod_proxy.c ...
> 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
Re: svn commit: r1203859 [2/2] - in /httpd/httpd/trunk/modules/proxy: mod_proxy.c ...
Posted by Jim Jagielski <ji...@jaguNET.com>.
Thx!
On Dec 4, 2011, at 10:27 AM, Rainer Jung wrote:
> On 04.12.2011 15:38, Jim Jagielski wrote:
>>
>> On Dec 1, 2011, at 8:35 PM, Gregg L. Smith wrote:
>>>> @@ -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?
>>>
>>
>> I consider the above a veto-able change...
>
> I "fixed" it on trunk (r1210124) and backported to 2.4.x (1210125). I hope Stefan is fine with that.
>
> The string passed to those connection utility functions was used exclusively as a log prefix. All other proxy protocol modules use their scheme as the parameter (mostly uppercase) so for consistency I reverted this (small) part of the commit.
>
> Regards,
>
> Rainer
>
>
>
Re: svn commit: r1203859 [2/2] - in /httpd/httpd/trunk/modules/proxy:
mod_proxy.c ...
Posted by Rainer Jung <ra...@kippdata.de>.
On 04.12.2011 15:38, Jim Jagielski wrote:
>
> On Dec 1, 2011, at 8:35 PM, Gregg L. Smith wrote:
>>> @@ -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?
>>
>
> I consider the above a veto-able change...
I "fixed" it on trunk (r1210124) and backported to 2.4.x (1210125). I
hope Stefan is fine with that.
The string passed to those connection utility functions was used
exclusively as a log prefix. All other proxy protocol modules use their
scheme as the parameter (mostly uppercase) so for consistency I reverted
this (small) part of the commit.
Regards,
Rainer
Re: svn commit: r1203859 [2/2] - in /httpd/httpd/trunk/modules/proxy: mod_proxy.c ...
Posted by Jim Jagielski <ji...@jaguNET.com>.
On Dec 1, 2011, at 8:35 PM, Gregg L. Smith wrote:
>> @@ -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?
>
I consider the above a veto-able change...
Re: svn commit: r1203859 [2/2] - in /httpd/httpd/trunk/modules/proxy:
mod_proxy.c ...
Posted by Sagar Chanana <sa...@gmail.com>.
fuck off and delete my email from your list...I have tried many times..You
are bullshit !!
2011/12/2 Igor Galić <i....@brainsware.org>
>
>
> > 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?
>
> Unfortunately, you didn't miss it.
>
> > Cheers,
> >
> > Gregg
>
>
> --
> Igor Galić
>
> Tel: +43 (0) 664 886 22 883
> Mail: i.galic@brainsware.org
> URL: http://brainsware.org/
> GPG: 6880 4155 74BD FD7C B515 2EA5 4B1D 9E08 A097 C9AE
>
>
--
Thanks & regards,
Sagar Chanana
Mobile;- +91 9031958808
Re: svn commit: r1203859 [2/2] - in /httpd/httpd/trunk/modules/proxy: mod_proxy.c ...
Posted by Igor Galić <i....@brainsware.org>.
> 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?
Unfortunately, you didn't miss it.
> Cheers,
>
> Gregg
--
Igor Galić
Tel: +43 (0) 664 886 22 883
Mail: i.galic@brainsware.org
URL: http://brainsware.org/
GPG: 6880 4155 74BD FD7C B515 2EA5 4B1D 9E08 A097 C9AE