0f081398cf0eef8cc7c66a535d450110a92dc8aefielding

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding

cccd31fa4a72fe23cc3249c06db181b274a55a69gstein#include "apr.h"

cccd31fa4a72fe23cc3249c06db181b274a55a69gstein#include "apr_strings.h"

cccd31fa4a72fe23cc3249c06db181b274a55a69gstein#include "apr_thread_proc.h"

f6e9f5600e77b78fb013bb543d364135961639d1rbb#include "apr_hash.h"

c9dafaafc2650994e47f88f5239f643c97ec4cb3wrowe#include "apr_user.h"

1b21d7b3d97def358b2e923655edeb16613a1c31gstein#include "apr_lib.h"

024cd9589e52cf11ce765dfddb5b5f0c6e421a48gstein#include "apr_optional.h"

024cd9589e52cf11ce765dfddb5b5f0c6e421a48gstein

024cd9589e52cf11ce765dfddb5b5f0c6e421a48gstein#define APR_WANT_STRFUNC

024cd9589e52cf11ce765dfddb5b5f0c6e421a48gstein#include "apr_want.h"

cccd31fa4a72fe23cc3249c06db181b274a55a69gstein

b1476ba063e6d9577cd86db3db5dd98ff6bc78b9rbb#define CORE_PRIVATE

b1476ba063e6d9577cd86db3db5dd98ff6bc78b9rbb

9625528fcf4fa27288f3be080a1979c8ef60d7dfrbb#include "ap_config.h"

47d7b9019e57fbf3eaa4d2b19bbbcce087dd8389rbb#include "util_filter.h"

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding#include "httpd.h"

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding#include "http_config.h"

b42a7e46e4f80282bd27e96d43c9510b14ccb9aarbb#include "http_core.h"

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding#include "http_request.h"

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding#include "http_core.h"

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding#include "http_protocol.h"

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding#include "http_log.h"

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding#include "http_main.h"

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding#include "util_script.h"

b1476ba063e6d9577cd86db3db5dd98ff6bc78b9rbb#include "http_core.h"

18343797fadabacf01280b38ea7688690d12aec0rbb#include "mod_include.h"

178381ebc820fb4c429aa000240cc8ec42c99c58trawick#include "util_ebcdic.h"

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding

138c8f7cb8254e035c6f45288e3909cd9c21be5cmartinmodule AP_MODULE_DECLARE_DATA include_module;

f6e9f5600e77b78fb013bb543d364135961639d1rbbstatic apr_hash_t *include_hash;

445997e06464e7625c7f0e22917f8f2d9876cfffrbbstatic APR_OPTIONAL_FN_TYPE(ap_register_include_handler) *ssi_pfn_register;

445997e06464e7625c7f0e22917f8f2d9876cfffrbb

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantzenum xbithack {

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz xbithack_off, xbithack_on, xbithack_full

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz};

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz

51be7fc538641ed7cb22e959eb31629f7183f70fianhtypedef struct {

51be7fc538641ed7cb22e959eb31629f7183f70fianh char *default_error_msg;

51be7fc538641ed7cb22e959eb31629f7183f70fianh char *default_time_fmt;

51be7fc538641ed7cb22e959eb31629f7183f70fianh enum xbithack *xbithack;

51be7fc538641ed7cb22e959eb31629f7183f70fianh} include_dir_config;

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz#ifdef XBITHACK

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz#define DEFAULT_XBITHACK xbithack_full

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz#else

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz#define DEFAULT_XBITHACK xbithack_off

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz#endif

51be7fc538641ed7cb22e959eb31629f7183f70fianh

51be7fc538641ed7cb22e959eb31629f7183f70fianh#define BYTE_COUNT_THRESHOLD AP_MIN_BYTES_TO_WRITE

51be7fc538641ed7cb22e959eb31629f7183f70fianh

51be7fc538641ed7cb22e959eb31629f7183f70fianh

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantzstatic const char lazy_eval_sentinel;

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz#define LAZY_VALUE (&lazy_eval_sentinel)

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantzstatic void add_include_vars(request_rec *r, char *timefmt)

b42a7e46e4f80282bd27e96d43c9510b14ccb9aarbb{

f6e9f5600e77b78fb013bb543d364135961639d1rbb apr_table_t *e = r->subprocess_env;

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding char *t;

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz apr_table_setn(e, "DATE_LOCAL", LAZY_VALUE);

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz apr_table_setn(e, "DATE_GMT", LAZY_VALUE);

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz apr_table_setn(e, "LAST_MODIFIED", LAZY_VALUE);

30b9959208c26420c95d176e457ccc6b5f725194jerenkrantz apr_table_setn(e, "DOCUMENT_URI", r->uri);

30b9959208c26420c95d176e457ccc6b5f725194jerenkrantz if (r->path_info && *r->path_info) {

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz apr_table_setn(e, "DOCUMENT_PATH_INFO", r->path_info);

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding }

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding apr_table_setn(e, "USER_NAME", LAZY_VALUE);

1ccd992d37d62c8cb2056126f2234f64ec189bfddougm if ((t = strrchr(r->filename, '/'))) {

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding apr_table_setn(e, "DOCUMENT_NAME", ++t);

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding }

30b9959208c26420c95d176e457ccc6b5f725194jerenkrantz else {

30b9959208c26420c95d176e457ccc6b5f725194jerenkrantz apr_table_setn(e, "DOCUMENT_NAME", r->uri);

30b9959208c26420c95d176e457ccc6b5f725194jerenkrantz }

1ccd992d37d62c8cb2056126f2234f64ec189bfddougm if (r->args) {

441bd066858500e75e4f63ef149120bcf523de58jerenkrantz char *arg_copy = apr_pstrdup(r->pool, r->args);

441bd066858500e75e4f63ef149120bcf523de58jerenkrantz

441bd066858500e75e4f63ef149120bcf523de58jerenkrantz ap_unescape_url(arg_copy);

30b9959208c26420c95d176e457ccc6b5f725194jerenkrantz apr_table_setn(e, "QUERY_STRING_UNESCAPED",

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding ap_escape_shell_cmd(r->pool, arg_copy));

1ccd992d37d62c8cb2056126f2234f64ec189bfddougm }

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding}

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding

1ccd992d37d62c8cb2056126f2234f64ec189bfddougmstatic const char *add_include_vars_lazy(request_rec *r, const char *var)

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding{

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding char *val;

1ccd992d37d62c8cb2056126f2234f64ec189bfddougm if (!strcasecmp(var, "DATE_LOCAL")) {

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding include_dir_config *conf =

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding (include_dir_config *)ap_get_module_config(r->per_dir_config,

1ccd992d37d62c8cb2056126f2234f64ec189bfddougm &include_module);

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding val = ap_ht_time(r->pool, r->request_time, conf->default_time_fmt, 0);

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding }

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding else if (!strcasecmp(var, "DATE_GMT")) {

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding include_dir_config *conf =

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz (include_dir_config *)ap_get_module_config(r->per_dir_config,

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz &include_module);

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz val = ap_ht_time(r->pool, r->request_time, conf->default_time_fmt, 1);

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz }

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz else if (!strcasecmp(var, "LAST_MODIFIED")) {

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz include_dir_config *conf =

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz (include_dir_config *)ap_get_module_config(r->per_dir_config,

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz &include_module);

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz val = ap_ht_time(r->pool, r->finfo.mtime, conf->default_time_fmt, 0);

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz }

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz else if (!strcasecmp(var, "USER_NAME")) {

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz if (apr_get_username(&val, r->finfo.user, r->pool) != APR_SUCCESS) {

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz val = "<unknown>";

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz }

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz }

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz else {

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz val = NULL;

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz }

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz if (val) {

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz apr_table_setn(r->subprocess_env, var, val);

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz }

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz return val;

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz}

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantzstatic const char *get_include_var(request_rec *r, const char *var)

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz{

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz const char *val;

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz val = apr_table_get(r->subprocess_env, var);

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz if (val == LAZY_VALUE)

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz val = add_include_vars_lazy(r, var);

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz return val;

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz}

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz

c6a9d49433c9ba5b18b26c3d764f1bbcb9746090wrowe

c6a9d49433c9ba5b18b26c3d764f1bbcb9746090wrowe

c6a9d49433c9ba5b18b26c3d764f1bbcb9746090wrowetypedef struct {

c6a9d49433c9ba5b18b26c3d764f1bbcb9746090wrowe unsigned int T[256];

c6a9d49433c9ba5b18b26c3d764f1bbcb9746090wrowe unsigned int x;

c6a9d49433c9ba5b18b26c3d764f1bbcb9746090wrowe} bndm_t;

c6a9d49433c9ba5b18b26c3d764f1bbcb9746090wrowe

c6a9d49433c9ba5b18b26c3d764f1bbcb9746090wrowestatic bndm_t start_seq_pat;

c6a9d49433c9ba5b18b26c3d764f1bbcb9746090wrowe

c6a9d49433c9ba5b18b26c3d764f1bbcb9746090wrowestatic void bndm_compile(bndm_t *t, const char *n, apr_size_t nl)

