4624ec7c743a08f22e90521b97d612c9499ae7efminfrin

4624ec7c743a08f22e90521b97d612c9499ae7efminfrin

4624ec7c743a08f22e90521b97d612c9499ae7efminfrin#include "apr.h"

4624ec7c743a08f22e90521b97d612c9499ae7efminfrin#include "apr_strings.h"

4624ec7c743a08f22e90521b97d612c9499ae7efminfrin#include "apr_file_io.h"

4624ec7c743a08f22e90521b97d612c9499ae7efminfrin#include "apr_lib.h"

4624ec7c743a08f22e90521b97d612c9499ae7efminfrin

4624ec7c743a08f22e90521b97d612c9499ae7efminfrin#define APR_WANT_STRFUNC

4624ec7c743a08f22e90521b97d612c9499ae7efminfrin#include "apr_want.h"

4624ec7c743a08f22e90521b97d612c9499ae7efminfrin

4624ec7c743a08f22e90521b97d612c9499ae7efminfrin#include "ap_config.h"

4624ec7c743a08f22e90521b97d612c9499ae7efminfrin#include "httpd.h"

4624ec7c743a08f22e90521b97d612c9499ae7efminfrin#include "http_config.h"

4624ec7c743a08f22e90521b97d612c9499ae7efminfrin#include "http_request.h"

4624ec7c743a08f22e90521b97d612c9499ae7efminfrin#include "http_protocol.h"

4624ec7c743a08f22e90521b97d612c9499ae7efminfrin#include "http_core.h"

4624ec7c743a08f22e90521b97d612c9499ae7efminfrin#include "http_log.h"

4624ec7c743a08f22e90521b97d612c9499ae7efminfrin#include "util_script.h"

4624ec7c743a08f22e90521b97d612c9499ae7efminfrin

4624ec7c743a08f22e90521b97d612c9499ae7efminfrin

4624ec7c743a08f22e90521b97d612c9499ae7efminfrin#define MAP_FILE_MAGIC_TYPE "application/x-type-map"

4624ec7c743a08f22e90521b97d612c9499ae7efminfrin

4624ec7c743a08f22e90521b97d612c9499ae7efminfrin

4624ec7c743a08f22e90521b97d612c9499ae7efminfrintypedef struct {

4624ec7c743a08f22e90521b97d612c9499ae7efminfrin int forcelangpriority;

4624ec7c743a08f22e90521b97d612c9499ae7efminfrin apr_array_header_t *language_priority;

4624ec7c743a08f22e90521b97d612c9499ae7efminfrin} neg_dir_config;

4624ec7c743a08f22e90521b97d612c9499ae7efminfrin

4624ec7c743a08f22e90521b97d612c9499ae7efminfrin#define FLP_UNDEF 0 /* Same as FLP_NONE, but base overrides */

4624ec7c743a08f22e90521b97d612c9499ae7efminfrin#define FLP_NONE 1 /* Return 406, HTTP_NOT_ACCEPTABLE */

4624ec7c743a08f22e90521b97d612c9499ae7efminfrin#define FLP_PREFIX 2 /* Try xx(-.*) from language_priority */

4624ec7c743a08f22e90521b97d612c9499ae7efminfrin#define FLP_ANY 4 /* Try anything in language_priority */

4624ec7c743a08f22e90521b97d612c9499ae7efminfrin /* If both, tries FLP_PREFIX then FLP_ANY */

4624ec7c743a08f22e90521b97d612c9499ae7efminfrin

4624ec7c743a08f22e90521b97d612c9499ae7efminfrinmodule AP_MODULE_DECLARE_DATA negotiation_module;

4624ec7c743a08f22e90521b97d612c9499ae7efminfrin

4624ec7c743a08f22e90521b97d612c9499ae7efminfrinstatic void *create_neg_dir_config(apr_pool_t *p, char *dummy)

4624ec7c743a08f22e90521b97d612c9499ae7efminfrin{

4624ec7c743a08f22e90521b97d612c9499ae7efminfrin neg_dir_config *new = (neg_dir_config *) apr_palloc(p, sizeof(neg_dir_config));

4624ec7c743a08f22e90521b97d612c9499ae7efminfrin

4624ec7c743a08f22e90521b97d612c9499ae7efminfrin new->forcelangpriority = FLP_UNDEF;

4624ec7c743a08f22e90521b97d612c9499ae7efminfrin new->language_priority = apr_array_make(p, 4, sizeof(char *));

5df82feb5bbe57f91f774801e1118edb5e2c87d7jailletc return new;

06ba4a61654b3763ad65f52283832ebf058fdf1cslive}

06ba4a61654b3763ad65f52283832ebf058fdf1cslive

78f97ce162b66a0dbfd7af4dcd9984f162569b04minfrinstatic void *merge_neg_dir_configs(apr_pool_t *p, void *basev, void *addv)

4624ec7c743a08f22e90521b97d612c9499ae7efminfrin{

4624ec7c743a08f22e90521b97d612c9499ae7efminfrin neg_dir_config *base = (neg_dir_config *) basev;

4624ec7c743a08f22e90521b97d612c9499ae7efminfrin neg_dir_config *add = (neg_dir_config *) addv;

4624ec7c743a08f22e90521b97d612c9499ae7efminfrin neg_dir_config *new = (neg_dir_config *) apr_palloc(p, sizeof(neg_dir_config));

4624ec7c743a08f22e90521b97d612c9499ae7efminfrin

4624ec7c743a08f22e90521b97d612c9499ae7efminfrin /* give priority to the config in the subdirectory */

4624ec7c743a08f22e90521b97d612c9499ae7efminfrin new->forcelangpriority = add->forcelangpriority ? add->forcelangpriority

0734f81384d5f2528bb119f89d135043a280d5b2minfrin : base->forcelangpriority;

0734f81384d5f2528bb119f89d135043a280d5b2minfrin new->language_priority = apr_array_append(p, add->language_priority,

0734f81384d5f2528bb119f89d135043a280d5b2minfrin base->language_priority);

0734f81384d5f2528bb119f89d135043a280d5b2minfrin return new;

0734f81384d5f2528bb119f89d135043a280d5b2minfrin}

0734f81384d5f2528bb119f89d135043a280d5b2minfrin

06ba4a61654b3763ad65f52283832ebf058fdf1cslivestatic const char *set_language_priority(cmd_parms *cmd, void *n,

2aff288113d772cedca6add888eb643afffe9fb1nd const char *lang)

b536777217c919cacb1a6f18eaeff001f3b3f13crbowen{

b536777217c919cacb1a6f18eaeff001f3b3f13crbowen apr_array_header_t *arr = ((neg_dir_config *) n)->language_priority;

fe64b2ba25510d8c9dba5560a2d537763566cf40nd const char **langp = (const char **) apr_array_push(arr);

c44eeebd065e2c8cd028016b45c58afb480aaf8fdruggeri

c44eeebd065e2c8cd028016b45c58afb480aaf8fdruggeri *langp = lang;

c44eeebd065e2c8cd028016b45c58afb480aaf8fdruggeri return NULL;

c44eeebd065e2c8cd028016b45c58afb480aaf8fdruggeri}

c44eeebd065e2c8cd028016b45c58afb480aaf8fdruggeri

c44eeebd065e2c8cd028016b45c58afb480aaf8fdruggeristatic const char *set_force_priority(cmd_parms *cmd, void *n_, const char *w)

c44eeebd065e2c8cd028016b45c58afb480aaf8fdruggeri{

c44eeebd065e2c8cd028016b45c58afb480aaf8fdruggeri neg_dir_config *n = n_;

fe64b2ba25510d8c9dba5560a2d537763566cf40nd

fe64b2ba25510d8c9dba5560a2d537763566cf40nd if (!strcasecmp(w, "None")) {

a547340d7d0f0e79c9ba921c7dec7b18d0c800ffrbowen n->forcelangpriority = FLP_NONE;

117c1f888a14e73cdd821dc6c23eb0411144a41cnd }

117c1f888a14e73cdd821dc6c23eb0411144a41cnd else if (!strcasecmp(w, "Prefix")) {

a547340d7d0f0e79c9ba921c7dec7b18d0c800ffrbowen n->forcelangpriority = FLP_PREFIX;

117c1f888a14e73cdd821dc6c23eb0411144a41cnd }

f21bea4c0f58e17aa1d9a0fac2c219852f89944amaczniak else if (!strcasecmp(w, "Any")) {

117c1f888a14e73cdd821dc6c23eb0411144a41cnd n->forcelangpriority = FLP_ANY;

90c99eca06310d91254dd3525e1f5e9fa612af71jim }

282b62d8e9a4edbc2da22ba2d876ec94afc48084nd else if (!strcasecmp(w, "Full")) {

3dd3d010c0efae7d1d6926f0b1de2da17eec796eminfrin n->forcelangpriority = FLP_PREFIX | FLP_ANY;

117c1f888a14e73cdd821dc6c23eb0411144a41cnd }

c1fcddc76fd5db5ac4ccd7c6ae839d53d128f354minfrin else {

c1fcddc76fd5db5ac4ccd7c6ae839d53d128f354minfrin return apr_pstrcat(cmd->pool, "Illegal ForceLanguagePriority option ", w, NULL);

c1fcddc76fd5db5ac4ccd7c6ae839d53d128f354minfrin }

117c1f888a14e73cdd821dc6c23eb0411144a41cnd

7ec4d5cc4aa574e3191bc5a612e68fd8f25ab7earpluem return NULL;

cf663b70eeea0b51582be629e148a697aa2a116eminfrin}

e80f65dadea03d04ee5b9e2d3de8c5fcef9e6714minfrin

8305f030deafc6022193cff1cb11b6f69a2d4f3arbowenstatic const char *cache_negotiated_docs(cmd_parms *cmd, void *dummy,

cf2c758d9a7837808846a4bbf5611f268954c79dnd int arg)

cf2c758d9a7837808846a4bbf5611f268954c79dnd{

fe64b2ba25510d8c9dba5560a2d537763566cf40nd ap_set_module_config(cmd->server->module_config, &negotiation_module,

c44eeebd065e2c8cd028016b45c58afb480aaf8fdruggeri (arg ? "Cache" : NULL));

b536777217c919cacb1a6f18eaeff001f3b3f13crbowen return NULL;

b536777217c919cacb1a6f18eaeff001f3b3f13crbowen}

