martin 99/01/09 13:37:57
Modified: src/main http_request.c
Log:
Save the EBCDIC conversion setting across invocations of ap_run_sub_req().
Previously, virtually SSI-included "raw ascii" documents would destroy
the conversion setting of the including document.
Revision Changes Path
1.144 +7 -0 apache-1.3/src/main/http_request.c
Index: http_request.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/main/http_request.c,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- http_request.c 1999/01/08 20:08:23 1.143
+++ http_request.c 1999/01/09 21:37:56 1.144
@@ -912,7 +912,14 @@
API_EXPORT(int) ap_run_sub_req(request_rec *r)
{
+#ifndef CHARSET_EBCDIC
int retval = ap_invoke_handler(r);
+#else /*CHARSET_EBCDIC*/
+ /* Save the EBCDIC conversion setting of the caller across subrequests */
+ int convert = ap_bgetflag(r->connection->client, B_EBCDIC2ASCII);
+ int retval = ap_invoke_handler(r);
+ ap_bsetflag(r->connection->client, B_EBCDIC2ASCII, convert);
+#endif /*CHARSET_EBCDIC*/
ap_finalize_sub_req_protocol(r);
return retval;
}
