Commit f2325e84 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  Goodbye r->content_lanaguage (per vote from apache-1.3/STATUS).


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

CHANGES

+5 −0
Original line number Diff line number Diff line 
Changes with Apache 2.0.26-dev



  *) Eliminate the depreciated r->content_language, in favor of the array

     r->content_languages introduced many years ago.  Module authors must

     substantially overhaul their modules, so this needs to be upgraded

     if the module still relied on backwards-brokeness.  [William Rowe]



  *) Allow configure help strings to work with autoconf 2.50+ and 2.13.

     [Justin Erenkrantz]

include/ap_mmn.h

+2 −1
Original line number Diff line number Diff line
@@ -79,12 +79,13 @@ 
 * 20010726 (2.0.22-dev) more big API changes

 * 20010808 (2.0.23-dev) dir d_is_absolute bit introduced, bucket changes, etc

 * 20010825 (2.0.25-dev) removed d_is_absolute, introduced map_to_storage hook

 * 20011002 (2.0.26-dev) removed 1.3-depreciated request_rec.content_language

 */



#define MODULE_MAGIC_COOKIE 0x41503230UL /* "AP20" */



#ifndef MODULE_MAGIC_NUMBER_MAJOR

#define MODULE_MAGIC_NUMBER_MAJOR 20010825

#define MODULE_MAGIC_NUMBER_MAJOR 20011002

#endif

#define MODULE_MAGIC_NUMBER_MINOR 0                     /* 0...n */

#define MODULE_MAGIC_NUMBER MODULE_MAGIC_NUMBER_MAJOR	/* backward compat */

include/httpd.h

+3 −5
Original line number Diff line number Diff line
@@ -806,9 +806,9 @@ struct request_rec { 
    /** Notes from one module to another */

    apr_table_t *notes;



    /* content_type, handler, content_encoding, content_language, and all

     * content_languages MUST be lowercased strings.  They may be pointers

     * to static strings; they should not be modified in place.

    /* content_type, handler, content_encoding, and all content_languages 

     * MUST be lowercased strings.  They may be pointers to static strings;

     * they should not be modified in place.

     */

    /** The content-type for the current request */

    const char *content_type;	/* Break these out --- we dispatch on 'em */
@@ -817,8 +817,6 @@ struct request_rec { 


    /** How to encode the data */

    const char *content_encoding;

    /** for back-compat. only -- do not use */

    const char *content_language;

    /** array of (char*) representing the content languages */

    apr_array_header_t *content_languages;

modules/http/http_protocol.c

+0 −5
Original line number Diff line number Diff line
@@ -1097,10 +1097,6 @@ AP_CORE_DECLARE_NONSTD(apr_status_t) ap_http_header_filter( 
            apr_table_mergen(r->headers_out, "Content-Language", languages[i]);

        }

    }

    else if (r->content_language) {

        apr_table_setn(r->headers_out, "Content-Language",

		       r->content_language);

    }



    /*

     * Control cachability for non-cachable responses if not already set by
@@ -1774,7 +1770,6 @@ AP_DECLARE(void) ap_send_error_response(request_rec *r, int recursive_error) 
            }

        }



        r->content_language = NULL;

        r->content_languages = NULL;

        r->content_encoding = NULL;

        r->clength = 0;

modules/http/http_request.c

+0 −1
Original line number Diff line number Diff line
@@ -424,7 +424,6 @@ AP_DECLARE(void) ap_internal_fast_redirect(request_rec *rr, request_rec *r) 
    r->content_type = rr->content_type;

    r->content_encoding = rr->content_encoding;

    r->content_languages = rr->content_languages;

    r->content_language = rr->content_language;

    r->finfo = rr->finfo;

    r->per_dir_config = rr->per_dir_config;

    /* copy output headers from subrequest, but leave negotiation headers */