30471a4650391f57975f60bbb6e4a90be7b284bfhumbedooh

fe64b2ba25510d8c9dba5560a2d537763566cf40ndstatic int do_cache_negotiated_docs(server_rec *s)

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar{

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar return (ap_get_module_config(s->module_config, &negotiation_module) != NULL);

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar}

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar

1f1b6bf13313fdd14a45e52e553d3ff28689b717coarstatic const command_rec negotiation_cmds[] =

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar{

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar AP_INIT_FLAG("CacheNegotiatedDocs", cache_negotiated_docs, NULL, RSRC_CONF,

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar "Either 'on' or 'off' (default)"),

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar AP_INIT_ITERATE("LanguagePriority", set_language_priority, NULL, OR_FILEINFO,

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar "space-delimited list of MIME language abbreviations"),

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar AP_INIT_TAKE1("ForceLanguagePriority", set_force_priority, NULL, OR_FILEINFO,

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar "One of 'none', 'prefix', 'any', or 'full'"),

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar {NULL}

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar};

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar

1f1b6bf13313fdd14a45e52e553d3ff28689b717coartypedef struct accept_rec {

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar char *name; /* MUST be lowercase */

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar float quality;

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar float level;

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar char *charset; /* for content-type only */

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar} accept_rec;

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar

1f1b6bf13313fdd14a45e52e553d3ff28689b717coartypedef struct var_rec {

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar request_rec *sub_req; /* May be NULL (is, for map files) */

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar const char *mime_type; /* MUST be lowercase */

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar const char *file_name; /* Set to 'this' (for map file body content) */

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar apr_off_t body; /* Only for map file body content */

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar const char *content_encoding;

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar apr_array_header_t *content_languages; /* list of languages for this variant */

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar const char *content_charset;

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar const char *description;

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar /* The next five items give the quality values for the dimensions

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar float lang_quality; /* quality of this variant's language */

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar float encoding_quality; /* ditto encoding */

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar float charset_quality; /* ditto charset */

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar float mime_type_quality; /* ditto media type */

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar float source_quality; /* source quality for this variant */

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar /* Now some special values */

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar float level; /* Auxiliary to content-type... */

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar apr_off_t bytes; /* content length, if known */

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar int lang_index; /* pre HTTP/1.1 language priority stuff */

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar int is_pseudo_html; /* text/html, *or* the INCLUDES_MAGIC_TYPEs */

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar /* Above are all written-once properties of the variant. The

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar float level_matched;

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar int mime_stars;

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar int definite;

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar} var_rec;

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar

1f1b6bf13313fdd14a45e52e553d3ff28689b717coartypedef struct {

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar apr_pool_t *pool;

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar request_rec *r;

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar char *dir_name;

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar int accept_q; /* 1 if an Accept item has a q= param */

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar float default_lang_quality; /* fiddle lang q for variants with no lang */

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar /* the array pointers below are NULL if the corresponding accept

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar apr_array_header_t *accepts; /* accept_recs */

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar apr_array_header_t *accept_encodings; /* accept_recs */

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar apr_array_header_t *accept_charsets; /* accept_recs */

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar apr_array_header_t *accept_langs; /* accept_recs */

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar apr_array_header_t *avail_vars; /* available variants */

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar int count_multiviews_variants; /* number of variants found on disk */

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar int is_transparent; /* 1 if this resource is trans. negotiable */

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar int dont_fiddle_headers; /* 1 if we may not fiddle with accept hdrs */

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar int ua_supports_trans; /* 1 if ua supports trans negotiation */

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar int send_alternates; /* 1 if we want to send an Alternates header */

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar int may_choose; /* 1 if we may choose a variant for the client */

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar int use_rvsa; /* 1 if we must use RVSA/1.0 negotiation algo */

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar} negotiation_state;

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar

1f1b6bf13313fdd14a45e52e553d3ff28689b717coarstatic void clean_var_rec(var_rec *mime_info)

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar{

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar mime_info->sub_req = NULL;

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar mime_info->mime_type = "";

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar mime_info->file_name = "";

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar mime_info->body = 0;

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar mime_info->content_encoding = NULL;

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar mime_info->content_languages = NULL;

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar mime_info->content_charset = "";

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar mime_info->description = "";

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar mime_info->is_pseudo_html = 0;

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar mime_info->level = 0.0f;

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar mime_info->level_matched = 0.0f;

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar mime_info->bytes = -1;

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar mime_info->lang_index = -1;

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar mime_info->mime_stars = 0;

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar mime_info->definite = 1;

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar mime_info->charset_quality = 1.0f;

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar mime_info->encoding_quality = 1.0f;

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar mime_info->lang_quality = 1.0f;

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar mime_info->mime_type_quality = 1.0f;

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar mime_info->source_quality = 0.0f;

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar}

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar

1f1b6bf13313fdd14a45e52e553d3ff28689b717coarstatic void set_mime_fields(var_rec *var, accept_rec *mime_info)

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar{

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar var->mime_type = mime_info->name;

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar var->source_quality = mime_info->quality;

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar var->level = mime_info->level;

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar var->content_charset = mime_info->charset;

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar var->is_pseudo_html = (!strcmp(var->mime_type, "text/html")

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar || !strcmp(var->mime_type, INCLUDES_MAGIC_TYPE)

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar || !strcmp(var->mime_type, INCLUDES_MAGIC_TYPE3));

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar}

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar

1f1b6bf13313fdd14a45e52e553d3ff28689b717coarstatic void set_vlist_validator(request_rec *r, request_rec *vlistr)

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar{

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar /* Calculating the variant list validator is similar to

aaed4ebc116f5862aff2610a809a9a9e9a28f50ecoar ap_update_mtime(vlistr, vlistr->finfo.mtime);

aaed4ebc116f5862aff2610a809a9a9e9a28f50ecoar r->vlist_validator = ap_make_etag(vlistr, 0);

aaed4ebc116f5862aff2610a809a9a9e9a28f50ecoar

aaed4ebc116f5862aff2610a809a9a9e9a28f50ecoar /* ap_set_etag will later take r->vlist_validator into account

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar}

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar

fe64b2ba25510d8c9dba5560a2d537763566cf40nd

fe64b2ba25510d8c9dba5560a2d537763566cf40nd

9e16224e92151e6c142e63ec8e3d06591c61352dndstatic const char *get_entry(apr_pool_t *p, accept_rec *result,

9e16224e92151e6c142e63ec8e3d06591c61352dnd const char *accept_line)

9e16224e92151e6c142e63ec8e3d06591c61352dnd{

9e16224e92151e6c142e63ec8e3d06591c61352dnd result->quality = 1.0f;

2aff288113d772cedca6add888eb643afffe9fb1nd result->level = 0.0f;

20f499565e77defe9dab24dd85c02f38a1175855nd result->charset = "";

17ade6df5ec233536985eb1c130a906c725dd614humbedooh

fe64b2ba25510d8c9dba5560a2d537763566cf40nd /*

a547340d7d0f0e79c9ba921c7dec7b18d0c800ffrbowen

a547340d7d0f0e79c9ba921c7dec7b18d0c800ffrbowen result->name = ap_get_token(p, &accept_line, 0);

a547340d7d0f0e79c9ba921c7dec7b18d0c800ffrbowen ap_str_tolower(result->name); /* You want case insensitive,

a547340d7d0f0e79c9ba921c7dec7b18d0c800ffrbowen

9a58dc6a2b26ec128b1270cf48810e705f1a90dbsf /* KLUDGE!!! Default HTML to level 2.0 unless the browser

a547340d7d0f0e79c9ba921c7dec7b18d0c800ffrbowen

a547340d7d0f0e79c9ba921c7dec7b18d0c800ffrbowen if (!strcmp(result->name, "text/html") && (result->level == 0.0)) {

9a58dc6a2b26ec128b1270cf48810e705f1a90dbsf result->level = 2.0f;

a547340d7d0f0e79c9ba921c7dec7b18d0c800ffrbowen }

b244bbf442a0aea3dc397b4d0d751f4716c5891dnd else if (!strcmp(result->name, INCLUDES_MAGIC_TYPE)) {

b244bbf442a0aea3dc397b4d0d751f4716c5891dnd result->level = 2.0f;

a547340d7d0f0e79c9ba921c7dec7b18d0c800ffrbowen }

a547340d7d0f0e79c9ba921c7dec7b18d0c800ffrbowen else if (!strcmp(result->name, INCLUDES_MAGIC_TYPE3)) {

a547340d7d0f0e79c9ba921c7dec7b18d0c800ffrbowen result->level = 3.0f;

4aa603e6448b99f9371397d439795c91a93637eand }

4aa603e6448b99f9371397d439795c91a93637eand

17ade6df5ec233536985eb1c130a906c725dd614humbedooh while (*accept_line == ';') {

a547340d7d0f0e79c9ba921c7dec7b18d0c800ffrbowen /* Parameters ... */

a547340d7d0f0e79c9ba921c7dec7b18d0c800ffrbowen

a547340d7d0f0e79c9ba921c7dec7b18d0c800ffrbowen char *parm;

a547340d7d0f0e79c9ba921c7dec7b18d0c800ffrbowen char *cp;

a547340d7d0f0e79c9ba921c7dec7b18d0c800ffrbowen char *end;

a547340d7d0f0e79c9ba921c7dec7b18d0c800ffrbowen

fe64b2ba25510d8c9dba5560a2d537763566cf40nd ++accept_line;

fe64b2ba25510d8c9dba5560a2d537763566cf40nd parm = ap_get_token(p, &accept_line, 1);

fe64b2ba25510d8c9dba5560a2d537763566cf40nd

fe64b2ba25510d8c9dba5560a2d537763566cf40nd /* Look for 'var = value' --- and make sure the var is in lcase. */

fe64b2ba25510d8c9dba5560a2d537763566cf40nd

9ec258b293b038250ec81887da01318ccc350690minfrin for (cp = parm; (*cp && !apr_isspace(*cp) && *cp != '='); ++cp) {

4fa837f85f8e371c2f495ac56fe5180fcece130eminfrin *cp = apr_tolower(*cp);

f3f945b6f394da4d080082fae12da22b4989914and }

fe64b2ba25510d8c9dba5560a2d537763566cf40nd

fe64b2ba25510d8c9dba5560a2d537763566cf40nd if (!*cp) {

06ba4a61654b3763ad65f52283832ebf058fdf1cslive continue; /* No '='; just ignore it. */

2aff288113d772cedca6add888eb643afffe9fb1nd }

2aff288113d772cedca6add888eb643afffe9fb1nd

06ba4a61654b3763ad65f52283832ebf058fdf1cslive *cp++ = '\0'; /* Delimit var */

20f499565e77defe9dab24dd85c02f38a1175855nd while (*cp && (apr_isspace(*cp) || *cp == '=')) {

e487d6c09669296f94a5190cc34586a98e624a00nd ++cp;

fe64b2ba25510d8c9dba5560a2d537763566cf40nd }

9ec258b293b038250ec81887da01318ccc350690minfrin

9ec258b293b038250ec81887da01318ccc350690minfrin if (*cp == '"') {

9ec258b293b038250ec81887da01318ccc350690minfrin ++cp;

9ec258b293b038250ec81887da01318ccc350690minfrin for (end = cp;

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar (*end && *end != '\n' && *end != '\r' && *end != '\"');

17ade6df5ec233536985eb1c130a906c725dd614humbedooh end++);

4aa603e6448b99f9371397d439795c91a93637eand }

e487d6c09669296f94a5190cc34586a98e624a00nd else {

9ec258b293b038250ec81887da01318ccc350690minfrin for (end = cp; (*end && !apr_isspace(*end)); end++);

9a58dc6a2b26ec128b1270cf48810e705f1a90dbsf }

dc4794add358378bce888ab64e20006c263f2651covener if (*end) {

b4f25203520c168e2df9f7d83024db09e68efe7ecovener *end = '\0'; /* strip ending quote or return */

dc4794add358378bce888ab64e20006c263f2651covener }

8d36abdf61277cb8ffcecc763c8a86c28f11f8e9covener ap_str_tolower(cp);

8d36abdf61277cb8ffcecc763c8a86c28f11f8e9covener

8d36abdf61277cb8ffcecc763c8a86c28f11f8e9covener if (parm[0] == 'q'

8d36abdf61277cb8ffcecc763c8a86c28f11f8e9covener && (parm[1] == '\0' || (parm[1] == 's' && parm[2] == '\0'))) {

8d36abdf61277cb8ffcecc763c8a86c28f11f8e9covener result->quality = (float)atof(cp);

fe64b2ba25510d8c9dba5560a2d537763566cf40nd }

fe64b2ba25510d8c9dba5560a2d537763566cf40nd else if (parm[0] == 'l' && !strcmp(&parm[1], "evel")) {

fe64b2ba25510d8c9dba5560a2d537763566cf40nd result->level = (float)atof(cp);

fe64b2ba25510d8c9dba5560a2d537763566cf40nd }

fe64b2ba25510d8c9dba5560a2d537763566cf40nd else if (!strcmp(parm, "charset")) {

fe64b2ba25510d8c9dba5560a2d537763566cf40nd result->charset = cp;

4fa837f85f8e371c2f495ac56fe5180fcece130eminfrin }

7859c11126b92a9ff7ca9ebf9ec0c7dee8ddb70fcovener }