c6a9d49433c9ba5b18b26c3d764f1bbcb9746090wrowe{

30b9959208c26420c95d176e457ccc6b5f725194jerenkrantz unsigned int x;

c6a9d49433c9ba5b18b26c3d764f1bbcb9746090wrowe const char *ne = n + nl;

c6a9d49433c9ba5b18b26c3d764f1bbcb9746090wrowe

c6a9d49433c9ba5b18b26c3d764f1bbcb9746090wrowe memset(t->T, 0, sizeof(unsigned int) * 256);

30b9959208c26420c95d176e457ccc6b5f725194jerenkrantz

30b9959208c26420c95d176e457ccc6b5f725194jerenkrantz for (x = 1; n < ne; x <<= 1)

30b9959208c26420c95d176e457ccc6b5f725194jerenkrantz t->T[(unsigned char) *n++] |= x;

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding t->x = x - 1;

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz}

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantzstatic apr_size_t bndm(const char *n, apr_size_t nl, const char *h,

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz apr_size_t hl, bndm_t *t)

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz{

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz apr_size_t skip;

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz const char *he, *p, *pi;

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz unsigned int *T, x, d;

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz he = h + hl;

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz T = t->T;

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz x = t->x << 1;

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz pi = h - 1; /* pi: p initial */

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz p = pi + nl; /* compare window right to left. point to the first char */

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz while (p < he) {

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz skip = nl;

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz d = x;

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz do {

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz d = (d >> 1) & T[(unsigned char) *p--];

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz if ((d & 1)) {

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz if (p != pi)

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz skip = p - pi;

1627792f516dc22cf12ac193cc48441d0a3701dajerenkrantz else

1627792f516dc22cf12ac193cc48441d0a3701dajerenkrantz return p - h + 1;

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz }

95ca1a6ff23adde7ae9cbbec7b6754d9aecacc2dbrianp } while (d > 1);

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz p = (pi += skip) + nl;

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz }

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz return hl;

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz}

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantzstatic apr_bucket* found_start_sequence(apr_bucket *dptr,

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz include_ctx_t *ctx,

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz int tagStart)

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz{

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz /* We want to split the bucket at the '<'. */

95ca1a6ff23adde7ae9cbbec7b6754d9aecacc2dbrianp ctx->state = PARSE_DIRECTIVE;

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz ctx->tag_length = 0;

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz ctx->parse_pos = 0;

0d628dd174dd6de13463b10d2599f6cac24e9fe8brianp ctx->tag_start_bucket = dptr;

0d628dd174dd6de13463b10d2599f6cac24e9fe8brianp ctx->tag_start_index = tagStart;

0d628dd174dd6de13463b10d2599f6cac24e9fe8brianp if (ctx->head_start_index > 0) {

0d628dd174dd6de13463b10d2599f6cac24e9fe8brianp apr_bucket *tmp_bkt;

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz /* Split the bucket with the start of the tag in it */

95ca1a6ff23adde7ae9cbbec7b6754d9aecacc2dbrianp apr_bucket_split(ctx->head_start_bucket, ctx->head_start_index);

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz tmp_bkt = APR_BUCKET_NEXT(ctx->head_start_bucket);

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz /* If it was a one bucket match */

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz if (dptr == ctx->head_start_bucket) {

0d628dd174dd6de13463b10d2599f6cac24e9fe8brianp ctx->tag_start_bucket = tmp_bkt;

0d628dd174dd6de13463b10d2599f6cac24e9fe8brianp ctx->tag_start_index = tagStart - ctx->head_start_index;

0d628dd174dd6de13463b10d2599f6cac24e9fe8brianp }

95ca1a6ff23adde7ae9cbbec7b6754d9aecacc2dbrianp ctx->head_start_bucket = tmp_bkt;

95ca1a6ff23adde7ae9cbbec7b6754d9aecacc2dbrianp ctx->head_start_index = 0;

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz }

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz return ctx->head_start_bucket;

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz}

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz

