Commit 42410d22 authored by Eric Covener's avatar Eric Covener
Browse files

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



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1827360 13f79535-47bb-0310-9956-ffa450edef68
parent 50fa57a5

CHANGES

+4 −0
Original line number Diff line number Diff line 
                                                         -*- 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.

server/protocol.c

+1 −1
Original line number Diff line number Diff line
@@ -476,7 +476,7 @@ AP_DECLARE(apr_status_t) ap_rgetline(char **s, apr_size_t n, 
    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;