f3f945b6f394da4d080082fae12da22b4989914and

fe64b2ba25510d8c9dba5560a2d537763566cf40nd if (*accept_line == ',') {

253547fb9cc7986e84ff68aef076f664fc4169dctakashi ++accept_line;

253547fb9cc7986e84ff68aef076f664fc4169dctakashi }

fe64b2ba25510d8c9dba5560a2d537763566cf40nd

06ba4a61654b3763ad65f52283832ebf058fdf1cslive return accept_line;

2aff288113d772cedca6add888eb643afffe9fb1nd}

9e16224e92151e6c142e63ec8e3d06591c61352dnd

9e16224e92151e6c142e63ec8e3d06591c61352dnd

9e16224e92151e6c142e63ec8e3d06591c61352dndstatic apr_array_header_t *do_header_line(apr_pool_t *p, const char *accept_line)

9e16224e92151e6c142e63ec8e3d06591c61352dnd{

9e16224e92151e6c142e63ec8e3d06591c61352dnd apr_array_header_t *accept_recs;

9e16224e92151e6c142e63ec8e3d06591c61352dnd

4fa837f85f8e371c2f495ac56fe5180fcece130eminfrin if (!accept_line) {

4fa837f85f8e371c2f495ac56fe5180fcece130eminfrin return NULL;

4fa837f85f8e371c2f495ac56fe5180fcece130eminfrin }

4fa837f85f8e371c2f495ac56fe5180fcece130eminfrin

06ba4a61654b3763ad65f52283832ebf058fdf1cslive accept_recs = apr_array_make(p, 40, sizeof(accept_rec));

5d01f40ffd657dd2ac567aacd93cabd162ddfa79coar

595ee65a4fefd1f5df0c6969a5ea88370751f9e4covener while (*accept_line) {

4fa837f85f8e371c2f495ac56fe5180fcece130eminfrin accept_rec *new = (accept_rec *) apr_array_push(accept_recs);

4aa603e6448b99f9371397d439795c91a93637eand accept_line = get_entry(p, new, accept_line);

1126fe9569c24b1ef2acb98df6b84d4d7d934c82minfrin }

1f1b6bf13313fdd14a45e52e553d3ff28689b717coar

17ade6df5ec233536985eb1c130a906c725dd614humbedooh return accept_recs;

17ade6df5ec233536985eb1c130a906c725dd614humbedooh}

17ade6df5ec233536985eb1c130a906c725dd614humbedooh

17ade6df5ec233536985eb1c130a906c725dd614humbedooh

17ade6df5ec233536985eb1c130a906c725dd614humbedoohstatic apr_array_header_t *do_languages_line(apr_pool_t *p, const char **lang_line)

17ade6df5ec233536985eb1c130a906c725dd614humbedooh{

595ee65a4fefd1f5df0c6969a5ea88370751f9e4covener apr_array_header_t *lang_recs = apr_array_make(p, 2, sizeof(char *));

17ade6df5ec233536985eb1c130a906c725dd614humbedooh

17ade6df5ec233536985eb1c130a906c725dd614humbedooh if (!lang_line) {

1126fe9569c24b1ef2acb98df6b84d4d7d934c82minfrin return lang_recs;

17ade6df5ec233536985eb1c130a906c725dd614humbedooh }

17ade6df5ec233536985eb1c130a906c725dd614humbedooh

595ee65a4fefd1f5df0c6969a5ea88370751f9e4covener while (**lang_line) {

4aa603e6448b99f9371397d439795c91a93637eand char **new = (char **) apr_array_push(lang_recs);

17ade6df5ec233536985eb1c130a906c725dd614humbedooh *new = ap_get_token(p, lang_line, 0);

89ebbccde2b87b469b9d6fdb606eeb943c12a824colm ap_str_tolower(*new);

9df39bf0053c6eaaa8d6d5afd87f26d9378bb20dminfrin if (**lang_line == ',' || **lang_line == ';') {

9df39bf0053c6eaaa8d6d5afd87f26d9378bb20dminfrin ++(*lang_line);

9df39bf0053c6eaaa8d6d5afd87f26d9378bb20dminfrin }

9df39bf0053c6eaaa8d6d5afd87f26d9378bb20dminfrin }

4aa603e6448b99f9371397d439795c91a93637eand

17ade6df5ec233536985eb1c130a906c725dd614humbedooh return lang_recs;

17ade6df5ec233536985eb1c130a906c725dd614humbedooh}

4aa603e6448b99f9371397d439795c91a93637eand

b4f25203520c168e2df9f7d83024db09e68efe7ecovener

89ebbccde2b87b469b9d6fdb606eeb943c12a824colmstatic negotiation_state *parse_accept_headers(request_rec *r)

