Commit e3f221cb authored by Eric Covener's avatar Eric Covener
Browse files

old IBM EBCDIC fix that never got shared. 



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

CHANGES

+3 −0
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-

Changes with Apache 2.5.0



  *) core: EBCDIC fixes for interim responses with additional headers.

     [Eric Covener]



  *) mod_http2: fix for possible page fault when stream is resumed during 

     session shutdown. [sidney-j-r-m (github)]

server/protocol.c

+16 −2
Original line number Diff line number Diff line
@@ -2080,12 +2080,26 @@ typedef struct hdr_ptr { 
    apr_bucket_brigade *bb;

} hdr_ptr;



 

#if APR_CHARSET_EBCDIC

static int send_header(void *data, const char *key, const char *val)

{

    char *header_line = NULL;

    hdr_ptr *hdr = (hdr_ptr*)data;



    header_line = apr_pstrcat(hdr->bb->p, key, ": ", val, CRLF, NULL);

    ap_xlate_proto_to_ascii(header_line, strlen(header_line));

    ap_fputs(hdr->f, hdr->bb, header_line);

    return 1;

}

#else

static int send_header(void *data, const char *key, const char *val)

{

     ap_fputstrs(((hdr_ptr*)data)->f, ((hdr_ptr*)data)->bb,

                 key, ": ", val, CRLF, NULL);

     return 1;

 }

#endif



AP_DECLARE(void) ap_send_interim_response(request_rec *r, int send_headers)

{