Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 3587 invoked from network); 30 Aug 2007 16:01:18 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 30 Aug 2007 16:01:18 -0000 Received: (qmail 10660 invoked by uid 500); 30 Aug 2007 16:01:09 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 10553 invoked by uid 500); 30 Aug 2007 16:01:09 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 10531 invoked by uid 99); 30 Aug 2007 16:01:09 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 Aug 2007 09:01:09 -0700 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy) Received: from [209.133.199.10] (HELO jimsys.jagunet.com) (209.133.199.10) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 Aug 2007 16:01:05 +0000 Received: from [127.0.0.1] (localhost [127.0.0.1]) by jimsys.jagunet.com (Postfix) with ESMTP id 1EEA5AA4F03; Thu, 30 Aug 2007 12:00:45 -0400 (EDT) In-Reply-To: <20070830155423.GC67279@deejai2.mch.fsc.net> References: <20070830152928.492F71A9832@eris.apache.org> <200708301536.l7UFaIhq076567@devsys.jaguNET.com> <20070830155423.GC67279@deejai2.mch.fsc.net> Mime-Version: 1.0 (Apple Message framework v752.2) Content-Type: text/plain; charset=US-ASCII; delsp=yes; format=flowed Message-Id: <2C20B6C8-C193-4A22-A5D7-1127CEBCC814@jagunet.com> Cc: cvs@httpd.apache.org Content-Transfer-Encoding: 7bit From: Jim Jagielski Subject: Re: svn commit: r571209 - /httpd/httpd/branches/2.2.x/modules/proxy/ajp_header.c Date: Thu, 30 Aug 2007 12:00:44 -0400 To: dev@httpd.apache.org X-Mailer: Apple Mail (2.752.2) X-Virus-Checked: Checked by ClamAV on apache.org 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...