mirror of
https://github.com/apache/httpd.git
synced 2025-08-13 14:40:20 +00:00
78aba7227f
Provide new function ap_set_content_xlate() to simplify what needs to be done to set up translation of content. Use it where appropriate. With this change, EBCDIC logic was tweaked so that ap_checkconv() does not overlay a translation handle previously stored (e.g., by a module) unless it is turning translation off. Unless ap_checkconv() determines that translation is inappropriate, it should leave the translation handle alone. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85296 13f79535-47bb-0310-9956-ffa450edef68
123 lines
4.6 KiB
C
123 lines
4.6 KiB
C
/* ====================================================================
|
|
* The Apache Software License, Version 1.1
|
|
*
|
|
* Copyright (c) 2000 The Apache Software Foundation. All rights
|
|
* reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
*
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
*
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in
|
|
* the documentation and/or other materials provided with the
|
|
* distribution.
|
|
*
|
|
* 3. The end-user documentation included with the redistribution,
|
|
* if any, must include the following acknowledgment:
|
|
* "This product includes software developed by the
|
|
* Apache Software Foundation (http://www.apache.org/)."
|
|
* Alternately, this acknowledgment may appear in the software itself,
|
|
* if and wherever such third-party acknowledgments normally appear.
|
|
*
|
|
* 4. The names "Apache" and "Apache Software Foundation" must
|
|
* not be used to endorse or promote products derived from this
|
|
* software without prior written permission. For written
|
|
* permission, please contact apache@apache.org.
|
|
*
|
|
* 5. Products derived from this software may not be called "Apache",
|
|
* nor may "Apache" appear in their name, without prior written
|
|
* permission of the Apache Software Foundation.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
|
|
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
|
|
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
|
|
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
|
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
|
|
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
* ====================================================================
|
|
*
|
|
* This software consists of voluntary contributions made by many
|
|
* individuals on behalf of the Apache Software Foundation. For more
|
|
* information on the Apache Software Foundation, please see
|
|
* <http://www.apache.org/>.
|
|
*
|
|
* Portions of this software are based upon public domain software
|
|
* originally written at the National Center for Supercomputing Applications,
|
|
* University of Illinois, Urbana-Champaign.
|
|
*/
|
|
|
|
#include "ap_config.h"
|
|
|
|
#ifdef APACHE_XLATE
|
|
|
|
#include "httpd.h"
|
|
#include "http_log.h"
|
|
#include "http_core.h"
|
|
#include "util_charset.h"
|
|
|
|
/* ap_hdrs_to_ascii, ap_hdrs_from_ascii
|
|
*
|
|
* These are the translation handles used to translate between the network
|
|
* format of protocol headers and the local machine format.
|
|
*
|
|
* For an EBCDIC machine, these are valid handles which are set up at
|
|
* initialization to translate between ISO-8859-1 and the code page of
|
|
* the source code.
|
|
*
|
|
* For an ASCII machine, these remain NULL so that when they are stored
|
|
* in the BUFF via ap_bsetop(BO_WXLATE or BO_RXLATE) it ensures that no
|
|
* translation is performed.
|
|
*/
|
|
|
|
ap_xlate_t *ap_hdrs_to_ascii, *ap_hdrs_from_ascii;
|
|
|
|
/* ap_locale_to_ascii, ap_locale_from_ascii
|
|
*
|
|
* These handles are used for the translation of content, unless a
|
|
* configuration module overrides them.
|
|
*
|
|
* For an EBCDIC machine, these are valid handles which are set up at
|
|
* initialization to translate between ISO-8859-1 and the code page of
|
|
* the httpd process's locale.
|
|
*
|
|
* For an ASCII machine, these remain NULL so that no translation is
|
|
* performed (unless a configuration module does something, of course).
|
|
*/
|
|
|
|
ap_xlate_t *ap_locale_to_ascii, *ap_locale_from_ascii;
|
|
|
|
API_EXPORT(ap_status_t) ap_set_content_xlate(request_rec *r, int output,
|
|
ap_xlate_t *xlate)
|
|
{
|
|
ap_status_t rv;
|
|
|
|
if (output) {
|
|
r->rrx->to_net = xlate;
|
|
rv = ap_bsetopt(r->connection->client, BO_WXLATE, &xlate);
|
|
}
|
|
else {
|
|
r->rrx->from_net = xlate;
|
|
rv = ap_bsetopt(r->connection->client, BO_RXLATE, &xlate);
|
|
}
|
|
|
|
if (rv) {
|
|
ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
|
|
"BO_%sXLATE failed",
|
|
output ? "W" : "R");
|
|
}
|
|
|
|
return rv;
|
|
}
|
|
|
|
#endif /*APACHE_XLATE*/
|