8d36abdf61277cb8ffcecc763c8a86c28f11f8e9covener{

8d36abdf61277cb8ffcecc763c8a86c28f11f8e9covener negotiation_state *new =

8d36abdf61277cb8ffcecc763c8a86c28f11f8e9covener (negotiation_state *) apr_pcalloc(r->pool, sizeof(negotiation_state));

8d36abdf61277cb8ffcecc763c8a86c28f11f8e9covener accept_rec *elts;

8d36abdf61277cb8ffcecc763c8a86c28f11f8e9covener apr_table_t *hdrs = r->headers_in;

a547340d7d0f0e79c9ba921c7dec7b18d0c800ffrbowen int i;

a547340d7d0f0e79c9ba921c7dec7b18d0c800ffrbowen

a547340d7d0f0e79c9ba921c7dec7b18d0c800ffrbowen new->pool = r->pool;

a547340d7d0f0e79c9ba921c7dec7b18d0c800ffrbowen new->r = r;

a547340d7d0f0e79c9ba921c7dec7b18d0c800ffrbowen new->dir_name = ap_make_dirstr_parent(r->pool, r->filename);

a547340d7d0f0e79c9ba921c7dec7b18d0c800ffrbowen

a547340d7d0f0e79c9ba921c7dec7b18d0c800ffrbowen new->accepts = do_header_line(r->pool, apr_table_get(hdrs, "Accept"));

a547340d7d0f0e79c9ba921c7dec7b18d0c800ffrbowen

a547340d7d0f0e79c9ba921c7dec7b18d0c800ffrbowen /* calculate new->accept_q value */

a547340d7d0f0e79c9ba921c7dec7b18d0c800ffrbowen if (new->accepts) {

a547340d7d0f0e79c9ba921c7dec7b18d0c800ffrbowen elts = (accept_rec *) new->accepts->elts;

a547340d7d0f0e79c9ba921c7dec7b18d0c800ffrbowen

a547340d7d0f0e79c9ba921c7dec7b18d0c800ffrbowen for (i = 0; i < new->accepts->nelts; ++i) {

a547340d7d0f0e79c9ba921c7dec7b18d0c800ffrbowen if (elts[i].quality < 1.0) {

a547340d7d0f0e79c9ba921c7dec7b18d0c800ffrbowen new->accept_q = 1;

b244bbf442a0aea3dc397b4d0d751f4716c5891dnd }

b244bbf442a0aea3dc397b4d0d751f4716c5891dnd }

a547340d7d0f0e79c9ba921c7dec7b18d0c800ffrbowen }

a547340d7d0f0e79c9ba921c7dec7b18d0c800ffrbowen

a547340d7d0f0e79c9ba921c7dec7b18d0c800ffrbowen new->accept_encodings =

a547340d7d0f0e79c9ba921c7dec7b18d0c800ffrbowen do_header_line(r->pool, apr_table_get(hdrs, "Accept-Encoding"));

a547340d7d0f0e79c9ba921c7dec7b18d0c800ffrbowen new->accept_langs =

a547340d7d0f0e79c9ba921c7dec7b18d0c800ffrbowen do_header_line(r->pool, apr_table_get(hdrs, "Accept-Language"));

a547340d7d0f0e79c9ba921c7dec7b18d0c800ffrbowen new->accept_charsets =

a547340d7d0f0e79c9ba921c7dec7b18d0c800ffrbowen do_header_line(r->pool, apr_table_get(hdrs, "Accept-Charset"));

a547340d7d0f0e79c9ba921c7dec7b18d0c800ffrbowen

a547340d7d0f0e79c9ba921c7dec7b18d0c800ffrbowen /* This is possibly overkill for some servers, heck, we have

4aa603e6448b99f9371397d439795c91a93637eand new->avail_vars = apr_array_make(r->pool, 40, sizeof(var_rec));

17ade6df5ec233536985eb1c130a906c725dd614humbedooh

17ade6df5ec233536985eb1c130a906c725dd614humbedooh return new;

20f499565e77defe9dab24dd85c02f38a1175855nd}

a547340d7d0f0e79c9ba921c7dec7b18d0c800ffrbowen

a547340d7d0f0e79c9ba921c7dec7b18d0c800ffrbowen

a547340d7d0f0e79c9ba921c7dec7b18d0c800ffrbowenstatic void parse_negotiate_header(request_rec *r, negotiation_state *neg)

fe64b2ba25510d8c9dba5560a2d537763566cf40nd{

fe64b2ba25510d8c9dba5560a2d537763566cf40nd const char *negotiate = apr_table_get(r->headers_in, "Negotiate");

fe64b2ba25510d8c9dba5560a2d537763566cf40nd char *tok;

fe64b2ba25510d8c9dba5560a2d537763566cf40nd

cf2c758d9a7837808846a4bbf5611f268954c79dnd /* First, default to no TCN, no Alternates, and the original Apache

cf2c758d9a7837808846a4bbf5611f268954c79dnd neg->ua_supports_trans = 0;

589775a2f132eef1881f348ecdb969fb709d7ddbpctony neg->send_alternates = 0;

589775a2f132eef1881f348ecdb969fb709d7ddbpctony neg->may_choose = 1;

5d01f40ffd657dd2ac567aacd93cabd162ddfa79coar neg->use_rvsa = 0;

06ba4a61654b3763ad65f52283832ebf058fdf1cslive neg->dont_fiddle_headers = 0;

20f499565e77defe9dab24dd85c02f38a1175855nd

17ade6df5ec233536985eb1c130a906c725dd614humbedooh if (!negotiate)

fe64b2ba25510d8c9dba5560a2d537763566cf40nd return;

cf2c758d9a7837808846a4bbf5611f268954c79dnd

cf2c758d9a7837808846a4bbf5611f268954c79dnd if (strcmp(negotiate, "trans") == 0) {

cf2c758d9a7837808846a4bbf5611f268954c79dnd /* Lynx 2.7 and 2.8 send 'negotiate: trans' even though they

cf2c758d9a7837808846a4bbf5611f268954c79dnd const char *ua = apr_table_get(r->headers_in, "User-Agent");

cf2c758d9a7837808846a4bbf5611f268954c79dnd

f21bea4c0f58e17aa1d9a0fac2c219852f89944amaczniak if (ua && (strncmp(ua, "Lynx", 4) == 0))

f21bea4c0f58e17aa1d9a0fac2c219852f89944amaczniak return;

f21bea4c0f58e17aa1d9a0fac2c219852f89944amaczniak }

f21bea4c0f58e17aa1d9a0fac2c219852f89944amaczniak

f21bea4c0f58e17aa1d9a0fac2c219852f89944amaczniak neg->may_choose = 0; /* An empty Negotiate would require 300 response */

f21bea4c0f58e17aa1d9a0fac2c219852f89944amaczniak

f21bea4c0f58e17aa1d9a0fac2c219852f89944amaczniak while ((tok = ap_get_list_item(neg->pool, &negotiate)) != NULL) {

f21bea4c0f58e17aa1d9a0fac2c219852f89944amaczniak

f21bea4c0f58e17aa1d9a0fac2c219852f89944amaczniak if (strcmp(tok, "trans") == 0 ||

f3f945b6f394da4d080082fae12da22b4989914and strcmp(tok, "vlist") == 0 ||

f21bea4c0f58e17aa1d9a0fac2c219852f89944amaczniak strcmp(tok, "guess-small") == 0 ||

f21bea4c0f58e17aa1d9a0fac2c219852f89944amaczniak apr_isdigit(tok[0]) ||

f21bea4c0f58e17aa1d9a0fac2c219852f89944amaczniak strcmp(tok, "*") == 0) {

f21bea4c0f58e17aa1d9a0fac2c219852f89944amaczniak

f21bea4c0f58e17aa1d9a0fac2c219852f89944amaczniak /* The user agent supports transparent negotiation */

f21bea4c0f58e17aa1d9a0fac2c219852f89944amaczniak neg->ua_supports_trans = 1;

f21bea4c0f58e17aa1d9a0fac2c219852f89944amaczniak

f21bea4c0f58e17aa1d9a0fac2c219852f89944amaczniak /* Send-alternates could be configurable, but note

f21bea4c0f58e17aa1d9a0fac2c219852f89944amaczniak neg->send_alternates = 1;

f21bea4c0f58e17aa1d9a0fac2c219852f89944amaczniak

f21bea4c0f58e17aa1d9a0fac2c219852f89944amaczniak if (strcmp(tok, "1.0") == 0) {

f21bea4c0f58e17aa1d9a0fac2c219852f89944amaczniak /* we may use the RVSA/1.0 algorithm, configure for it */

f21bea4c0f58e17aa1d9a0fac2c219852f89944amaczniak neg->may_choose = 1;

f21bea4c0f58e17aa1d9a0fac2c219852f89944amaczniak neg->use_rvsa = 1;

f21bea4c0f58e17aa1d9a0fac2c219852f89944amaczniak neg->dont_fiddle_headers = 1;

f21bea4c0f58e17aa1d9a0fac2c219852f89944amaczniak }

f21bea4c0f58e17aa1d9a0fac2c219852f89944amaczniak else if (tok[0] == '*') {

f21bea4c0f58e17aa1d9a0fac2c219852f89944amaczniak /* we may use any variant selection algorithm, configure

f21bea4c0f58e17aa1d9a0fac2c219852f89944amaczniak neg->may_choose = 1;

f21bea4c0f58e17aa1d9a0fac2c219852f89944amaczniak

f21bea4c0f58e17aa1d9a0fac2c219852f89944amaczniak /* We disable header fiddles on the assumption that a

e487d6c09669296f94a5190cc34586a98e624a00nd neg->dont_fiddle_headers = 1;

17ade6df5ec233536985eb1c130a906c725dd614humbedooh }

20f499565e77defe9dab24dd85c02f38a1175855nd }

e487d6c09669296f94a5190cc34586a98e624a00nd }

f21bea4c0f58e17aa1d9a0fac2c219852f89944amaczniak

f21bea4c0f58e17aa1d9a0fac2c219852f89944amaczniak#ifdef NEG_DEBUG

f21bea4c0f58e17aa1d9a0fac2c219852f89944amaczniak ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,

f21bea4c0f58e17aa1d9a0fac2c219852f89944amaczniak "dont_fiddle_headers=%d use_rvsa=%d ua_supports_trans=%d "

f21bea4c0f58e17aa1d9a0fac2c219852f89944amaczniak "send_alternates=%d, may_choose=%d",

f21bea4c0f58e17aa1d9a0fac2c219852f89944amaczniak neg->dont_fiddle_headers, neg->use_rvsa,

f21bea4c0f58e17aa1d9a0fac2c219852f89944amaczniak neg->ua_supports_trans, neg->send_alternates, neg->may_choose);

f21bea4c0f58e17aa1d9a0fac2c219852f89944amaczniak#endif

fe64b2ba25510d8c9dba5560a2d537763566cf40nd

fe64b2ba25510d8c9dba5560a2d537763566cf40nd}

fe64b2ba25510d8c9dba5560a2d537763566cf40nd

f3f945b6f394da4d080082fae12da22b4989914andstatic void maybe_add_default_accepts(negotiation_state *neg,

fe64b2ba25510d8c9dba5560a2d537763566cf40nd int prefer_scripts)

fe64b2ba25510d8c9dba5560a2d537763566cf40nd{

9e16224e92151e6c142e63ec8e3d06591c61352dnd accept_rec *new_accept;

9e16224e92151e6c142e63ec8e3d06591c61352dnd

9e16224e92151e6c142e63ec8e3d06591c61352dnd if (!neg->accepts) {

9e16224e92151e6c142e63ec8e3d06591c61352dnd neg->accepts = apr_array_make(neg->pool, 4, sizeof(accept_rec));

9e16224e92151e6c142e63ec8e3d06591c61352dnd

9e16224e92151e6c142e63ec8e3d06591c61352dnd new_accept = (accept_rec *) apr_array_push(neg->accepts);

9e16224e92151e6c142e63ec8e3d06591c61352dnd

9e16224e92151e6c142e63ec8e3d06591c61352dnd new_accept->name = "*/*";

9e16224e92151e6c142e63ec8e3d06591c61352dnd new_accept->quality = 1.0f;

9e16224e92151e6c142e63ec8e3d06591c61352dnd new_accept->level = 0.0f;

06ba4a61654b3763ad65f52283832ebf058fdf1cslive }

20f499565e77defe9dab24dd85c02f38a1175855nd

17ade6df5ec233536985eb1c130a906c725dd614humbedooh new_accept = (accept_rec *) apr_array_push(neg->accepts);

fe64b2ba25510d8c9dba5560a2d537763566cf40nd

90c99eca06310d91254dd3525e1f5e9fa612af71jim new_accept->name = CGI_MAGIC_TYPE;

90c99eca06310d91254dd3525e1f5e9fa612af71jim if (neg->use_rvsa) {

90c99eca06310d91254dd3525e1f5e9fa612af71jim new_accept->quality = 0;

90c99eca06310d91254dd3525e1f5e9fa612af71jim }

90c99eca06310d91254dd3525e1f5e9fa612af71jim else {

90c99eca06310d91254dd3525e1f5e9fa612af71jim new_accept->quality = prefer_scripts ? 2.0f : 0.001f;

90c99eca06310d91254dd3525e1f5e9fa612af71jim }

90c99eca06310d91254dd3525e1f5e9fa612af71jim new_accept->level = 0.0f;

90c99eca06310d91254dd3525e1f5e9fa612af71jim}

90c99eca06310d91254dd3525e1f5e9fa612af71jim

9a58dc6a2b26ec128b1270cf48810e705f1a90dbsf

90c99eca06310d91254dd3525e1f5e9fa612af71jim

20f499565e77defe9dab24dd85c02f38a1175855ndenum header_state {

17ade6df5ec233536985eb1c130a906c725dd614humbedooh header_eof, header_seen, header_sep

90c99eca06310d91254dd3525e1f5e9fa612af71jim};

90c99eca06310d91254dd3525e1f5e9fa612af71jim

282b62d8e9a4edbc2da22ba2d876ec94afc48084ndstatic enum header_state get_header_line(char *buffer, int len, apr_file_t *map)

282b62d8e9a4edbc2da22ba2d876ec94afc48084nd{

282b62d8e9a4edbc2da22ba2d876ec94afc48084nd char *buf_end = buffer + len;

282b62d8e9a4edbc2da22ba2d876ec94afc48084nd char *cp;

282b62d8e9a4edbc2da22ba2d876ec94afc48084nd char c;

282b62d8e9a4edbc2da22ba2d876ec94afc48084nd

282b62d8e9a4edbc2da22ba2d876ec94afc48084nd /* Get a noncommented line */

282b62d8e9a4edbc2da22ba2d876ec94afc48084nd

282b62d8e9a4edbc2da22ba2d876ec94afc48084nd do {

282b62d8e9a4edbc2da22ba2d876ec94afc48084nd if (apr_file_gets(buffer, MAX_STRING_LEN, map) != APR_SUCCESS) {

282b62d8e9a4edbc2da22ba2d876ec94afc48084nd return header_eof;

282b62d8e9a4edbc2da22ba2d876ec94afc48084nd }

282b62d8e9a4edbc2da22ba2d876ec94afc48084nd } while (buffer[0] == '#');

282b62d8e9a4edbc2da22ba2d876ec94afc48084nd

282b62d8e9a4edbc2da22ba2d876ec94afc48084nd /* If blank, just return it --- this ends information on this variant */

282b62d8e9a4edbc2da22ba2d876ec94afc48084nd

282b62d8e9a4edbc2da22ba2d876ec94afc48084nd for (cp = buffer; (*cp && apr_isspace(*cp)); ++cp) {

282b62d8e9a4edbc2da22ba2d876ec94afc48084nd continue;

282b62d8e9a4edbc2da22ba2d876ec94afc48084nd }

282b62d8e9a4edbc2da22ba2d876ec94afc48084nd

282b62d8e9a4edbc2da22ba2d876ec94afc48084nd if (*cp == '\0') {

282b62d8e9a4edbc2da22ba2d876ec94afc48084nd return header_sep;

282b62d8e9a4edbc2da22ba2d876ec94afc48084nd }

282b62d8e9a4edbc2da22ba2d876ec94afc48084nd

282b62d8e9a4edbc2da22ba2d876ec94afc48084nd /* If non-blank, go looking for header lines, but note that we still

282b62d8e9a4edbc2da22ba2d876ec94afc48084nd

20f499565e77defe9dab24dd85c02f38a1175855nd cp += strlen(cp);

e487d6c09669296f94a5190cc34586a98e624a00nd

17ade6df5ec233536985eb1c130a906c725dd614humbedooh /* We need to shortcut the rest of this block following the Body:

282b62d8e9a4edbc2da22ba2d876ec94afc48084nd if (!strncasecmp(buffer, "Body:", 5))

282b62d8e9a4edbc2da22ba2d876ec94afc48084nd return header_seen;

3dd3d010c0efae7d1d6926f0b1de2da17eec796eminfrin

3dd3d010c0efae7d1d6926f0b1de2da17eec796eminfrin while (apr_file_getc(&c, map) != APR_EOF) {

3dd3d010c0efae7d1d6926f0b1de2da17eec796eminfrin if (c == '#') {

3dd3d010c0efae7d1d6926f0b1de2da17eec796eminfrin /* Comment line */

3dd3d010c0efae7d1d6926f0b1de2da17eec796eminfrin while (apr_file_getc(&c, map) != APR_EOF && c != '\n') {

3dd3d010c0efae7d1d6926f0b1de2da17eec796eminfrin continue;

3dd3d010c0efae7d1d6926f0b1de2da17eec796eminfrin }

3dd3d010c0efae7d1d6926f0b1de2da17eec796eminfrin }

3dd3d010c0efae7d1d6926f0b1de2da17eec796eminfrin else if (apr_isspace(c)) {

3dd3d010c0efae7d1d6926f0b1de2da17eec796eminfrin /* Leading whitespace. POSSIBLE continuation line

3dd3d010c0efae7d1d6926f0b1de2da17eec796eminfrin

3dd3d010c0efae7d1d6926f0b1de2da17eec796eminfrin while (c != '\n' && apr_isspace(c)) {

3dd3d010c0efae7d1d6926f0b1de2da17eec796eminfrin if(apr_file_getc(&c, map) != APR_SUCCESS)

3dd3d010c0efae7d1d6926f0b1de2da17eec796eminfrin break;

3dd3d010c0efae7d1d6926f0b1de2da17eec796eminfrin }

3dd3d010c0efae7d1d6926f0b1de2da17eec796eminfrin

3dd3d010c0efae7d1d6926f0b1de2da17eec796eminfrin apr_file_ungetc(c, map);

4aa603e6448b99f9371397d439795c91a93637eand

4aa603e6448b99f9371397d439795c91a93637eand if (c == '\n') {

17ade6df5ec233536985eb1c130a906c725dd614humbedooh return header_seen; /* Blank line */

3dd3d010c0efae7d1d6926f0b1de2da17eec796eminfrin }

3dd3d010c0efae7d1d6926f0b1de2da17eec796eminfrin

3dd3d010c0efae7d1d6926f0b1de2da17eec796eminfrin /* Continuation */

3dd3d010c0efae7d1d6926f0b1de2da17eec796eminfrin

3dd3d010c0efae7d1d6926f0b1de2da17eec796eminfrin while (cp < buf_end - 2 && (apr_file_getc(&c, map)) != APR_EOF && c != '\n') {

3dd3d010c0efae7d1d6926f0b1de2da17eec796eminfrin *cp++ = c;

fe64b2ba25510d8c9dba5560a2d537763566cf40nd }

fe64b2ba25510d8c9dba5560a2d537763566cf40nd

fe64b2ba25510d8c9dba5560a2d537763566cf40nd *cp++ = '\n';

fe64b2ba25510d8c9dba5560a2d537763566cf40nd *cp = '\0';

fe64b2ba25510d8c9dba5560a2d537763566cf40nd }

