svn commit: r571402 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS modules/proxy/ajp_header.c

[ma...@apache.org]

Author: martin
Date: Fri Aug 31 01:40:14 2007
New Revision: 571402

URL: http://svn.apache.org/viewvc?rev=571402&view=rev
Log:
proxy/ajp_header.c: Backport of an AJP protocol fix for EBCDIC
On EBCDIC machines, the status_line string was incorrectly converted
twice.
Based on trunk revisions 357022 and 357699.

Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/modules/proxy/ajp_header.c

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=571402&r1=571401&r2=571402&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Fri Aug 31 01:40:14 2007
@@ -1,6 +1,10 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.2.6
 
+  *) proxy/ajp_header.c: Backport of an AJP protocol fix for EBCDIC
+     On EBCDIC machines, the status_line string was incorrectly converted
+     twice. [Jean-Frederic Clere, Martin Kraemer] (based on rev. 357022)
+
   *) mod_dumpio: Fix for correct dumping of traffic on EBCDIC hosts
      Data had been incorrectly converted twice, resulting in
      garbled log output. [Martin Kraemer]

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=571402&r1=571401&r2=571402&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Fri Aug 31 01:40:14 2007
@@ -226,14 +226,6 @@
         http://svn.apache.org/viewvc?rev=571232&view=rev
       +1: jim,martin,rpluem
 
-    * proxy/ajp_header.c: EBCDIC: backport of rev. 357022, fixing the AJP protocol.
-      An EBCDIC decimal string prefix was incorrectly
-      converted "again" to EBCDIC.
-      Trunk version of patch:
-        http://svn.apache.org/viewvc?rev=357022&view=rev
-      Had already been committed as Rev. 571209 (but was reverted again)
-        http://svn.apache.org/viewvc?rev=571209&view=rev
-      +1: martin,jim,rpluem
 
 PATCHES/ISSUES THAT ARE STALLED
 

Modified: httpd/httpd/branches/2.2.x/modules/proxy/ajp_header.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/proxy/ajp_header.c?rev=571402&r1=571401&r2=571402&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/ajp_header.c (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/ajp_header.c Fri Aug 31 01:40:14 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;
     }