From: Eric Covener <covener@apache.org>
Date: Fri, 14 Apr 2017 19:38:34 +0000 (+0000)
Subject: mod_substitute: use local/native LF for splitting
X-Git-Tag: 2.5.0-alpha~471
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7fb70434eb2644aca6143d5e25c43afe3903d267;p=apache

mod_substitute: use local/native LF for splitting

On platforms where the APR_ASCII_LF != '\n', like EBCDIC systems,
strmatch or pcre patterns from the source or config will be in
the native encoding, and this module will really only work on
content in the native encoding.

(mod_substitute runs before mod_charset_lite for a similar reason)

I thought #if APR_CHARSET_EBCDIC or even #ifdef __MVS__ was overkill
here.




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1791400 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 9df60bb0f8..4b91eb2b6c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) mod_substitute: Fix spurious AH01328 (Line too long) errors on EBCDIC
+     systems.  [Eric Covener]
+
   *) mod_http2: client streams that lack the EOF flag get now forcefully
      closed with a RST_STREAM (NO_ERROR) when the request has been answered.
      [Stefan Eissing]     
diff --git a/modules/filters/mod_substitute.c b/modules/filters/mod_substitute.c
index b366cb3250..d6d031211c 100644
--- a/modules/filters/mod_substitute.c
+++ b/modules/filters/mod_substitute.c
@@ -453,7 +453,7 @@ static apr_status_t substitute_filter(ap_filter_t *f, apr_bucket_brigade *bb)
             else {
                 int num = 0;
                 while (bytes > 0) {
-                    nl = memchr(buff, APR_ASCII_LF, bytes);
+                    nl = memchr(buff, '\n', bytes);
                     if (nl) {
                         len = (apr_size_t) (nl - buff) + 1;
                         /* split *after* the newline */