fe64b2ba25510d8c9dba5560a2d537763566cf40nd else {

fe64b2ba25510d8c9dba5560a2d537763566cf40nd

fe64b2ba25510d8c9dba5560a2d537763566cf40nd /* Line beginning with something other than whitespace */

26ec660d801fc7f7dd96146cea051df0a9b4193eminfrin

f3f945b6f394da4d080082fae12da22b4989914and apr_file_ungetc(c, map);

fe64b2ba25510d8c9dba5560a2d537763566cf40nd return header_seen;

fe64b2ba25510d8c9dba5560a2d537763566cf40nd }

9e16224e92151e6c142e63ec8e3d06591c61352dnd }

9e16224e92151e6c142e63ec8e3d06591c61352dnd

9e16224e92151e6c142e63ec8e3d06591c61352dnd return header_seen;

9e16224e92151e6c142e63ec8e3d06591c61352dnd}

9e16224e92151e6c142e63ec8e3d06591c61352dnd

9e16224e92151e6c142e63ec8e3d06591c61352dndstatic apr_off_t get_body(char *buffer, apr_size_t *len, const char *tag,

9e16224e92151e6c142e63ec8e3d06591c61352dnd apr_file_t *map)

9e16224e92151e6c142e63ec8e3d06591c61352dnd{

9e16224e92151e6c142e63ec8e3d06591c61352dnd char *endbody;

9e16224e92151e6c142e63ec8e3d06591c61352dnd int bodylen;

9e16224e92151e6c142e63ec8e3d06591c61352dnd apr_off_t pos;

9e16224e92151e6c142e63ec8e3d06591c61352dnd

9e16224e92151e6c142e63ec8e3d06591c61352dnd /* We are at the first character following a body:tag\n entry

9e16224e92151e6c142e63ec8e3d06591c61352dnd if (apr_file_read(map, buffer, len) != APR_SUCCESS) {

06ba4a61654b3763ad65f52283832ebf058fdf1cslive return -1;

20f499565e77defe9dab24dd85c02f38a1175855nd }

17ade6df5ec233536985eb1c130a906c725dd614humbedooh endbody = strstr(buffer, tag);

fe64b2ba25510d8c9dba5560a2d537763566cf40nd if (!endbody) {

c1fcddc76fd5db5ac4ccd7c6ae839d53d128f354minfrin return -1;

c1fcddc76fd5db5ac4ccd7c6ae839d53d128f354minfrin }

c1fcddc76fd5db5ac4ccd7c6ae839d53d128f354minfrin bodylen = endbody - buffer;

c1fcddc76fd5db5ac4ccd7c6ae839d53d128f354minfrin endbody += strlen(tag);

c1fcddc76fd5db5ac4ccd7c6ae839d53d128f354minfrin /* Skip all the trailing cruft after the end tag to the next line */

c1fcddc76fd5db5ac4ccd7c6ae839d53d128f354minfrin while (*endbody) {

c1fcddc76fd5db5ac4ccd7c6ae839d53d128f354minfrin if (*endbody == '\n') {

c1fcddc76fd5db5ac4ccd7c6ae839d53d128f354minfrin ++endbody;

c1fcddc76fd5db5ac4ccd7c6ae839d53d128f354minfrin break;

c1fcddc76fd5db5ac4ccd7c6ae839d53d128f354minfrin }

c1fcddc76fd5db5ac4ccd7c6ae839d53d128f354minfrin ++endbody;

c1fcddc76fd5db5ac4ccd7c6ae839d53d128f354minfrin }

c1fcddc76fd5db5ac4ccd7c6ae839d53d128f354minfrin

9a58dc6a2b26ec128b1270cf48810e705f1a90dbsf pos = -(apr_off_t)(*len - (endbody - buffer));

c1fcddc76fd5db5ac4ccd7c6ae839d53d128f354minfrin if (apr_file_seek(map, APR_CUR, &pos) != APR_SUCCESS) {

17f88acd0b3fba7eddb6fd974927edf8f5dbe41dsf return -1;

c1fcddc76fd5db5ac4ccd7c6ae839d53d128f354minfrin }

4aa603e6448b99f9371397d439795c91a93637eand

4aa603e6448b99f9371397d439795c91a93637eand /* Give the caller back the actual body's offset and length */

17ade6df5ec233536985eb1c130a906c725dd614humbedooh *len = bodylen;

c1fcddc76fd5db5ac4ccd7c6ae839d53d128f354minfrin return pos - (endbody - buffer);

17f88acd0b3fba7eddb6fd974927edf8f5dbe41dsf}

