httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jim Jagielski <...@jagunet.com>
Subject Re: svn commit: r571209 - /httpd/httpd/branches/2.2.x/modules/proxy/ajp_header.c
Date Thu, 30 Aug 2007 16:00:44 GMT

On Aug 30, 2007, at 11:54 AM, Martin Kraemer wrote:

> On Thu, Aug 30, 2007 at 11:36:18AM -0400, Jim Jagielski wrote:
>> Are these really candidates for bypassing the
>> normal backport process from trunk??
>>
>>> --- httpd/httpd/branches/2.2.x/modules/proxy/ajp_header.c (original)
>>> +++ httpd/httpd/branches/2.2.x/modules/proxy/ajp_header.c Thu Aug  
>>> 30 08:29:27 2007
>>> @@ -473,10 +473,11 @@
>>>
>>>      rc = ajp_msg_get_string(msg, &ptr);
>>>      if (rc == APR_SUCCESS) {
>>> -        r->status_line =  apr_psprintf(r->pool, "%d %s", status,  
>>> ptr);
>>> -#if defined(AS400) || defined(_OSD_POSIX)
>>> -        ap_xlate_proto_from_ascii(r->status_line, strlen(r- 
>>> >status_line));
>>> +#if defined(AS400) || defined(_OSD_POSIX) /* EBCDIC platforms */
>>> +        ptr = apr_pstrdup(r->pool, ptr);
>>> +        ap_xlate_proto_from_ascii(ptr, strlen(ptr));
>>>  #endif
>>> +        r->status_line =  apr_psprintf(r->pool, "%d %s", status,  
>>> ptr);
>>>      } else {
>>>          r->status_line = NULL;
>
> This patch is already in trunk:
>
> Later I had fixed it to eliminate the redundant tmp variable.
> Apparently, it was never backported.
>

But you just don't backport to the 2.2 branch. It's the
stable branch and it is RTC. Backports are proposed in
STATUS, voted on and then applied. None of that was done in
this case...


Mime
View raw message