e85d1bc5205a1b1299e9dcffd4df22f8f8bbe8cdwrowestatic apr_bucket *find_start_sequence(apr_bucket *dptr, include_ctx_t *ctx,

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz apr_bucket_brigade *bb, int *do_cleanup)

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz{

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz apr_size_t len;

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz const char *c;

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz const char *buf;

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz const char *str = STARTING_SEQUENCE;

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz apr_size_t slen = sizeof(STARTING_SEQUENCE) - 1;

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz apr_size_t pos;

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz *do_cleanup = 0;

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz do {

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz apr_status_t rv = 0;

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz int read_done = 0;

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz if (APR_BUCKET_IS_EOS(dptr)) {

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz break;

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz }

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz if (ctx->bytes_parsed >= BYTE_COUNT_THRESHOLD) {

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz ctx->output_now = 1;

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz }

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz else if (ctx->bytes_parsed > 0) {

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz rv = apr_bucket_read(dptr, &buf, &len, APR_NONBLOCK_READ);

18343797fadabacf01280b38ea7688690d12aec0rbb read_done = 1;

18343797fadabacf01280b38ea7688690d12aec0rbb if (APR_STATUS_IS_EAGAIN(rv)) {

18343797fadabacf01280b38ea7688690d12aec0rbb ctx->output_now = 1;

18343797fadabacf01280b38ea7688690d12aec0rbb }

b980ad7fdc218b4855cde9f75a747527f50c554dwrowe }

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding if (ctx->output_now) {

cd36eaa1f276d94ef45e8665cc701ac1d5fc5ba3trawick apr_bucket *start_bucket;

47d7b9019e57fbf3eaa4d2b19bbbcce087dd8389rbb if (ctx->head_start_index > 0) {

47d7b9019e57fbf3eaa4d2b19bbbcce087dd8389rbb start_bucket = ctx->head_start_bucket;

51be7fc538641ed7cb22e959eb31629f7183f70fianh apr_bucket_split(start_bucket, ctx->head_start_index);

51be7fc538641ed7cb22e959eb31629f7183f70fianh start_bucket = APR_BUCKET_NEXT(start_bucket);

8204f955c6ec6281031320ec15ccf8f1531ee3cawrowe ctx->head_start_index = 0;

18343797fadabacf01280b38ea7688690d12aec0rbb ctx->head_start_bucket = start_bucket;

18343797fadabacf01280b38ea7688690d12aec0rbb ctx->parse_pos = 0;

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding ctx->state = PRE_HEAD;

47d7b9019e57fbf3eaa4d2b19bbbcce087dd8389rbb }

fc9e11c98ca76d8b1a4fedfced2a04e543162535jwoolley else {

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz start_bucket = dptr;

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz }

b980ad7fdc218b4855cde9f75a747527f50c554dwrowe return start_bucket;

fcc991411813d0ceaca4a76675f771e1f06617cdtrawick }

fcc991411813d0ceaca4a76675f771e1f06617cdtrawick

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz if (!read_done) {

975f1dd40035607cc5f408439c4ea1457528590dbrianp rv = apr_bucket_read(dptr, &buf, &len, APR_BLOCK_READ);

975f1dd40035607cc5f408439c4ea1457528590dbrianp }

975f1dd40035607cc5f408439c4ea1457528590dbrianp if (!APR_STATUS_IS_SUCCESS(rv)) {

83ca150ef902e9692972aa923e893bc6406d20f1ianh ctx->status = rv;

83ca150ef902e9692972aa923e893bc6406d20f1ianh return NULL;

83ca150ef902e9692972aa923e893bc6406d20f1ianh }

83ca150ef902e9692972aa923e893bc6406d20f1ianh

83ca150ef902e9692972aa923e893bc6406d20f1ianh if (len == 0) { /* end of pipe? */

83ca150ef902e9692972aa923e893bc6406d20f1ianh break;

83ca150ef902e9692972aa923e893bc6406d20f1ianh }

975f1dd40035607cc5f408439c4ea1457528590dbrianp

975f1dd40035607cc5f408439c4ea1457528590dbrianp /* Set our buffer to use. */

975f1dd40035607cc5f408439c4ea1457528590dbrianp c = buf;

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz /* The last bucket had a left over partial match that we need to

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz if (ctx->state == PARSE_HEAD)

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz {

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz apr_size_t tmpLen;

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz tmpLen = (len > (slen - 1)) ? len : (slen - 1);

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding

b42a7e46e4f80282bd27e96d43c9510b14ccb9aarbb while (c < buf + tmpLen && *c == str[ctx->parse_pos])

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz {

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz c++;

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz ctx->parse_pos++;

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz }

8173eb0f84c2dd1f08802aadc90731cc89ba5c0ejerenkrantz

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz if (str[ctx->parse_pos] == '\0')

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz {

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz ctx->bytes_parsed += c - buf;

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz return found_start_sequence(dptr, ctx, c - buf);

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz }

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz /* False alarm... */

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz ctx->state = PRE_HEAD;

b42a7e46e4f80282bd27e96d43c9510b14ccb9aarbb }

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz if (len)

b42a7e46e4f80282bd27e96d43c9510b14ccb9aarbb {

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz pos = bndm(str, slen, c, len, &start_seq_pat);

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz if (pos != len)

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz {

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz ctx->head_start_bucket = dptr;

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz ctx->head_start_index = pos;

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz ctx->bytes_parsed += pos + slen;

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz return found_start_sequence(dptr, ctx, pos + slen);

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz }

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz }

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz /* Consider the case where we have <!-- at the end of the bucket. */

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz ctx->bytes_parsed += len - slen;

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz ctx->parse_pos = 0;

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz c = buf + len - slen + 1;

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz while (c < buf + len)

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz {

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz if (*c == str[ctx->parse_pos]) {

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz if (ctx->state == PRE_HEAD) {

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz ctx->state = PARSE_HEAD;

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz ctx->head_start_bucket = dptr;

71d0a4ed0b2d20444f64a938ed2f11b372408f30ianh ctx->head_start_index = c - buf;

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz }

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz ctx->parse_pos++;

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz }

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz else if (ctx->parse_pos != 0)

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz {

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz /* The reason for this, is that we need to make sure

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz /* FIXME: Why? */

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz *do_cleanup = 1;

71d0a4ed0b2d20444f64a938ed2f11b372408f30ianh if (*c == str[0]) {

71d0a4ed0b2d20444f64a938ed2f11b372408f30ianh ctx->parse_pos = 1;

71d0a4ed0b2d20444f64a938ed2f11b372408f30ianh ctx->head_start_index = c - buf;

71d0a4ed0b2d20444f64a938ed2f11b372408f30ianh }

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz else {

095071bbd0b3ccccd6883edc7cd10f13cac71160ianh ctx->parse_pos = 0;

095071bbd0b3ccccd6883edc7cd10f13cac71160ianh ctx->state = PRE_HEAD;

88aa2aa192b60ddbe8b0f7062df066edcdbfda93jwoolley ctx->head_start_bucket = NULL;

83ca150ef902e9692972aa923e893bc6406d20f1ianh ctx->head_start_index = 0;

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz }

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz }

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz c++;

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz ctx->bytes_parsed++;

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz }

51be7fc538641ed7cb22e959eb31629f7183f70fianh dptr = APR_BUCKET_NEXT(dptr);

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz } while (dptr != APR_BRIGADE_SENTINEL(bb));

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz return NULL;

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz}

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantzstatic apr_bucket *find_end_sequence(apr_bucket *dptr, include_ctx_t *ctx,

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz apr_bucket_brigade *bb)

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz{

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz apr_size_t len;

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz const char *c;

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz const char *buf;

e98a7a7acc2861a0987318b2580872d2c8ca1fe2brianp const char *str = ENDING_SEQUENCE;

e98a7a7acc2861a0987318b2580872d2c8ca1fe2brianp

e98a7a7acc2861a0987318b2580872d2c8ca1fe2brianp do {

e98a7a7acc2861a0987318b2580872d2c8ca1fe2brianp apr_status_t rv = 0;

e98a7a7acc2861a0987318b2580872d2c8ca1fe2brianp int read_done = 0;

e98a7a7acc2861a0987318b2580872d2c8ca1fe2brianp

e98a7a7acc2861a0987318b2580872d2c8ca1fe2brianp if (APR_BUCKET_IS_EOS(dptr)) {

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz break;

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz }

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz if (ctx->bytes_parsed >= BYTE_COUNT_THRESHOLD) {

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz ctx->output_now = 1;

18343797fadabacf01280b38ea7688690d12aec0rbb }

18343797fadabacf01280b38ea7688690d12aec0rbb else if (ctx->bytes_parsed > 0) {

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz rv = apr_bucket_read(dptr, &buf, &len, APR_NONBLOCK_READ);

18343797fadabacf01280b38ea7688690d12aec0rbb read_done = 1;

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz if (APR_STATUS_IS_EAGAIN(rv)) {

18343797fadabacf01280b38ea7688690d12aec0rbb ctx->output_now = 1;

18343797fadabacf01280b38ea7688690d12aec0rbb }

47d7b9019e57fbf3eaa4d2b19bbbcce087dd8389rbb }

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz if (ctx->output_now) {

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz if (ctx->state == PARSE_DIRECTIVE) {

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz /* gonna start over parsing the directive next time through */

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz ctx->directive_length = 0;

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz ctx->tag_length = 0;

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz }

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz return dptr;

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz }

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz if (!read_done) {

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz rv = apr_bucket_read(dptr, &buf, &len, APR_BLOCK_READ);

18343797fadabacf01280b38ea7688690d12aec0rbb }

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz if (!APR_STATUS_IS_SUCCESS(rv)) {

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz ctx->status = rv;

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz return NULL;

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz }

f00d1e76bae896c2f6a520eec69b1d0d802d4108jerenkrantz

18343797fadabacf01280b38ea7688690d12aec0rbb if (len == 0) { /* end of pipe? */

18343797fadabacf01280b38ea7688690d12aec0rbb break;

18343797fadabacf01280b38ea7688690d12aec0rbb }

b42a7e46e4f80282bd27e96d43c9510b14ccb9aarbb if (dptr == ctx->tag_start_bucket) {

18343797fadabacf01280b38ea7688690d12aec0rbb c = buf + ctx->tag_start_index;

b980ad7fdc218b4855cde9f75a747527f50c554dwrowe }

b980ad7fdc218b4855cde9f75a747527f50c554dwrowe else {

83ca150ef902e9692972aa923e893bc6406d20f1ianh c = buf;

83ca150ef902e9692972aa923e893bc6406d20f1ianh }

18343797fadabacf01280b38ea7688690d12aec0rbb while (c < buf + len) {

18343797fadabacf01280b38ea7688690d12aec0rbb if (*c == str[ctx->parse_pos]) {

18343797fadabacf01280b38ea7688690d12aec0rbb if (ctx->state != PARSE_TAIL) {

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz ctx->state = PARSE_TAIL;

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz ctx->tail_start_bucket = dptr;

18343797fadabacf01280b38ea7688690d12aec0rbb ctx->tail_start_index = c - buf;

cd36eaa1f276d94ef45e8665cc701ac1d5fc5ba3trawick }

18343797fadabacf01280b38ea7688690d12aec0rbb ctx->parse_pos++;

18343797fadabacf01280b38ea7688690d12aec0rbb }

51be7fc538641ed7cb22e959eb31629f7183f70fianh else {

18343797fadabacf01280b38ea7688690d12aec0rbb if (ctx->state == PARSE_DIRECTIVE) {

18343797fadabacf01280b38ea7688690d12aec0rbb if (ctx->tag_length == 0) {

fc9e11c98ca76d8b1a4fedfced2a04e543162535jwoolley if (!apr_isspace(*c)) {

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz ctx->tag_start_bucket = dptr;

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz ctx->tag_start_index = c - buf;

b980ad7fdc218b4855cde9f75a747527f50c554dwrowe ctx->tag_length = 1;

18343797fadabacf01280b38ea7688690d12aec0rbb ctx->directive_length = 1;

18343797fadabacf01280b38ea7688690d12aec0rbb }

975f1dd40035607cc5f408439c4ea1457528590dbrianp }

975f1dd40035607cc5f408439c4ea1457528590dbrianp else {

975f1dd40035607cc5f408439c4ea1457528590dbrianp if (!apr_isspace(*c)) {

83ca150ef902e9692972aa923e893bc6406d20f1ianh ctx->directive_length++;

83ca150ef902e9692972aa923e893bc6406d20f1ianh }

83ca150ef902e9692972aa923e893bc6406d20f1ianh else {

83ca150ef902e9692972aa923e893bc6406d20f1ianh ctx->state = PARSE_TAG;

83ca150ef902e9692972aa923e893bc6406d20f1ianh }

83ca150ef902e9692972aa923e893bc6406d20f1ianh ctx->tag_length++;

83ca150ef902e9692972aa923e893bc6406d20f1ianh }

975f1dd40035607cc5f408439c4ea1457528590dbrianp }

975f1dd40035607cc5f408439c4ea1457528590dbrianp else if (ctx->state == PARSE_TAG) {

975f1dd40035607cc5f408439c4ea1457528590dbrianp ctx->tag_length++;

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz }

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz else {

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz if (str[ctx->parse_pos] == '\0') {

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz apr_bucket *tmp_buck = dptr;

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz /* We want to split the bucket at the '>'. The

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz ctx->bytes_parsed++;

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz ctx->state = PARSED;

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz if ((c - buf) > 0) {

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz apr_bucket_split(dptr, c - buf);

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz tmp_buck = APR_BUCKET_NEXT(dptr);

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz }

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz return (tmp_buck);

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz }

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz else if (ctx->parse_pos != 0) {

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz /* The reason for this, is that we need to make sure

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz ctx->tag_length += ctx->parse_pos;

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz

e099672a13ea4ff4a11f130406f1baecba5949bajerenkrantz if (*c == str[0]) {

18343797fadabacf01280b38ea7688690d12aec0rbb ctx->state = PARSE_TAIL;

18343797fadabacf01280b38ea7688690d12aec0rbb ctx->tail_start_bucket = dptr;

18343797fadabacf01280b38ea7688690d12aec0rbb ctx->tail_start_index = c - buf;

18343797fadabacf01280b38ea7688690d12aec0rbb ctx->tag_length += ctx->parse_pos;

18343797fadabacf01280b38ea7688690d12aec0rbb ctx->parse_pos = 1;

18343797fadabacf01280b38ea7688690d12aec0rbb }

18343797fadabacf01280b38ea7688690d12aec0rbb else {

18343797fadabacf01280b38ea7688690d12aec0rbb if (ctx->tag_length > ctx->directive_length) {

18343797fadabacf01280b38ea7688690d12aec0rbb ctx->state = PARSE_TAG;

3084ccb696461ceb2fc4fbe76e302640eaac6a18wrowe }

18343797fadabacf01280b38ea7688690d12aec0rbb else {

f6e9f5600e77b78fb013bb543d364135961639d1rbb ctx->state = PARSE_DIRECTIVE;

18343797fadabacf01280b38ea7688690d12aec0rbb ctx->directive_length += ctx->parse_pos;

18343797fadabacf01280b38ea7688690d12aec0rbb }

18343797fadabacf01280b38ea7688690d12aec0rbb ctx->tail_start_bucket = NULL;

18343797fadabacf01280b38ea7688690d12aec0rbb ctx->tail_start_index = 0;

18343797fadabacf01280b38ea7688690d12aec0rbb ctx->tag_length += ctx->parse_pos;

51ced3b28ef430a96586284d4320f7dbdaf7225ebrianp ctx->parse_pos = 0;

51ced3b28ef430a96586284d4320f7dbdaf7225ebrianp }

51ced3b28ef430a96586284d4320f7dbdaf7225ebrianp }

51ced3b28ef430a96586284d4320f7dbdaf7225ebrianp }

51ced3b28ef430a96586284d4320f7dbdaf7225ebrianp }

51ced3b28ef430a96586284d4320f7dbdaf7225ebrianp c++;

51ced3b28ef430a96586284d4320f7dbdaf7225ebrianp ctx->bytes_parsed++;

51ced3b28ef430a96586284d4320f7dbdaf7225ebrianp }

51ced3b28ef430a96586284d4320f7dbdaf7225ebrianp dptr = APR_BUCKET_NEXT(dptr);

51ced3b28ef430a96586284d4320f7dbdaf7225ebrianp } while (dptr != APR_BRIGADE_SENTINEL(bb));

51ced3b28ef430a96586284d4320f7dbdaf7225ebrianp return NULL;

51ced3b28ef430a96586284d4320f7dbdaf7225ebrianp}

51ced3b28ef430a96586284d4320f7dbdaf7225ebrianp

18343797fadabacf01280b38ea7688690d12aec0rbbstatic apr_status_t get_combined_directive (include_ctx_t *ctx,

18343797fadabacf01280b38ea7688690d12aec0rbb request_rec *r,

18343797fadabacf01280b38ea7688690d12aec0rbb apr_bucket_brigade *bb,

18343797fadabacf01280b38ea7688690d12aec0rbb char *tmp_buf,

f6e9f5600e77b78fb013bb543d364135961639d1rbb apr_size_t tmp_buf_size)

18343797fadabacf01280b38ea7688690d12aec0rbb{

47d7b9019e57fbf3eaa4d2b19bbbcce087dd8389rbb int done = 0;

47d7b9019e57fbf3eaa4d2b19bbbcce087dd8389rbb apr_bucket *dptr;

f6e9f5600e77b78fb013bb543d364135961639d1rbb const char *tmp_from;

f6e9f5600e77b78fb013bb543d364135961639d1rbb apr_size_t tmp_from_len;

f6e9f5600e77b78fb013bb543d364135961639d1rbb

f6e9f5600e77b78fb013bb543d364135961639d1rbb /* If the tag length is longer than the tmp buffer, allocate space. */

f6e9f5600e77b78fb013bb543d364135961639d1rbb if (ctx->tag_length > tmp_buf_size-1) {

f6e9f5600e77b78fb013bb543d364135961639d1rbb if ((ctx->combined_tag = apr_pcalloc(r->pool,

18343797fadabacf01280b38ea7688690d12aec0rbb ctx->tag_length + 1)) == NULL) {

47d7b9019e57fbf3eaa4d2b19bbbcce087dd8389rbb return (APR_ENOMEM);

47d7b9019e57fbf3eaa4d2b19bbbcce087dd8389rbb }

f6e9f5600e77b78fb013bb543d364135961639d1rbb } /* Else, just use the temp buffer. */

f6e9f5600e77b78fb013bb543d364135961639d1rbb else {

f6e9f5600e77b78fb013bb543d364135961639d1rbb ctx->combined_tag = tmp_buf;

47d7b9019e57fbf3eaa4d2b19bbbcce087dd8389rbb }

51ced3b28ef430a96586284d4320f7dbdaf7225ebrianp

18343797fadabacf01280b38ea7688690d12aec0rbb /* Prime the pump. Start at the beginning of the tag... */

18343797fadabacf01280b38ea7688690d12aec0rbb dptr = ctx->tag_start_bucket;

18343797fadabacf01280b38ea7688690d12aec0rbb /* Read the bucket... */

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz apr_bucket_read (dptr, &tmp_from, &tmp_from_len, 0);

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz

18343797fadabacf01280b38ea7688690d12aec0rbb /* Adjust the pointer to start at the tag within the bucket... */

18343797fadabacf01280b38ea7688690d12aec0rbb if (dptr == ctx->tail_start_bucket) {

18343797fadabacf01280b38ea7688690d12aec0rbb tmp_from_len -= (tmp_from_len - ctx->tail_start_index);

18343797fadabacf01280b38ea7688690d12aec0rbb }

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz tmp_from = &tmp_from[ctx->tag_start_index];

18343797fadabacf01280b38ea7688690d12aec0rbb tmp_from_len -= ctx->tag_start_index;

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz ctx->curr_tag_pos = ctx->combined_tag;

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz /* Loop through the buckets from the tag_start_bucket until before

f6e9f5600e77b78fb013bb543d364135961639d1rbb do {

f6e9f5600e77b78fb013bb543d364135961639d1rbb memcpy (ctx->curr_tag_pos, tmp_from, tmp_from_len);

f6e9f5600e77b78fb013bb543d364135961639d1rbb ctx->curr_tag_pos += tmp_from_len;

f6e9f5600e77b78fb013bb543d364135961639d1rbb

f6e9f5600e77b78fb013bb543d364135961639d1rbb if (dptr == ctx->tail_start_bucket) {

f6e9f5600e77b78fb013bb543d364135961639d1rbb done = 1;

f6e9f5600e77b78fb013bb543d364135961639d1rbb }

18343797fadabacf01280b38ea7688690d12aec0rbb else {

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz dptr = APR_BUCKET_NEXT (dptr);

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz apr_bucket_read (dptr, &tmp_from, &tmp_from_len, 0);

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz /* Adjust the count to stop at the beginning of the tail. */

18343797fadabacf01280b38ea7688690d12aec0rbb if (dptr == ctx->tail_start_bucket) {

18343797fadabacf01280b38ea7688690d12aec0rbb tmp_from_len -= (tmp_from_len - ctx->tail_start_index);

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding }

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding }

47d7b9019e57fbf3eaa4d2b19bbbcce087dd8389rbb } while ((!done) &&

b42a7e46e4f80282bd27e96d43c9510b14ccb9aarbb (ctx->curr_tag_pos < ctx->combined_tag + ctx->tag_length));

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding

b980ad7fdc218b4855cde9f75a747527f50c554dwrowe ctx->combined_tag[ctx->tag_length] = '\0';

b980ad7fdc218b4855cde9f75a747527f50c554dwrowe ctx->curr_tag_pos = ctx->combined_tag;

47d7b9019e57fbf3eaa4d2b19bbbcce087dd8389rbb

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding return (APR_SUCCESS);

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding}

18343797fadabacf01280b38ea7688690d12aec0rbb

3084ccb696461ceb2fc4fbe76e302640eaac6a18wrowe

cd36eaa1f276d94ef45e8665cc701ac1d5fc5ba3trawick#define MAXENTLEN (6)

18343797fadabacf01280b38ea7688690d12aec0rbb

18343797fadabacf01280b38ea7688690d12aec0rbb

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantzstatic void decodehtml(char *s)

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz{

18343797fadabacf01280b38ea7688690d12aec0rbb int val, i, j;

18343797fadabacf01280b38ea7688690d12aec0rbb char *p = s;

18343797fadabacf01280b38ea7688690d12aec0rbb const char *ents;

18343797fadabacf01280b38ea7688690d12aec0rbb static const char * const entlist[MAXENTLEN + 1] =

18343797fadabacf01280b38ea7688690d12aec0rbb {

18343797fadabacf01280b38ea7688690d12aec0rbb NULL, /* 0 */

18343797fadabacf01280b38ea7688690d12aec0rbb NULL, /* 1 */

18343797fadabacf01280b38ea7688690d12aec0rbb "lt\074gt\076", /* 2 */

18343797fadabacf01280b38ea7688690d12aec0rbb "amp\046ETH\320eth\360", /* 3 */

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz "quot\042Auml\304Euml\313Iuml\317Ouml\326Uuml\334auml\344euml\353\

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantziuml\357ouml\366uuml\374yuml\377", /* 4 */

18343797fadabacf01280b38ea7688690d12aec0rbb "Acirc\302Aring\305AElig\306Ecirc\312Icirc\316Ocirc\324Ucirc\333\

18343797fadabacf01280b38ea7688690d12aec0rbbucirc\373thorn\376", /* 5 */

18343797fadabacf01280b38ea7688690d12aec0rbb "Agrave\300Aacute\301Atilde\303Ccedil\307Egrave\310Eacute\311\

18343797fadabacf01280b38ea7688690d12aec0rbbotilde\365oslash\370ugrave\371uacute\372yacute\375" /* 6 */

18343797fadabacf01280b38ea7688690d12aec0rbb };

18343797fadabacf01280b38ea7688690d12aec0rbb

18343797fadabacf01280b38ea7688690d12aec0rbb for (; *s != '\0'; s++, p++) {

18343797fadabacf01280b38ea7688690d12aec0rbb if (*s != '&') {

18343797fadabacf01280b38ea7688690d12aec0rbb *p = *s;

18343797fadabacf01280b38ea7688690d12aec0rbb continue;

18343797fadabacf01280b38ea7688690d12aec0rbb }

18343797fadabacf01280b38ea7688690d12aec0rbb /* find end of entity */

18343797fadabacf01280b38ea7688690d12aec0rbb for (i = 1; s[i] != ';' && s[i] != '\0'; i++) {

18343797fadabacf01280b38ea7688690d12aec0rbb continue;

18343797fadabacf01280b38ea7688690d12aec0rbb }

18343797fadabacf01280b38ea7688690d12aec0rbb

b980ad7fdc218b4855cde9f75a747527f50c554dwrowe if (s[i] == '\0') { /* treat as normal data */

b980ad7fdc218b4855cde9f75a747527f50c554dwrowe *p = *s;

18343797fadabacf01280b38ea7688690d12aec0rbb continue;

18343797fadabacf01280b38ea7688690d12aec0rbb }

18343797fadabacf01280b38ea7688690d12aec0rbb

18343797fadabacf01280b38ea7688690d12aec0rbb /* is it numeric ? */

18343797fadabacf01280b38ea7688690d12aec0rbb if (s[1] == '#') {

18343797fadabacf01280b38ea7688690d12aec0rbb for (j = 2, val = 0; j < i && apr_isdigit(s[j]); j++) {

3084ccb696461ceb2fc4fbe76e302640eaac6a18wrowe val = val * 10 + s[j] - '0';

18343797fadabacf01280b38ea7688690d12aec0rbb }

18343797fadabacf01280b38ea7688690d12aec0rbb s += i;

18343797fadabacf01280b38ea7688690d12aec0rbb if (j < i || val <= 8 || (val >= 11 && val <= 31) ||

18343797fadabacf01280b38ea7688690d12aec0rbb (val >= 127 && val <= 160) || val >= 256) {

18343797fadabacf01280b38ea7688690d12aec0rbb p--; /* no data to output */

18343797fadabacf01280b38ea7688690d12aec0rbb }

18343797fadabacf01280b38ea7688690d12aec0rbb else {

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding *p = RAW_ASCII_CHAR(val);

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding }

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding }

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding else {

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding j = i - 1;

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding if (j > MAXENTLEN || entlist[j] == NULL) {

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding /* wrong length */

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding *p = '&';

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding continue; /* skip it */

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding }

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding for (ents = entlist[j]; *ents != '\0'; ents += i) {

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding if (strncmp(s + 1, ents, j) == 0) {

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding break;

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding }

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding }

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding if (*ents == '\0') {

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding *p = '&'; /* unknown */

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding }

450fd97bdb54ac69e2cb552f034697a10868be3cbrianp else {

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding *p = RAW_ASCII_CHAR(((const unsigned char *) ents)[j]);

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding s += i;

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding }

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding }

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding }

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding *p = '\0';

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding}

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding#define SKIP_TAG_WHITESPACE(ptr) while ((*ptr != '\0') && (apr_isspace (*ptr))) ptr++

450fd97bdb54ac69e2cb552f034697a10868be3cbrianp

450fd97bdb54ac69e2cb552f034697a10868be3cbrianpstatic void ap_ssi_get_tag_and_value(include_ctx_t *ctx, char **tag,

450fd97bdb54ac69e2cb552f034697a10868be3cbrianp char **tag_val, int dodecode)

450fd97bdb54ac69e2cb552f034697a10868be3cbrianp{

450fd97bdb54ac69e2cb552f034697a10868be3cbrianp char *c = ctx->curr_tag_pos;

450fd97bdb54ac69e2cb552f034697a10868be3cbrianp int shift_val = 0;

450fd97bdb54ac69e2cb552f034697a10868be3cbrianp char term = '\0';

450fd97bdb54ac69e2cb552f034697a10868be3cbrianp

450fd97bdb54ac69e2cb552f034697a10868be3cbrianp *tag_val = NULL;

450fd97bdb54ac69e2cb552f034697a10868be3cbrianp SKIP_TAG_WHITESPACE(c);

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding *tag = c; /* First non-whitespace character (could be NULL). */

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding while ((*c != '\0') && (*c != '=') && (!apr_isspace(*c))) {

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding *c = apr_tolower(*c); /* find end of tag, lowercasing as we go... */

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding c++;

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding }

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding if ((*c == '\0') || (**tag == '=')) {

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding if ((**tag == '\0') || (**tag == '=')) {

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding *tag = NULL;

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding }

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding ctx->curr_tag_pos = c;

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding return; /* We have found the end of the buffer. */

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding } /* We might have a tag, but definitely no value. */

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding if (*c == '=') {

10a4cdd68ef1ca0e54af296fe1d08ac00150c90bwrowe *c++ = '\0'; /* Overwrite the '=' with a terminating byte after tag. */

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding }

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding else { /* Try skipping WS to find the '='. */

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding *c++ = '\0'; /* Terminate the tag... */

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding SKIP_TAG_WHITESPACE(c);

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding /* There needs to be an equal sign if there's a value. */

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding if (*c != '=') {

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding ctx->curr_tag_pos = c;

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding return; /* There apparently was no value. */

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding }

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding else {

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding c++; /* Skip the equals sign. */

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding }

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding }

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding SKIP_TAG_WHITESPACE(c);

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding if (*c == '"' || *c == '\'') {

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding /* Allow quoted values for space inclusion. */

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding term = *c++; /* NOTE: This does not pass the quotes on return. */

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding }

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding *tag_val = c;

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding while ((*c != '\0') &&

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding (((term != '\0') && (*c != term)) ||

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding ((term == '\0') && (!apr_isspace(*c))))) {

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding if (*c == '\\') { /* Accept \" and \' as valid char in string. */

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding c++;

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding if (*c == term) { /* Overwrite the "\" during the embedded */

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding shift_val++; /* escape sequence of '\"' or "\'". Shift */

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding } /* bytes from here to next delimiter. */

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding if (shift_val > 0) {

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding *(c-shift_val) = *c;

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding }

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding }

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding c++;

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding if (shift_val > 0) {

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding *(c-shift_val) = *c;

18343797fadabacf01280b38ea7688690d12aec0rbb }

18343797fadabacf01280b38ea7688690d12aec0rbb }

18343797fadabacf01280b38ea7688690d12aec0rbb

18343797fadabacf01280b38ea7688690d12aec0rbb *(c-shift_val) = '\0'; /* Overwrites delimiter (term or WS) with NULL. */

18343797fadabacf01280b38ea7688690d12aec0rbb ctx->curr_tag_pos = ++c;

da56a2fee56858b4005bd37448e2cb083b54fdf8wrowe if (dodecode) {

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding decodehtml(*tag_val);

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding }

18343797fadabacf01280b38ea7688690d12aec0rbb

18343797fadabacf01280b38ea7688690d12aec0rbb return;

445997e06464e7625c7f0e22917f8f2d9876cfffrbb}

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding

0f081398cf0eef8cc7c66a535d450110a92dc8aefieldingstatic void ap_ssi_parse_string(request_rec *r, const char *in, char *out,

18343797fadabacf01280b38ea7688690d12aec0rbb size_t length, int leave_name)

18343797fadabacf01280b38ea7688690d12aec0rbb{

18343797fadabacf01280b38ea7688690d12aec0rbb char ch;

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding char *next = out;

0f6deff8fa9ad63fc576e8d91efc1d9afd068eccbrianp char *end_out;

0f6deff8fa9ad63fc576e8d91efc1d9afd068eccbrianp

0f6deff8fa9ad63fc576e8d91efc1d9afd068eccbrianp /* leave room for nul terminator */

0f6deff8fa9ad63fc576e8d91efc1d9afd068eccbrianp end_out = out + length - 1;

0f6deff8fa9ad63fc576e8d91efc1d9afd068eccbrianp

18343797fadabacf01280b38ea7688690d12aec0rbb while ((ch = *in++) != '\0') {

47d7b9019e57fbf3eaa4d2b19bbbcce087dd8389rbb switch (ch) {

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding case '\\':

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding if (next == end_out) {

18343797fadabacf01280b38ea7688690d12aec0rbb /* truncated */

18343797fadabacf01280b38ea7688690d12aec0rbb *next = '\0';

18343797fadabacf01280b38ea7688690d12aec0rbb return;

47d7b9019e57fbf3eaa4d2b19bbbcce087dd8389rbb }

18343797fadabacf01280b38ea7688690d12aec0rbb if (*in == '$') {

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz *next++ = *in++;

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz }

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding else {

18343797fadabacf01280b38ea7688690d12aec0rbb *next++ = ch;

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz }

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding break;

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz case '$':

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz {

18343797fadabacf01280b38ea7688690d12aec0rbb const char *start_of_var_name;

18343797fadabacf01280b38ea7688690d12aec0rbb char *end_of_var_name; /* end of var name + 1 */

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz const char *expansion, *temp_end, *val;

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz char tmp_store;

18343797fadabacf01280b38ea7688690d12aec0rbb size_t l;

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz

47d7b9019e57fbf3eaa4d2b19bbbcce087dd8389rbb /* guess that the expansion won't happen */

18343797fadabacf01280b38ea7688690d12aec0rbb expansion = in - 1;

18343797fadabacf01280b38ea7688690d12aec0rbb if (*in == '{') {

18343797fadabacf01280b38ea7688690d12aec0rbb ++in;

18343797fadabacf01280b38ea7688690d12aec0rbb start_of_var_name = in;

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding in = ap_strchr_c(in, '}');

18343797fadabacf01280b38ea7688690d12aec0rbb if (in == NULL) {

da56a2fee56858b4005bd37448e2cb083b54fdf8wrowe ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR,

da56a2fee56858b4005bd37448e2cb083b54fdf8wrowe 0, r, "Missing '}' on variable \"%s\"",

da56a2fee56858b4005bd37448e2cb083b54fdf8wrowe expansion);

da56a2fee56858b4005bd37448e2cb083b54fdf8wrowe *next = '\0';

da56a2fee56858b4005bd37448e2cb083b54fdf8wrowe return;

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding }

18343797fadabacf01280b38ea7688690d12aec0rbb temp_end = in;

18343797fadabacf01280b38ea7688690d12aec0rbb end_of_var_name = (char *)temp_end;

18343797fadabacf01280b38ea7688690d12aec0rbb ++in;

18343797fadabacf01280b38ea7688690d12aec0rbb }

18343797fadabacf01280b38ea7688690d12aec0rbb else {

da56a2fee56858b4005bd37448e2cb083b54fdf8wrowe start_of_var_name = in;

da56a2fee56858b4005bd37448e2cb083b54fdf8wrowe while (apr_isalnum(*in) || *in == '_') {

da56a2fee56858b4005bd37448e2cb083b54fdf8wrowe ++in;

da56a2fee56858b4005bd37448e2cb083b54fdf8wrowe }

da56a2fee56858b4005bd37448e2cb083b54fdf8wrowe temp_end = in;

da56a2fee56858b4005bd37448e2cb083b54fdf8wrowe end_of_var_name = (char *)temp_end;

da56a2fee56858b4005bd37448e2cb083b54fdf8wrowe }

47d7b9019e57fbf3eaa4d2b19bbbcce087dd8389rbb /* what a pain, too bad there's no table_getn where you can

da56a2fee56858b4005bd37448e2cb083b54fdf8wrowe l = end_of_var_name - start_of_var_name;

da56a2fee56858b4005bd37448e2cb083b54fdf8wrowe if (l != 0) {

18343797fadabacf01280b38ea7688690d12aec0rbb tmp_store = *end_of_var_name;

18343797fadabacf01280b38ea7688690d12aec0rbb *end_of_var_name = '\0';

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding val = get_include_var(r, start_of_var_name);

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding *end_of_var_name = tmp_store;

18343797fadabacf01280b38ea7688690d12aec0rbb

18343797fadabacf01280b38ea7688690d12aec0rbb if (val) {

18343797fadabacf01280b38ea7688690d12aec0rbb expansion = val;

18343797fadabacf01280b38ea7688690d12aec0rbb l = strlen(expansion);

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding }

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding else if (leave_name) {

18343797fadabacf01280b38ea7688690d12aec0rbb l = in - expansion;

ff2fef0d709ee06646b3462cd3ef39648a54c7f7jwoolley }

ff2fef0d709ee06646b3462cd3ef39648a54c7f7jwoolley else {

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding /* no expansion to be done */

18343797fadabacf01280b38ea7688690d12aec0rbb break;

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding }

18343797fadabacf01280b38ea7688690d12aec0rbb }

18343797fadabacf01280b38ea7688690d12aec0rbb else {

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding /* zero-length variable name causes just the $ to be

7f7ba3f0537003a359c42170aee14a101d7fe917brianp l = 1;

7f7ba3f0537003a359c42170aee14a101d7fe917brianp }

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding l = ((int)l > end_out - next) ? (end_out - next) : l;

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding memcpy(next, expansion, l);

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding next += l;

7f7ba3f0537003a359c42170aee14a101d7fe917brianp break;

7f7ba3f0537003a359c42170aee14a101d7fe917brianp }

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding default:

7f7ba3f0537003a359c42170aee14a101d7fe917brianp if (next == end_out) {

7f7ba3f0537003a359c42170aee14a101d7fe917brianp /* truncated */

7f7ba3f0537003a359c42170aee14a101d7fe917brianp *next = '\0';

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding return;

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding }

7f7ba3f0537003a359c42170aee14a101d7fe917brianp *next++ = ch;

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding break;

7f7ba3f0537003a359c42170aee14a101d7fe917brianp }

7f7ba3f0537003a359c42170aee14a101d7fe917brianp }

7f7ba3f0537003a359c42170aee14a101d7fe917brianp *next = '\0';

7f7ba3f0537003a359c42170aee14a101d7fe917brianp return;

7f7ba3f0537003a359c42170aee14a101d7fe917brianp}

7f7ba3f0537003a359c42170aee14a101d7fe917brianp

7f7ba3f0537003a359c42170aee14a101d7fe917brianp

0f081398cf0eef8cc7c66a535d450110a92dc8aefieldingstatic int is_only_below(const char *path)

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding{

7f7ba3f0537003a359c42170aee14a101d7fe917brianp#ifdef HAVE_DRIVE_LETTERS

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding if (path[1] == ':')

7f7ba3f0537003a359c42170aee14a101d7fe917brianp return 0;

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding#endif

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding#ifdef NETWARE

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding if (strchr(path, ':'))

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz return 0;

7f7ba3f0537003a359c42170aee14a101d7fe917brianp#endif

7f7ba3f0537003a359c42170aee14a101d7fe917brianp if (path[0] == '/') {

7f7ba3f0537003a359c42170aee14a101d7fe917brianp return 0;

7f7ba3f0537003a359c42170aee14a101d7fe917brianp }

7f7ba3f0537003a359c42170aee14a101d7fe917brianp while (*path) {

7f7ba3f0537003a359c42170aee14a101d7fe917brianp int dots = 0;

7f7ba3f0537003a359c42170aee14a101d7fe917brianp while (path[dots] == '.')

7f7ba3f0537003a359c42170aee14a101d7fe917brianp ++dots;

7f7ba3f0537003a359c42170aee14a101d7fe917brianp#if defined(WIN32)

7f7ba3f0537003a359c42170aee14a101d7fe917brianp /* If the name is canonical this is redundant

7f7ba3f0537003a359c42170aee14a101d7fe917brianp if (dots > 1 && (!path[dots] || path[dots] == '/'))

7f7ba3f0537003a359c42170aee14a101d7fe917brianp return 0;

7f7ba3f0537003a359c42170aee14a101d7fe917brianp#else

7f7ba3f0537003a359c42170aee14a101d7fe917brianp if (dots == 2 && (!path[dots] || path[dots] == '/'))

7f7ba3f0537003a359c42170aee14a101d7fe917brianp return 0;

7f7ba3f0537003a359c42170aee14a101d7fe917brianp#endif

7f7ba3f0537003a359c42170aee14a101d7fe917brianp path += dots;

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz while (*path && *(path++) != '/')

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding ++path;

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding }

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding return 1;

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding}

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding

0f081398cf0eef8cc7c66a535d450110a92dc8aefieldingstatic int handle_include(include_ctx_t *ctx, apr_bucket_brigade **bb,

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding request_rec *r, ap_filter_t *f, apr_bucket *head_ptr,

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding apr_bucket **inserted_head)

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding{

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz char *tag = NULL;

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz char *tag_val = NULL;

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz apr_bucket *tmp_buck;

18343797fadabacf01280b38ea7688690d12aec0rbb char parsed_string[MAX_STRING_LEN];

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz int loglevel = APLOG_ERR;

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz *inserted_head = NULL;

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz if (ctx->flags & FLAG_PRINTING) {

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz while (1) {

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz ap_ssi_get_tag_and_value(ctx, &tag, &tag_val, 1);

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz if (tag_val == NULL) {

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz if (tag == NULL) {

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz return (0);

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding }

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz else {

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz return (1);

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding }

7f7ba3f0537003a359c42170aee14a101d7fe917brianp }

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding if (!strcmp(tag, "file") || !strcmp(tag, "virtual")) {

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz request_rec *rr = NULL;

87e9aee98265a06128c8ae448967fe98e271cce0trawick char *error_fmt = NULL;

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz ap_ssi_parse_string(r, tag_val, parsed_string,

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz sizeof(parsed_string), 0);

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz if (tag[0] == 'f') {

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz /* XXX: Port to apr_filepath_merge

87e9aee98265a06128c8ae448967fe98e271cce0trawick if (!is_only_below(parsed_string)) {

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz error_fmt = "unable to include file \"%s\" "

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz "in parsed file %s";

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz }

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz else {

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz rr = ap_sub_req_lookup_file(parsed_string, r, f->next);

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz }

445997e06464e7625c7f0e22917f8f2d9876cfffrbb }

445997e06464e7625c7f0e22917f8f2d9876cfffrbb else {

c6a9d49433c9ba5b18b26c3d764f1bbcb9746090wrowe rr = ap_sub_req_lookup_uri(parsed_string, r, f->next);

445997e06464e7625c7f0e22917f8f2d9876cfffrbb }

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz if (!error_fmt && rr->status != HTTP_OK) {

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz error_fmt = "unable to include \"%s\" in parsed file %s";

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz }

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz if (!error_fmt && (ctx->flags & FLAG_NO_EXEC) &&

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz rr->content_type &&

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz (strncmp(rr->content_type, "text/", 5))) {

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz error_fmt = "unable to include potential exec \"%s\" "

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz "in parsed file %s";

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz }

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz if (error_fmt == NULL) {

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz /* try to avoid recursive includes. We do this by walking

7f7ba3f0537003a359c42170aee14a101d7fe917brianp int founddupe = 0;

7f7ba3f0537003a359c42170aee14a101d7fe917brianp request_rec *p;

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz for (p = r; p != NULL && !founddupe; p = p->main) {

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz request_rec *q;

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz for (q = p; q != NULL; q = q->prev) {

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding if ((q->filename && rr->filename &&

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding (strcmp(q->filename, rr->filename) == 0)) ||

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding ((*q->uri == '/') &&

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz (strcmp(q->uri, rr->uri) == 0)))

7f7ba3f0537003a359c42170aee14a101d7fe917brianp {

7f7ba3f0537003a359c42170aee14a101d7fe917brianp founddupe = 1;

7f7ba3f0537003a359c42170aee14a101d7fe917brianp break;

7f7ba3f0537003a359c42170aee14a101d7fe917brianp }

7f7ba3f0537003a359c42170aee14a101d7fe917brianp }

7f7ba3f0537003a359c42170aee14a101d7fe917brianp }

7f7ba3f0537003a359c42170aee14a101d7fe917brianp

7f7ba3f0537003a359c42170aee14a101d7fe917brianp if (p != NULL) {

7f7ba3f0537003a359c42170aee14a101d7fe917brianp error_fmt = "Recursive include of \"%s\" "

7f7ba3f0537003a359c42170aee14a101d7fe917brianp "in parsed file %s";

7f7ba3f0537003a359c42170aee14a101d7fe917brianp }

7f7ba3f0537003a359c42170aee14a101d7fe917brianp }

7f7ba3f0537003a359c42170aee14a101d7fe917brianp

7f7ba3f0537003a359c42170aee14a101d7fe917brianp /* See the Kludge in send_parsed_file for why */

7f7ba3f0537003a359c42170aee14a101d7fe917brianp /* Basically, it puts a bread crumb in here, then looks */

7f7ba3f0537003a359c42170aee14a101d7fe917brianp /* for the crumb later to see if its been here. */

7f7ba3f0537003a359c42170aee14a101d7fe917brianp if (rr)

7f7ba3f0537003a359c42170aee14a101d7fe917brianp ap_set_module_config(rr->request_config,

7f7ba3f0537003a359c42170aee14a101d7fe917brianp &include_module, r);

7f7ba3f0537003a359c42170aee14a101d7fe917brianp

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz if (!error_fmt) {

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding int rv;

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding apr_status_t rc = APR_SUCCESS;

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding SPLIT_AND_PASS_PRETAG_BUCKETS(*bb, ctx, f->next, rc);

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding if (rc != APR_SUCCESS) {

7f7ba3f0537003a359c42170aee14a101d7fe917brianp return rc;

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding }

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding if ((rv = ap_run_sub_req(rr))) {

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding if (APR_STATUS_IS_EPIPE(rv)) {

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding /* let's not clutter the log on a busy server */

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding loglevel = APLOG_INFO;

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding }

5915dc3ebb03935b18b0d14088278d22eefe3553wrowe error_fmt =

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding "unable to include \"%s\" in parsed file %s";

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding }

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding }

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding if (error_fmt) {

50e59a535cafd083838a173aedf9cfa6917d016dwrowe ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|loglevel,

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz 0, r, error_fmt, tag_val, r->filename);

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding CREATE_ERROR_BUCKET(ctx, tmp_buck, head_ptr,

50e59a535cafd083838a173aedf9cfa6917d016dwrowe *inserted_head);

f7e94f9555c0632e8a290a7e76d778e8c7daf425jerenkrantz }

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz

50e59a535cafd083838a173aedf9cfa6917d016dwrowe /* destroy the sub request */

50e59a535cafd083838a173aedf9cfa6917d016dwrowe if (rr != NULL) {

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz ap_destroy_sub_req(rr);

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding }

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding }

50e59a535cafd083838a173aedf9cfa6917d016dwrowe else {

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

50e59a535cafd083838a173aedf9cfa6917d016dwrowe "unknown parameter \"%s\" to tag include in %s",

50e59a535cafd083838a173aedf9cfa6917d016dwrowe tag, r->filename);

50e59a535cafd083838a173aedf9cfa6917d016dwrowe CREATE_ERROR_BUCKET(ctx, tmp_buck, head_ptr, *inserted_head);

50e59a535cafd083838a173aedf9cfa6917d016dwrowe }