17f88acd0b3fba7eddb6fd974927edf8f5dbe41dsf

c1fcddc76fd5db5ac4ccd7c6ae839d53d128f354minfrin

c1fcddc76fd5db5ac4ccd7c6ae839d53d128f354minfrin

c1fcddc76fd5db5ac4ccd7c6ae839d53d128f354minfrinstatic void strip_paren_comments(char *hdr)

c1fcddc76fd5db5ac4ccd7c6ae839d53d128f354minfrin{

c1fcddc76fd5db5ac4ccd7c6ae839d53d128f354minfrin /* Hmmm... is this correct? In Roy's latest draft, (comments) can nest! */

c1fcddc76fd5db5ac4ccd7c6ae839d53d128f354minfrin /* Nope, it isn't correct. Fails to handle backslash escape as well. */

c1fcddc76fd5db5ac4ccd7c6ae839d53d128f354minfrin

c1fcddc76fd5db5ac4ccd7c6ae839d53d128f354minfrin while (*hdr) {

c1fcddc76fd5db5ac4ccd7c6ae839d53d128f354minfrin if (*hdr == '"') {

c1fcddc76fd5db5ac4ccd7c6ae839d53d128f354minfrin hdr = strchr(hdr, '"');

c1fcddc76fd5db5ac4ccd7c6ae839d53d128f354minfrin if (hdr == NULL) {

c1fcddc76fd5db5ac4ccd7c6ae839d53d128f354minfrin return;

c1fcddc76fd5db5ac4ccd7c6ae839d53d128f354minfrin }

9a58dc6a2b26ec128b1270cf48810e705f1a90dbsf ++hdr;

c1fcddc76fd5db5ac4ccd7c6ae839d53d128f354minfrin }

c1fcddc76fd5db5ac4ccd7c6ae839d53d128f354minfrin else if (*hdr == '(') {

c1fcddc76fd5db5ac4ccd7c6ae839d53d128f354minfrin while (*hdr && *hdr != ')') {

c1fcddc76fd5db5ac4ccd7c6ae839d53d128f354minfrin *hdr++ = ' ';

9a58dc6a2b26ec128b1270cf48810e705f1a90dbsf }

c1fcddc76fd5db5ac4ccd7c6ae839d53d128f354minfrin

c1fcddc76fd5db5ac4ccd7c6ae839d53d128f354minfrin if (*hdr) {

c1fcddc76fd5db5ac4ccd7c6ae839d53d128f354minfrin *hdr++ = ' ';

c1fcddc76fd5db5ac4ccd7c6ae839d53d128f354minfrin }

c1fcddc76fd5db5ac4ccd7c6ae839d53d128f354minfrin }

c1fcddc76fd5db5ac4ccd7c6ae839d53d128f354minfrin else {

c1fcddc76fd5db5ac4ccd7c6ae839d53d128f354minfrin ++hdr;

17f88acd0b3fba7eddb6fd974927edf8f5dbe41dsf }

c1fcddc76fd5db5ac4ccd7c6ae839d53d128f354minfrin }

c1fcddc76fd5db5ac4ccd7c6ae839d53d128f354minfrin}

c1fcddc76fd5db5ac4ccd7c6ae839d53d128f354minfrin

c1fcddc76fd5db5ac4ccd7c6ae839d53d128f354minfrin

17f88acd0b3fba7eddb6fd974927edf8f5dbe41dsfstatic char *lcase_header_name_return_body(char *header, request_rec *r)

5d01f40ffd657dd2ac567aacd93cabd162ddfa79coar{

17f88acd0b3fba7eddb6fd974927edf8f5dbe41dsf char *cp = header;

c1fcddc76fd5db5ac4ccd7c6ae839d53d128f354minfrin

fe64b2ba25510d8c9dba5560a2d537763566cf40nd for ( ; *cp && *cp != ':' ; ++cp) {

fe64b2ba25510d8c9dba5560a2d537763566cf40nd *cp = apr_tolower(*cp);

fe64b2ba25510d8c9dba5560a2d537763566cf40nd }

fe64b2ba25510d8c9dba5560a2d537763566cf40nd

fe64b2ba25510d8c9dba5560a2d537763566cf40nd if (!*cp) {

fe64b2ba25510d8c9dba5560a2d537763566cf40nd ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,

fe64b2ba25510d8c9dba5560a2d537763566cf40nd "Syntax error in type map, no ':' in %s for header %s",

26ec660d801fc7f7dd96146cea051df0a9b4193eminfrin r->filename, header);

f3f945b6f394da4d080082fae12da22b4989914and return NULL;

fe64b2ba25510d8c9dba5560a2d537763566cf40nd }

fe64b2ba25510d8c9dba5560a2d537763566cf40nd

9e16224e92151e6c142e63ec8e3d06591c61352dnd do {

9e16224e92151e6c142e63ec8e3d06591c61352dnd ++cp;

9e16224e92151e6c142e63ec8e3d06591c61352dnd } while (*cp && apr_isspace(*cp));

9e16224e92151e6c142e63ec8e3d06591c61352dnd

2aff288113d772cedca6add888eb643afffe9fb1nd if (!*cp) {

20f499565e77defe9dab24dd85c02f38a1175855nd ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,

17ade6df5ec233536985eb1c130a906c725dd614humbedooh "Syntax error in type map --- no header body: %s for %s",

fe64b2ba25510d8c9dba5560a2d537763566cf40nd r->filename, header);

7ec4d5cc4aa574e3191bc5a612e68fd8f25ab7earpluem return NULL;

7ec4d5cc4aa574e3191bc5a612e68fd8f25ab7earpluem }

7ec4d5cc4aa574e3191bc5a612e68fd8f25ab7earpluem

7ec4d5cc4aa574e3191bc5a612e68fd8f25ab7earpluem return cp;

7ec4d5cc4aa574e3191bc5a612e68fd8f25ab7earpluem}

7ec4d5cc4aa574e3191bc5a612e68fd8f25ab7earpluem

7ec4d5cc4aa574e3191bc5a612e68fd8f25ab7earpluemstatic int read_type_map(apr_file_t **map, negotiation_state *neg, request_rec *rr)

26ec660d801fc7f7dd96146cea051df0a9b4193eminfrin{

7ec4d5cc4aa574e3191bc5a612e68fd8f25ab7earpluem request_rec *r = neg->r;

7ec4d5cc4aa574e3191bc5a612e68fd8f25ab7earpluem apr_file_t *map_ = NULL;

7ec4d5cc4aa574e3191bc5a612e68fd8f25ab7earpluem apr_status_t status;

7ec4d5cc4aa574e3191bc5a612e68fd8f25ab7earpluem char buffer[MAX_STRING_LEN];

7ec4d5cc4aa574e3191bc5a612e68fd8f25ab7earpluem enum header_state hstate;

7ec4d5cc4aa574e3191bc5a612e68fd8f25ab7earpluem struct var_rec mime_info;

7ec4d5cc4aa574e3191bc5a612e68fd8f25ab7earpluem int has_content;

7ec4d5cc4aa574e3191bc5a612e68fd8f25ab7earpluem

20f499565e77defe9dab24dd85c02f38a1175855nd if (!map)

17ade6df5ec233536985eb1c130a906c725dd614humbedooh map = &map_;

7ec4d5cc4aa574e3191bc5a612e68fd8f25ab7earpluem

cf663b70eeea0b51582be629e148a697aa2a116eminfrin /* We are not using multiviews */

cf663b70eeea0b51582be629e148a697aa2a116eminfrin neg->count_multiviews_variants = 0;

cf663b70eeea0b51582be629e148a697aa2a116eminfrin

cf663b70eeea0b51582be629e148a697aa2a116eminfrin if ((status = apr_file_open(map, rr->filename, APR_READ | APR_BUFFERED,

cf663b70eeea0b51582be629e148a697aa2a116eminfrin APR_OS_DEFAULT, neg->pool)) != APR_SUCCESS) {

cf663b70eeea0b51582be629e148a697aa2a116eminfrin ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r,

cf663b70eeea0b51582be629e148a697aa2a116eminfrin "cannot access type map file: %s", rr->filename);

cf663b70eeea0b51582be629e148a697aa2a116eminfrin return HTTP_FORBIDDEN;

cf663b70eeea0b51582be629e148a697aa2a116eminfrin }

cf663b70eeea0b51582be629e148a697aa2a116eminfrin

0e7b9978df6fac23db4330b09e890cf6de6ff7b6covener clean_var_rec(&mime_info);

cf663b70eeea0b51582be629e148a697aa2a116eminfrin has_content = 0;

cf663b70eeea0b51582be629e148a697aa2a116eminfrin

