svn commit: r571398 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS modules/debug/mod_dumpio.c

[ma...@apache.org]

Author: martin
Date: Fri Aug 31 01:23:57 2007
New Revision: 571398

URL: http://svn.apache.org/viewvc?rev=571398&view=rev
Log:
mod_dumpio: Fix for correct dumping of traffic on EBCDIC hosts
Data had been incorrectly converted twice, resulting in
garbled log output.
Based on trunk commit http://svn.apache.org/viewvc?rev=570753&view=rev

Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/modules/debug/mod_dumpio.c

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=571398&r1=571397&r2=571398&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:23:57 2007
@@ -1,6 +1,10 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.2.6
 
+  *) mod_dumpio: Fix for correct dumping of traffic on EBCDIC hosts
+     Data had been incorrectly converted twice, resulting in
+     garbled log output. [Martin Kraemer]
+
   *) mod_autoindex: Add in Type and Charset options to IndexOptions
      directive. This allows the admin to explicitly set the 
      content-type and charset of the generated page.

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=571398&r1=571397&r2=571398&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Fri Aug 31 01:23:57 2007
@@ -195,18 +195,6 @@
        http://svn.apache.org/viewvc?view=rev&revision=429879
        +1: niq, rpluem
 
-    * mod_dumpio.c: EBCDIC patch for correct dumping
-      Without this patch, the network data in dumpio's output are
-      worthless, because ASCII chars are interpreted as EBCDIC
-      (leaving almost no 'printable' chars over), plus the
-      actual logging module retranslates control chars once again
-      (incorrectly because they already were ascii)
-      "from ebcdic to ascii", so that even the escped chars are
-      useless for the user.
-      Trunk version of patch:
-        http://svn.apache.org/viewvc?rev=570753&view=rev
-      +1: martin,jim,rpluem
-
     * proxy/ajp_header.c: incorrect substring checks for header fields
       The method of parsing the header line tokens is flakey:
       it uses memcmp() to check, e.g., whether the header token is

Modified: httpd/httpd/branches/2.2.x/modules/debug/mod_dumpio.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/debug/mod_dumpio.c?rev=571398&r1=571397&r2=571398&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/debug/mod_dumpio.c (original)
+++ httpd/httpd/branches/2.2.x/modules/debug/mod_dumpio.c Fri Aug 31 01:23:57 2007
@@ -67,6 +67,9 @@
             if (nbytes) {
                 obuf = malloc(nbytes+1);    /* use pool? */
                 memcpy(obuf, buf, nbytes);
+#if APR_CHARSET_EBCDIC
+                ap_xlate_proto_from_ascii(obuf, nbytes);
+#endif
                 obuf[nbytes] = '\0';
                 ap_log_error(APLOG_MARK, ptr->loglevel, 0, c->base_server,
                      "mod_dumpio:  %s (%s-%s): %s",