50e59a535cafd083838a173aedf9cfa6917d016dwrowe }

50e59a535cafd083838a173aedf9cfa6917d016dwrowe }

50e59a535cafd083838a173aedf9cfa6917d016dwrowe return 0;

50e59a535cafd083838a173aedf9cfa6917d016dwrowe}

50e59a535cafd083838a173aedf9cfa6917d016dwrowe

50e59a535cafd083838a173aedf9cfa6917d016dwrowe

50e59a535cafd083838a173aedf9cfa6917d016dwrowestatic int handle_echo(include_ctx_t *ctx, apr_bucket_brigade **bb,

50e59a535cafd083838a173aedf9cfa6917d016dwrowe request_rec *r, ap_filter_t *f, apr_bucket *head_ptr,

50e59a535cafd083838a173aedf9cfa6917d016dwrowe apr_bucket **inserted_head)

50e59a535cafd083838a173aedf9cfa6917d016dwrowe{

50e59a535cafd083838a173aedf9cfa6917d016dwrowe char *tag = NULL;

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding char *tag_val = NULL;

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding const char *echo_text = NULL;

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding apr_bucket *tmp_buck;

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding apr_size_t e_len;

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz enum {E_NONE, E_URL, E_ENTITY} encode;

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz encode = E_ENTITY;

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding

18343797fadabacf01280b38ea7688690d12aec0rbb *inserted_head = NULL;

18343797fadabacf01280b38ea7688690d12aec0rbb if (ctx->flags & FLAG_PRINTING) {

b980ad7fdc218b4855cde9f75a747527f50c554dwrowe while (1) {

7f7ba3f0537003a359c42170aee14a101d7fe917brianp ap_ssi_get_tag_and_value(ctx, &tag, &tag_val, 1);

374e2f2d7ee8274b53fddb0d4e3270105377b868gregames if (tag_val == NULL) {

cbd8d35ca8d9780f1081f30ebfe4abda44cab7ebianh if (tag != NULL) {

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding return 1;

18343797fadabacf01280b38ea7688690d12aec0rbb }

18343797fadabacf01280b38ea7688690d12aec0rbb else {

18343797fadabacf01280b38ea7688690d12aec0rbb return 0;

445997e06464e7625c7f0e22917f8f2d9876cfffrbb }

18343797fadabacf01280b38ea7688690d12aec0rbb }

18343797fadabacf01280b38ea7688690d12aec0rbb if (!strcmp(tag, "var")) {

18343797fadabacf01280b38ea7688690d12aec0rbb const char *val = get_include_var(r, tag_val);

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding if (val) {

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding switch(encode) {

18343797fadabacf01280b38ea7688690d12aec0rbb case E_NONE:

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding echo_text = val;

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding break;

c815e1cfb2ec4db2e1a94fafd77de045d7fd93dbbrianp case E_URL:

18343797fadabacf01280b38ea7688690d12aec0rbb echo_text = ap_escape_uri(r->pool, val);

18343797fadabacf01280b38ea7688690d12aec0rbb break;

cbd8d35ca8d9780f1081f30ebfe4abda44cab7ebianh case E_ENTITY:

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding echo_text = ap_escape_html(r->pool, val);

cbd8d35ca8d9780f1081f30ebfe4abda44cab7ebianh break;

cbd8d35ca8d9780f1081f30ebfe4abda44cab7ebianh }

cbd8d35ca8d9780f1081f30ebfe4abda44cab7ebianh

cbd8d35ca8d9780f1081f30ebfe4abda44cab7ebianh e_len = strlen(echo_text);

cbd8d35ca8d9780f1081f30ebfe4abda44cab7ebianh /* XXX: it'd probably be nice to use a pool bucket here */

7f7ba3f0537003a359c42170aee14a101d7fe917brianp tmp_buck = apr_bucket_heap_create(echo_text, e_len, 1);

7f7ba3f0537003a359c42170aee14a101d7fe917brianp }

18343797fadabacf01280b38ea7688690d12aec0rbb else {

5915dc3ebb03935b18b0d14088278d22eefe3553wrowe tmp_buck = apr_bucket_immortal_create("(none)",

5915dc3ebb03935b18b0d14088278d22eefe3553wrowe sizeof("(none)")-1);

5915dc3ebb03935b18b0d14088278d22eefe3553wrowe }

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz APR_BUCKET_INSERT_BEFORE(head_ptr, tmp_buck);

18343797fadabacf01280b38ea7688690d12aec0rbb if (*inserted_head == NULL) {

18343797fadabacf01280b38ea7688690d12aec0rbb *inserted_head = tmp_buck;

18343797fadabacf01280b38ea7688690d12aec0rbb }

18343797fadabacf01280b38ea7688690d12aec0rbb }

18343797fadabacf01280b38ea7688690d12aec0rbb else if (!strcmp(tag, "encoding")) {

18343797fadabacf01280b38ea7688690d12aec0rbb if (!strcasecmp(tag_val, "none")) encode = E_NONE;

18343797fadabacf01280b38ea7688690d12aec0rbb else if (!strcasecmp(tag_val, "url")) encode = E_URL;

18343797fadabacf01280b38ea7688690d12aec0rbb else if (!strcasecmp(tag_val, "entity")) encode = E_ENTITY;

18343797fadabacf01280b38ea7688690d12aec0rbb else {

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

cbd8d35ca8d9780f1081f30ebfe4abda44cab7ebianh "unknown value \"%s\" to parameter \"encoding\" of "

cbd8d35ca8d9780f1081f30ebfe4abda44cab7ebianh "tag echo in %s", tag_val, r->filename);

cbd8d35ca8d9780f1081f30ebfe4abda44cab7ebianh CREATE_ERROR_BUCKET(ctx, tmp_buck, head_ptr,

cbd8d35ca8d9780f1081f30ebfe4abda44cab7ebianh *inserted_head);

18343797fadabacf01280b38ea7688690d12aec0rbb }

18343797fadabacf01280b38ea7688690d12aec0rbb }

18343797fadabacf01280b38ea7688690d12aec0rbb else {

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

18343797fadabacf01280b38ea7688690d12aec0rbb "unknown parameter \"%s\" in tag echo of %s",

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz tag, r->filename);

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz CREATE_ERROR_BUCKET(ctx, tmp_buck, head_ptr, *inserted_head);

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz }

18343797fadabacf01280b38ea7688690d12aec0rbb

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding }

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding }

18343797fadabacf01280b38ea7688690d12aec0rbb return 0;

93780c0e38edba46c1be32fd4c31c344c0a57286jwoolley}

93780c0e38edba46c1be32fd4c31c344c0a57286jwoolley

93780c0e38edba46c1be32fd4c31c344c0a57286jwoolleystatic int handle_config(include_ctx_t *ctx, apr_bucket_brigade **bb,

93780c0e38edba46c1be32fd4c31c344c0a57286jwoolley request_rec *r, ap_filter_t *f, apr_bucket *head_ptr,

93780c0e38edba46c1be32fd4c31c344c0a57286jwoolley apr_bucket **inserted_head)

97b2451ce8e896e30c696d01ad11ef8d7c815881wrowe{

93780c0e38edba46c1be32fd4c31c344c0a57286jwoolley char *tag = NULL;

93780c0e38edba46c1be32fd4c31c344c0a57286jwoolley char *tag_val = NULL;

93780c0e38edba46c1be32fd4c31c344c0a57286jwoolley char parsed_string[MAX_STRING_LEN];

93780c0e38edba46c1be32fd4c31c344c0a57286jwoolley apr_table_t *env = r->subprocess_env;

93780c0e38edba46c1be32fd4c31c344c0a57286jwoolley

93780c0e38edba46c1be32fd4c31c344c0a57286jwoolley *inserted_head = NULL;

93780c0e38edba46c1be32fd4c31c344c0a57286jwoolley if (ctx->flags & FLAG_PRINTING) {

93780c0e38edba46c1be32fd4c31c344c0a57286jwoolley while (1) {

93780c0e38edba46c1be32fd4c31c344c0a57286jwoolley ap_ssi_get_tag_and_value(ctx, &tag, &tag_val, 0);

93780c0e38edba46c1be32fd4c31c344c0a57286jwoolley if (tag_val == NULL) {

93780c0e38edba46c1be32fd4c31c344c0a57286jwoolley if (tag == NULL) {

93780c0e38edba46c1be32fd4c31c344c0a57286jwoolley return 0; /* Reached the end of the string. */

93780c0e38edba46c1be32fd4c31c344c0a57286jwoolley }

93780c0e38edba46c1be32fd4c31c344c0a57286jwoolley else {

18343797fadabacf01280b38ea7688690d12aec0rbb return 1; /* tags must have values. */

18343797fadabacf01280b38ea7688690d12aec0rbb }

93780c0e38edba46c1be32fd4c31c344c0a57286jwoolley }

93780c0e38edba46c1be32fd4c31c344c0a57286jwoolley if (!strcmp(tag, "errmsg")) {

93780c0e38edba46c1be32fd4c31c344c0a57286jwoolley if (ctx->error_str_override == NULL) {

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz ctx->error_str_override = (char *)apr_palloc(ctx->pool,

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz MAX_STRING_LEN);

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz ctx->error_str = ctx->error_str_override;

93780c0e38edba46c1be32fd4c31c344c0a57286jwoolley }

93780c0e38edba46c1be32fd4c31c344c0a57286jwoolley ap_ssi_parse_string(r, tag_val, ctx->error_str_override,

93780c0e38edba46c1be32fd4c31c344c0a57286jwoolley MAX_STRING_LEN, 0);

93780c0e38edba46c1be32fd4c31c344c0a57286jwoolley }

93780c0e38edba46c1be32fd4c31c344c0a57286jwoolley else if (!strcmp(tag, "timefmt")) {

93780c0e38edba46c1be32fd4c31c344c0a57286jwoolley apr_time_t date = r->request_time;

18343797fadabacf01280b38ea7688690d12aec0rbb if (ctx->time_str_override == NULL) {

18343797fadabacf01280b38ea7688690d12aec0rbb ctx->time_str_override = (char *)apr_palloc(ctx->pool,

18343797fadabacf01280b38ea7688690d12aec0rbb MAX_STRING_LEN);

18343797fadabacf01280b38ea7688690d12aec0rbb ctx->time_str = ctx->time_str_override;

18343797fadabacf01280b38ea7688690d12aec0rbb }

18343797fadabacf01280b38ea7688690d12aec0rbb ap_ssi_parse_string(r, tag_val, ctx->time_str_override,

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding MAX_STRING_LEN, 0);

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz apr_table_setn(env, "DATE_LOCAL", ap_ht_time(r->pool, date,

18343797fadabacf01280b38ea7688690d12aec0rbb ctx->time_str, 0));

18343797fadabacf01280b38ea7688690d12aec0rbb apr_table_setn(env, "DATE_GMT", ap_ht_time(r->pool, date,

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz ctx->time_str, 1));

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz apr_table_setn(env, "LAST_MODIFIED",

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz ap_ht_time(r->pool, r->finfo.mtime,

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding ctx->time_str, 0));

18343797fadabacf01280b38ea7688690d12aec0rbb }

374e2f2d7ee8274b53fddb0d4e3270105377b868gregames else if (!strcmp(tag, "sizefmt")) {

cbd8d35ca8d9780f1081f30ebfe4abda44cab7ebianh ap_ssi_parse_string(r, tag_val, parsed_string,

cbd8d35ca8d9780f1081f30ebfe4abda44cab7ebianh sizeof(parsed_string), 0);

374e2f2d7ee8274b53fddb0d4e3270105377b868gregames decodehtml(parsed_string);

374e2f2d7ee8274b53fddb0d4e3270105377b868gregames if (!strcmp(parsed_string, "bytes")) {

374e2f2d7ee8274b53fddb0d4e3270105377b868gregames ctx->flags |= FLAG_SIZE_IN_BYTES;

374e2f2d7ee8274b53fddb0d4e3270105377b868gregames }

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz else if (!strcmp(parsed_string, "abbrev")) {

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz ctx->flags &= FLAG_SIZE_ABBREV;

18343797fadabacf01280b38ea7688690d12aec0rbb }

18343797fadabacf01280b38ea7688690d12aec0rbb }

18343797fadabacf01280b38ea7688690d12aec0rbb else {

374e2f2d7ee8274b53fddb0d4e3270105377b868gregames apr_bucket *tmp_buck;

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz

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

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz "unknown parameter \"%s\" to tag config in %s",

1f89ef1594d8a552f81e775be55cb9baeab32b77trawick tag, r->filename);

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding CREATE_ERROR_BUCKET(ctx, tmp_buck, head_ptr, *inserted_head);

ba00c3b7c20f00ce631b89ae3b1cd3bae8d1b165rbb }

ba00c3b7c20f00ce631b89ae3b1cd3bae8d1b165rbb }

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz }

18343797fadabacf01280b38ea7688690d12aec0rbb return 0;

18343797fadabacf01280b38ea7688690d12aec0rbb}

18343797fadabacf01280b38ea7688690d12aec0rbb

18343797fadabacf01280b38ea7688690d12aec0rbb

18343797fadabacf01280b38ea7688690d12aec0rbbstatic int find_file(request_rec *r, const char *directive, const char *tag,

18343797fadabacf01280b38ea7688690d12aec0rbb char *tag_val, apr_finfo_t *finfo)

18343797fadabacf01280b38ea7688690d12aec0rbb{

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding char *to_send = tag_val;

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding request_rec *rr = NULL;

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding int ret=0;

18343797fadabacf01280b38ea7688690d12aec0rbb char *error_fmt = NULL;

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding apr_status_t rv = APR_SUCCESS;

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding if (!strcmp(tag, "file")) {

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz /* XXX: Port to apr_filepath_merge

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding if (!is_only_below(tag_val)) {

18343797fadabacf01280b38ea7688690d12aec0rbb error_fmt = "unable to access file \"%s\" "

18343797fadabacf01280b38ea7688690d12aec0rbb "in parsed file %s";

18343797fadabacf01280b38ea7688690d12aec0rbb }

b980ad7fdc218b4855cde9f75a747527f50c554dwrowe else {

17bdb8862482dff763afd4d86a58de533afff4cajwoolley ap_getparents(tag_val); /* get rid of any nasties */

3a9bc6532fbe8439fc748d8ffedb87415904d16ajim

3a9bc6532fbe8439fc748d8ffedb87415904d16ajim /* note: it is okay to pass NULL for the "next filter" since

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding rr = ap_sub_req_lookup_file(tag_val, r, NULL);

18343797fadabacf01280b38ea7688690d12aec0rbb

18343797fadabacf01280b38ea7688690d12aec0rbb if (rr->status == HTTP_OK && rr->finfo.filetype != 0) {

18343797fadabacf01280b38ea7688690d12aec0rbb to_send = rr->filename;

445997e06464e7625c7f0e22917f8f2d9876cfffrbb if ((rv = apr_stat(finfo, to_send,

18343797fadabacf01280b38ea7688690d12aec0rbb APR_FINFO_GPROT | APR_FINFO_MIN, rr->pool)) != APR_SUCCESS

18343797fadabacf01280b38ea7688690d12aec0rbb && rv != APR_INCOMPLETE) {

18343797fadabacf01280b38ea7688690d12aec0rbb error_fmt = "unable to get information about \"%s\" "

18343797fadabacf01280b38ea7688690d12aec0rbb "in parsed file %s";

18343797fadabacf01280b38ea7688690d12aec0rbb }

18343797fadabacf01280b38ea7688690d12aec0rbb }

18343797fadabacf01280b38ea7688690d12aec0rbb else {

18343797fadabacf01280b38ea7688690d12aec0rbb error_fmt = "unable to lookup information about \"%s\" "

18343797fadabacf01280b38ea7688690d12aec0rbb "in parsed file %s";

c6a9d49433c9ba5b18b26c3d764f1bbcb9746090wrowe }

18343797fadabacf01280b38ea7688690d12aec0rbb }

18343797fadabacf01280b38ea7688690d12aec0rbb

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz if (error_fmt) {

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz ret = -1;

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz ap_log_rerror(APLOG_MARK, APLOG_ERR | (rv ? 0 : APLOG_NOERRNO),

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz rv, r, error_fmt, to_send, r->filename);

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz }

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz if (rr) ap_destroy_sub_req(rr);

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz return ret;

7c19ce86bbd72bba1d018522250f5f315ffbc0afjerenkrantz }

18343797fadabacf01280b38ea7688690d12aec0rbb else if (!strcmp(tag, "virtual")) {

18343797fadabacf01280b38ea7688690d12aec0rbb /* note: it is okay to pass NULL for the "next filter" since

69a92d756d879367994763ac2d87392dfc3766f3brianp rr = ap_sub_req_lookup_uri(tag_val, r, NULL);

18343797fadabacf01280b38ea7688690d12aec0rbb

18343797fadabacf01280b38ea7688690d12aec0rbb if (rr->status == HTTP_OK && rr->finfo.filetype != 0) {

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz memcpy((char *) finfo, (const char *) &rr->finfo,

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz sizeof(rr->finfo));

18343797fadabacf01280b38ea7688690d12aec0rbb ap_destroy_sub_req(rr);

b980ad7fdc218b4855cde9f75a747527f50c554dwrowe return 0;

18343797fadabacf01280b38ea7688690d12aec0rbb }

18343797fadabacf01280b38ea7688690d12aec0rbb else {

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

18343797fadabacf01280b38ea7688690d12aec0rbb "unable to get information about \"%s\" "

18343797fadabacf01280b38ea7688690d12aec0rbb "in parsed file %s",

18343797fadabacf01280b38ea7688690d12aec0rbb tag_val, r->filename);

18343797fadabacf01280b38ea7688690d12aec0rbb ap_destroy_sub_req(rr);

18343797fadabacf01280b38ea7688690d12aec0rbb return -1;

18343797fadabacf01280b38ea7688690d12aec0rbb }

18343797fadabacf01280b38ea7688690d12aec0rbb }

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz else {

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

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz "unknown parameter \"%s\" to tag %s in %s",

db4293b97cc224d79164c1c092b0267af5d883c5jerenkrantz tag, directive, r->filename);

18343797fadabacf01280b38ea7688690d12aec0rbb return -1;

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding }

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding}

18343797fadabacf01280b38ea7688690d12aec0rbb

18343797fadabacf01280b38ea7688690d12aec0rbbstatic int handle_fsize(include_ctx_t *ctx, apr_bucket_brigade **bb,

18343797fadabacf01280b38ea7688690d12aec0rbb request_rec *r, ap_filter_t *f, apr_bucket *head_ptr,

18343797fadabacf01280b38ea7688690d12aec0rbb apr_bucket **inserted_head)

0f081398cf0eef8cc7c66a535d450110a92dc8aefielding{

3a9bc6532fbe8439fc748d8ffedb87415904d16ajim char *tag = NULL;