cf663b70eeea0b51582be629e148a697aa2a116eminfrin do {

cf663b70eeea0b51582be629e148a697aa2a116eminfrin hstate = get_header_line(buffer, MAX_STRING_LEN, *map);

cf663b70eeea0b51582be629e148a697aa2a116eminfrin

cf663b70eeea0b51582be629e148a697aa2a116eminfrin if (hstate == header_seen) {

cf663b70eeea0b51582be629e148a697aa2a116eminfrin char *body1 = lcase_header_name_return_body(buffer, neg->r);

cf663b70eeea0b51582be629e148a697aa2a116eminfrin const char *body;

cf663b70eeea0b51582be629e148a697aa2a116eminfrin

cf663b70eeea0b51582be629e148a697aa2a116eminfrin if (body1 == NULL) {

cf663b70eeea0b51582be629e148a697aa2a116eminfrin return HTTP_INTERNAL_SERVER_ERROR;

cf663b70eeea0b51582be629e148a697aa2a116eminfrin }

cf663b70eeea0b51582be629e148a697aa2a116eminfrin

51e213aed94e1ca678a7551c8a215b8caed301e7jim strip_paren_comments(body1);

cf663b70eeea0b51582be629e148a697aa2a116eminfrin body = body1;

4aa603e6448b99f9371397d439795c91a93637eand

4aa603e6448b99f9371397d439795c91a93637eand if (!strncmp(buffer, "uri:", 4)) {

17ade6df5ec233536985eb1c130a906c725dd614humbedooh mime_info.file_name = ap_get_token(neg->pool, &body, 0);

cf663b70eeea0b51582be629e148a697aa2a116eminfrin }

cf663b70eeea0b51582be629e148a697aa2a116eminfrin else if (!strncmp(buffer, "content-type:", 13)) {

cf663b70eeea0b51582be629e148a697aa2a116eminfrin struct accept_rec accept_info;

cf663b70eeea0b51582be629e148a697aa2a116eminfrin

cf663b70eeea0b51582be629e148a697aa2a116eminfrin get_entry(neg->pool, &accept_info, body);

cf663b70eeea0b51582be629e148a697aa2a116eminfrin set_mime_fields(&mime_info, &accept_info);

4aa603e6448b99f9371397d439795c91a93637eand has_content = 1;

17ade6df5ec233536985eb1c130a906c725dd614humbedooh }

4aa603e6448b99f9371397d439795c91a93637eand else if (!strncmp(buffer, "content-length:", 15)) {

17ade6df5ec233536985eb1c130a906c725dd614humbedooh mime_info.bytes = atol(body);

cf663b70eeea0b51582be629e148a697aa2a116eminfrin has_content = 1;

cf663b70eeea0b51582be629e148a697aa2a116eminfrin }

cf663b70eeea0b51582be629e148a697aa2a116eminfrin else if (!strncmp(buffer, "content-language:", 17)) {

cf663b70eeea0b51582be629e148a697aa2a116eminfrin mime_info.content_languages = do_languages_line(neg->pool,

cf663b70eeea0b51582be629e148a697aa2a116eminfrin &body);

e80f65dadea03d04ee5b9e2d3de8c5fcef9e6714minfrin has_content = 1;

e80f65dadea03d04ee5b9e2d3de8c5fcef9e6714minfrin }

e80f65dadea03d04ee5b9e2d3de8c5fcef9e6714minfrin else if (!strncmp(buffer, "content-encoding:", 17)) {

e80f65dadea03d04ee5b9e2d3de8c5fcef9e6714minfrin mime_info.content_encoding = ap_get_token(neg->pool, &body, 0);

e80f65dadea03d04ee5b9e2d3de8c5fcef9e6714minfrin has_content = 1;

e80f65dadea03d04ee5b9e2d3de8c5fcef9e6714minfrin }

e80f65dadea03d04ee5b9e2d3de8c5fcef9e6714minfrin else if (!strncmp(buffer, "description:", 12)) {

e80f65dadea03d04ee5b9e2d3de8c5fcef9e6714minfrin char *desc = apr_pstrdup(neg->pool, body);

e80f65dadea03d04ee5b9e2d3de8c5fcef9e6714minfrin char *cp;

e80f65dadea03d04ee5b9e2d3de8c5fcef9e6714minfrin

e80f65dadea03d04ee5b9e2d3de8c5fcef9e6714minfrin for (cp = desc; *cp; ++cp) {

e80f65dadea03d04ee5b9e2d3de8c5fcef9e6714minfrin if (*cp=='\n') *cp=' ';

e80f65dadea03d04ee5b9e2d3de8c5fcef9e6714minfrin }

e80f65dadea03d04ee5b9e2d3de8c5fcef9e6714minfrin if (cp>desc) *(cp-1)=0;

4a31db3c3a0202003c1b9f87affa7cc143e120e5sf mime_info.description = desc;

4a31db3c3a0202003c1b9f87affa7cc143e120e5sf }

4a31db3c3a0202003c1b9f87affa7cc143e120e5sf else if (!strncmp(buffer, "body:", 5)) {

4a31db3c3a0202003c1b9f87affa7cc143e120e5sf char *tag = apr_pstrdup(neg->pool, body);

e80f65dadea03d04ee5b9e2d3de8c5fcef9e6714minfrin char *eol = strchr(tag, '\0');

4aa603e6448b99f9371397d439795c91a93637eand apr_size_t len = MAX_STRING_LEN;

4aa603e6448b99f9371397d439795c91a93637eand while (--eol >= tag && apr_isspace(*eol))

17ade6df5ec233536985eb1c130a906c725dd614humbedooh *eol = '\0';

e80f65dadea03d04ee5b9e2d3de8c5fcef9e6714minfrin if ((mime_info.body = get_body(buffer, &len, tag, *map)) < 0) {

e80f65dadea03d04ee5b9e2d3de8c5fcef9e6714minfrin ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,

8305f030deafc6022193cff1cb11b6f69a2d4f3arbowen "Syntax error in type map, no end tag '%s'"

8305f030deafc6022193cff1cb11b6f69a2d4f3arbowen "found in %s for Body: content.",

8305f030deafc6022193cff1cb11b6f69a2d4f3arbowen tag, r->filename);

8305f030deafc6022193cff1cb11b6f69a2d4f3arbowen break;

8305f030deafc6022193cff1cb11b6f69a2d4f3arbowen }

8305f030deafc6022193cff1cb11b6f69a2d4f3arbowen mime_info.bytes = len;

8305f030deafc6022193cff1cb11b6f69a2d4f3arbowen mime_info.file_name = rr->filename;

26ec660d801fc7f7dd96146cea051df0a9b4193eminfrin }

8305f030deafc6022193cff1cb11b6f69a2d4f3arbowen }

8305f030deafc6022193cff1cb11b6f69a2d4f3arbowen else {

8305f030deafc6022193cff1cb11b6f69a2d4f3arbowen if (*mime_info.file_name && has_content) {

a04dcd330b05345681a4057702b2d43b2042e21dtrawick void *new_var = apr_array_push(neg->avail_vars);

8305f030deafc6022193cff1cb11b6f69a2d4f3arbowen

8305f030deafc6022193cff1cb11b6f69a2d4f3arbowen memcpy(new_var, (void *) &mime_info, sizeof(var_rec));

8305f030deafc6022193cff1cb11b6f69a2d4f3arbowen }

8305f030deafc6022193cff1cb11b6f69a2d4f3arbowen

8305f030deafc6022193cff1cb11b6f69a2d4f3arbowen clean_var_rec(&mime_info);

8305f030deafc6022193cff1cb11b6f69a2d4f3arbowen has_content = 0;

8305f030deafc6022193cff1cb11b6f69a2d4f3arbowen }

8305f030deafc6022193cff1cb11b6f69a2d4f3arbowen } while (hstate != header_eof);

20f499565e77defe9dab24dd85c02f38a1175855nd

17ade6df5ec233536985eb1c130a906c725dd614humbedooh if (map_)

8305f030deafc6022193cff1cb11b6f69a2d4f3arbowen apr_file_close(map_);

cf2c758d9a7837808846a4bbf5611f268954c79dnd

cf2c758d9a7837808846a4bbf5611f268954c79dnd set_vlist_validator(r, rr);

cf2c758d9a7837808846a4bbf5611f268954c79dnd

cf2c758d9a7837808846a4bbf5611f268954c79dnd return OK;

cf2c758d9a7837808846a4bbf5611f268954c79dnd}

cf2c758d9a7837808846a4bbf5611f268954c79dnd

cf2c758d9a7837808846a4bbf5611f268954c79dnd

cf2c758d9a7837808846a4bbf5611f268954c79dndstatic int variantsortf(var_rec *a, var_rec *b) {

cf2c758d9a7837808846a4bbf5611f268954c79dnd

cf2c758d9a7837808846a4bbf5611f268954c79dnd /* First key is the source quality, sort in descending order. */

cf2c758d9a7837808846a4bbf5611f268954c79dnd

cf2c758d9a7837808846a4bbf5611f268954c79dnd /* XXX: note that we currently implement no method of setting the

51e213aed94e1ca678a7551c8a215b8caed301e7jim if (a->source_quality < b->source_quality)

cf2c758d9a7837808846a4bbf5611f268954c79dnd return 1;

20f499565e77defe9dab24dd85c02f38a1175855nd if (a->source_quality > b->source_quality)

17ade6df5ec233536985eb1c130a906c725dd614humbedooh return -1;

cf2c758d9a7837808846a4bbf5611f268954c79dnd

cf2c758d9a7837808846a4bbf5611f268954c79dnd /* Second key is the variant name */

cf2c758d9a7837808846a4bbf5611f268954c79dnd return strcmp(a->file_name, b->file_name);

cf2c758d9a7837808846a4bbf5611f268954c79dnd}

cf2c758d9a7837808846a4bbf5611f268954c79dnd

cf2c758d9a7837808846a4bbf5611f268954c79dnd

cf2c758d9a7837808846a4bbf5611f268954c79dndstatic int read_types_multi(negotiation_state *neg)

