Commit a7d32da2 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r1777354 from trunk: 

old IBM EBCDIC fix that never got shared.


Submitted by: covener
Reviewed by: covener, wrowe, ylavic (by inspection)


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

STATUS

+0 −5
Original line number Diff line number Diff line
@@ -132,11 +132,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 
     2.4.x patch: trunk works

     +1: covener, wrowe, ylavic



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

     trunk patch: http://svn.apache.org/r1777354

     2.4.x patch: http://people.apache.org/~covener/patches/ebcdic-interim.diff

     +1: covener, wrowe, ylavic (by inspection)





PATCHES PROPOSED TO BACKPORT FROM TRUNK:

  [ New proposals should be added at the end of the list ]

server/protocol.c

+17 −2
Original line number Diff line number Diff line
@@ -2016,12 +2016,27 @@ typedef struct hdr_ptr { 
    ap_filter_t *f;

    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)

{

    hdr_ptr x;