You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@apache.org on 2018/03/20 21:19:41 UTC
svn commit: r1827360 - in /httpd/httpd/branches/2.4.x: CHANGES
server/protocol.c
Author: covener
Date: Tue Mar 20 21:19:41 2018
New Revision: 1827360
URL: http://svn.apache.org/viewvc?rev=1827360&view=rev
Log:
Merge r1827359 from trunk:
PR62200: EBCDIC: ap_rgetline APR_ENOSPC
On EBCDIC systems, translation does not occur in ap_rgetline() if the line is
larger than the buffer size.
(note: No STATUS vote for EBCDIC fix)
Submitted By: Hank Ibell
Committed By: covener
Modified:
httpd/httpd/branches/2.4.x/CHANGES
httpd/httpd/branches/2.4.x/server/protocol.c
Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1827360&r1=1827359&r2=1827360&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Tue Mar 20 21:19:41 2018
@@ -1,6 +1,10 @@
-*- coding: utf-8 -*-
Changes with Apache 2.4.34
+ *) core: On ECBDIC platforms, some errors related to oversized headers
+ may be misreported or be logged as ASCII escapes. PR62200
+ [Hank Ibell <hwibell gmail.com>]
+
Changes with Apache 2.4.33
*) core: Fix request timeout logging and possible crash for error_log hooks.
Modified: httpd/httpd/branches/2.4.x/server/protocol.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/protocol.c?rev=1827360&r1=1827359&r2=1827360&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/protocol.c (original)
+++ httpd/httpd/branches/2.4.x/server/protocol.c Tue Mar 20 21:19:41 2018
@@ -476,7 +476,7 @@ AP_DECLARE(apr_status_t) ap_rgetline(cha
apr_status_t rv;
rv = ap_rgetline_core(s, n, read, r, fold, bb);
- if (rv == APR_SUCCESS) {
+ if (rv == APR_SUCCESS || APR_STATUS_IS_ENOSPC(rv)) {
ap_xlate_proto_from_ascii(*s, *read);
}
return rv;