cf2c758d9a7837808846a4bbf5611f268954c79dnd{

cf2c758d9a7837808846a4bbf5611f268954c79dnd request_rec *r = neg->r;

cf2c758d9a7837808846a4bbf5611f268954c79dnd

cf2c758d9a7837808846a4bbf5611f268954c79dnd char *filp;

cf2c758d9a7837808846a4bbf5611f268954c79dnd int prefix_len;

cf2c758d9a7837808846a4bbf5611f268954c79dnd apr_dir_t *dirp;

cf2c758d9a7837808846a4bbf5611f268954c79dnd apr_finfo_t dirent;

cf2c758d9a7837808846a4bbf5611f268954c79dnd apr_status_t status;

26ec660d801fc7f7dd96146cea051df0a9b4193eminfrin struct var_rec mime_info;

cf2c758d9a7837808846a4bbf5611f268954c79dnd struct accept_rec accept_info;

cf2c758d9a7837808846a4bbf5611f268954c79dnd void *new_var;

cf2c758d9a7837808846a4bbf5611f268954c79dnd int anymatch = 0;

cf2c758d9a7837808846a4bbf5611f268954c79dnd

cf2c758d9a7837808846a4bbf5611f268954c79dnd clean_var_rec(&mime_info);

cf2c758d9a7837808846a4bbf5611f268954c79dnd

cf2c758d9a7837808846a4bbf5611f268954c79dnd if (!(filp = strrchr(r->filename, '/'))) {

cf2c758d9a7837808846a4bbf5611f268954c79dnd return DECLINED; /* Weird... */

51e213aed94e1ca678a7551c8a215b8caed301e7jim }

cf2c758d9a7837808846a4bbf5611f268954c79dnd

20f499565e77defe9dab24dd85c02f38a1175855nd /* XXX this should be more general, and quit using 'specials' */

17ade6df5ec233536985eb1c130a906c725dd614humbedooh if (strncmp(r->filename, "proxy:", 6) == 0) {

cf2c758d9a7837808846a4bbf5611f268954c79dnd return DECLINED;

cf2c758d9a7837808846a4bbf5611f268954c79dnd }

cf2c758d9a7837808846a4bbf5611f268954c79dnd

cf2c758d9a7837808846a4bbf5611f268954c79dnd ++filp;

cf2c758d9a7837808846a4bbf5611f268954c79dnd prefix_len = strlen(filp);

cf2c758d9a7837808846a4bbf5611f268954c79dnd

cf2c758d9a7837808846a4bbf5611f268954c79dnd if ((status = apr_dir_open(&dirp, neg->dir_name, neg->pool)) != APR_SUCCESS) {

cf2c758d9a7837808846a4bbf5611f268954c79dnd ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r,

cf2c758d9a7837808846a4bbf5611f268954c79dnd "cannot read directory for multi: %s", neg->dir_name);

cf2c758d9a7837808846a4bbf5611f268954c79dnd return HTTP_FORBIDDEN;

cf2c758d9a7837808846a4bbf5611f268954c79dnd }

cf2c758d9a7837808846a4bbf5611f268954c79dnd

fe64b2ba25510d8c9dba5560a2d537763566cf40nd while (apr_dir_read(&dirent, APR_FINFO_DIRENT, dirp) == APR_SUCCESS) {

fe64b2ba25510d8c9dba5560a2d537763566cf40nd apr_array_header_t *exception_list;

3b3b7fc78d1f5bfc2769903375050048ff41ff26nd request_rec *sub_req;

ad74a0524a06bfe11b7de9e3b4ce7233ab3bd3f7nd

3e6b8c7840a46cdccd46b7a4b1902c2bc82f6cc2gryzor /* Do we have a match? */

7f5b59ccc63c0c0e3e678a168f09ee6a2f51f9d0nd#ifdef CASE_BLIND_FILESYSTEM

f086b4b402fa9a2fefc7dda85de2a3cc1cd0a654rjung if (strncasecmp(dirent.name, filp, prefix_len)) {

727872d18412fc021f03969b8641810d8896820bhumbedooh#else

0d0ba3a410038e179b695446bb149cce6264e0abnd if (strncmp(dirent.name, filp, prefix_len)) {

727872d18412fc021f03969b8641810d8896820bhumbedooh#endif

cc7e1025de9ac63bd4db6fe7f71c158b2cf09fe4humbedooh continue;

0d0ba3a410038e179b695446bb149cce6264e0abnd }

cc7e1025de9ac63bd4db6fe7f71c158b2cf09fe4humbedooh if (dirent.name[prefix_len] != '.') {

727872d18412fc021f03969b8641810d8896820bhumbedooh continue;

0d0ba3a410038e179b695446bb149cce6264e0abnd }

0d0ba3a410038e179b695446bb149cce6264e0abnd

0d0ba3a410038e179b695446bb149cce6264e0abnd /* Ok, something's here. Maybe nothing useful. Remember that

0d0ba3a410038e179b695446bb149cce6264e0abnd anymatch = 1;

0d0ba3a410038e179b695446bb149cce6264e0abnd

727872d18412fc021f03969b8641810d8896820bhumbedooh /* Yep. See if it's something which we have access to, and

205f749042ed530040a4f0080dbcb47ceae8a374rjung

af33a4994ae2ff15bc67d19ff1a7feb906745bf8rbowen sub_req = ap_sub_req_lookup_dirent(&dirent, r, NULL);

0d0ba3a410038e179b695446bb149cce6264e0abnd

7fec19672a491661b2fe4b29f685bc7f4efa64d4nd /* BLECH --- don't multi-resolve non-ordinary files */

7fec19672a491661b2fe4b29f685bc7f4efa64d4nd

7fec19672a491661b2fe4b29f685bc7f4efa64d4nd if (sub_req->finfo.filetype != APR_REG)

fe64b2ba25510d8c9dba5560a2d537763566cf40nd continue;

/* If it has a handler, we'll pretend it's a CGI script,

if (sub_req->handler && !sub_req->content_type) {

sub_req->content_type = CGI_MAGIC_TYPE;

}

/*

exception_list =

(apr_array_header_t *)apr_table_get(sub_req->notes,

"ap-mime-exceptions-list");

if (!exception_list) {

ap_destroy_sub_req(sub_req);

continue;

}

/* Each unregonized bit better match our base name, in sequence.

{

int nexcept = exception_list->nelts;

char **cur_except = (char**)exception_list->elts;

char *segstart = filp, *segend, saveend;

while (*segstart && nexcept) {

if (!(segend = strchr(segstart, '.')))

segend = strchr(segstart, '\0');

saveend = *segend;

*segend = '\0';

#ifdef CASE_BLIND_FILESYSTEM

if (strcasecmp(segstart, *cur_except) == 0) {

#else

if (strcmp(segstart, *cur_except) == 0) {

#endif

--nexcept;

++cur_except;

}

if (!saveend)

break;

*segend = saveend;

segstart = segend + 1;

}

if (nexcept) {

/* Something you don't know is, something you don't know...

ap_destroy_sub_req(sub_req);

continue;

}

}

/*

if (sub_req->status != HTTP_OK || (!sub_req->content_type)) {

ap_destroy_sub_req(sub_req);

continue;

}

/* If it's a map file, we use that instead of the map

if (((sub_req->content_type) &&

!strcmp(sub_req->content_type, MAP_FILE_MAGIC_TYPE)) ||

((sub_req->handler) &&

!strcmp(sub_req->handler, "type-map"))) {

apr_dir_close(dirp);

neg->avail_vars->nelts = 0;

if (sub_req->status != HTTP_OK) {

return sub_req->status;

}

return read_type_map(NULL, neg, sub_req);

}

/* Have reasonable variant --- gather notes. */

mime_info.sub_req = sub_req;

mime_info.file_name = apr_pstrdup(neg->pool, dirent.name);

if (sub_req->content_encoding) {

mime_info.content_encoding = sub_req->content_encoding;

}

if (sub_req->content_languages) {

mime_info.content_languages = sub_req->content_languages;

}

get_entry(neg->pool, &accept_info, sub_req->content_type);

set_mime_fields(&mime_info, &accept_info);

new_var = apr_array_push(neg->avail_vars);

memcpy(new_var, (void *) &mime_info, sizeof(var_rec));

neg->count_multiviews_variants++;

clean_var_rec(&mime_info);

}

apr_dir_close(dirp);

/* We found some file names that matched. None could be served.

if (anymatch && !neg->avail_vars->nelts) {

ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,

"Negotiation: discovered file(s) matching request: %s"

" (None could be negotiated).",

r->filename);

return HTTP_NOT_FOUND;

}

set_vlist_validator(r, r);

/* Sort the variants into a canonical order. The negotiation

qsort((void *) neg->avail_vars->elts, neg->avail_vars->nelts,

sizeof(var_rec), (int (*)(const void *, const void *)) variantsortf);

return OK;

}

static int mime_match(accept_rec *accept_r, var_rec *avail)

{

const char *accept_type = accept_r->name;

const char *avail_type = avail->mime_type;

int len = strlen(accept_type);

if (accept_type[0] == '*') { /* Anything matches star/star */

if (avail->mime_stars < 1) {

avail->mime_stars = 1;

}

return 1;

}

else if ((accept_type[len - 1] == '*') &&

!strncmp(accept_type, avail_type, len - 2)) {

if (avail->mime_stars < 2) {

avail->mime_stars = 2;

}

return 1;

}

else if (!strcmp(accept_type, avail_type)

|| (!strcmp(accept_type, "text/html")

&& (!strcmp(avail_type, INCLUDES_MAGIC_TYPE)

|| !strcmp(avail_type, INCLUDES_MAGIC_TYPE3)))) {

if (accept_r->level >= avail->level) {

avail->level_matched = avail->level;

avail->mime_stars = 3;

return 1;

}

}

return OK;

}

static int level_cmp(var_rec *var1, var_rec *var2)

{

/* Levels are only comparable between matching media types */

if (var1->is_pseudo_html && !var2->is_pseudo_html) {

return 0;

}

if (!var1->is_pseudo_html && strcmp(var1->mime_type, var2->mime_type)) {

return 0;

}

/* The result of the above if statements is that, if we get to

/* Take highest level that matched, if either did match. */

if (var1->level_matched > var2->level_matched) {

return 1;

}

if (var1->level_matched < var2->level_matched) {

return -1;

}

/* Neither matched. Take lowest level, if there's a difference. */

if (var1->level < var2->level) {

return 1;

}

if (var1->level > var2->level) {

return -1;

}

/* Tied */

return 0;

}

static int find_lang_index(apr_array_header_t *accept_langs, char *lang)

{

accept_rec *accs;

int i;

if (!lang || !accept_langs) {

return -1;

}

accs = (accept_rec *) accept_langs->elts;

for (i = 0; i < accept_langs->nelts; ++i) {

if (!strncmp(lang, accs[i].name, strlen(accs[i].name))) {

return i;

}

}

return -1;

}