mirror of
https://github.com/apache/httpd.git
synced 2025-08-15 23:27:39 +00:00
move mod_substitute from exp to filters
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@598651 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jim Jagielski
@ -1,258 +0,0 @@
|
||||
#
|
||||
# Declare the sub-directories to be built here
|
||||
#
|
||||
|
||||
SUBDIRS = \
|
||||
$(EOLIST)
|
||||
|
||||
#
|
||||
# Get the 'head' of the build environment. This includes default targets and
|
||||
# paths to tools
|
||||
#
|
||||
|
||||
include $(AP_WORK)\build\NWGNUhead.inc
|
||||
|
||||
#
|
||||
# build this level's files
|
||||
|
||||
#
|
||||
# Make sure all needed macro's are defined
|
||||
#
|
||||
|
||||
#
|
||||
# These directories will be at the beginning of the include list, followed by
|
||||
# INCDIRS
|
||||
#
|
||||
XINCDIRS += \
|
||||
$(AP_WORK)/include \
|
||||
$(NWOS) \
|
||||
$(AP_WORK)/modules/arch/netware \
|
||||
$(APR)/include \
|
||||
$(APRUTIL)/include \
|
||||
$(APR) \
|
||||
$(EOLIST)
|
||||
|
||||
#
|
||||
# These flags will come after CFLAGS
|
||||
#
|
||||
XCFLAGS += \
|
||||
$(EOLIST)
|
||||
|
||||
#
|
||||
# These defines will come after DEFINES
|
||||
#
|
||||
XDEFINES += \
|
||||
$(EOLIST)
|
||||
|
||||
#
|
||||
# These flags will be added to the link.opt file
|
||||
#
|
||||
XLFLAGS += \
|
||||
$(EOLIST)
|
||||
|
||||
#
|
||||
# These values will be appended to the correct variables based on the value of
|
||||
# RELEASE
|
||||
#
|
||||
ifeq "$(RELEASE)" "debug"
|
||||
XINCDIRS += \
|
||||
$(EOLIST)
|
||||
|
||||
XCFLAGS += \
|
||||
$(EOLIST)
|
||||
|
||||
XDEFINES += \
|
||||
$(EOLIST)
|
||||
|
||||
XLFLAGS += \
|
||||
$(EOLIST)
|
||||
endif
|
||||
|
||||
ifeq "$(RELEASE)" "noopt"
|
||||
XINCDIRS += \
|
||||
$(EOLIST)
|
||||
|
||||
XCFLAGS += \
|
||||
$(EOLIST)
|
||||
|
||||
XDEFINES += \
|
||||
$(EOLIST)
|
||||
|
||||
XLFLAGS += \
|
||||
$(EOLIST)
|
||||
endif
|
||||
|
||||
ifeq "$(RELEASE)" "release"
|
||||
XINCDIRS += \
|
||||
$(EOLIST)
|
||||
|
||||
XCFLAGS += \
|
||||
$(EOLIST)
|
||||
|
||||
XDEFINES += \
|
||||
$(EOLIST)
|
||||
|
||||
XLFLAGS += \
|
||||
$(EOLIST)
|
||||
endif
|
||||
|
||||
#
|
||||
# These are used by the link target if an NLM is being generated
|
||||
# This is used by the link 'name' directive to name the nlm. If left blank
|
||||
# TARGET_nlm (see below) will be used.
|
||||
#
|
||||
NLM_NAME = substitute
|
||||
|
||||
#
|
||||
# This is used by the link '-desc ' directive.
|
||||
# If left blank, NLM_NAME will be used.
|
||||
#
|
||||
NLM_DESCRIPTION = Apache $(VERSION_STR) Substitute Module
|
||||
|
||||
#
|
||||
# This is used by the '-threadname' directive. If left blank,
|
||||
# NLM_NAME Thread will be used.
|
||||
#
|
||||
NLM_THREAD_NAME = Substitute Module
|
||||
|
||||
#
|
||||
# If this is specified, it will override VERSION value in
|
||||
# $(AP_WORK)\build\NWGNUenvironment.inc
|
||||
#
|
||||
NLM_VERSION =
|
||||
|
||||
#
|
||||
# If this is specified, it will override the default of 64K
|
||||
#
|
||||
NLM_STACK_SIZE = 8192
|
||||
|
||||
|
||||
#
|
||||
# If this is specified it will be used by the link '-entry' directive
|
||||
#
|
||||
NLM_ENTRY_SYM = _LibCPrelude
|
||||
|
||||
#
|
||||
# If this is specified it will be used by the link '-exit' directive
|
||||
#
|
||||
NLM_EXIT_SYM = _LibCPostlude
|
||||
|
||||
#
|
||||
# If this is specified it will be used by the link '-check' directive
|
||||
#
|
||||
NLM_CHECK_SYM =
|
||||
|
||||
#
|
||||
# If these are specified it will be used by the link '-flags' directive
|
||||
#
|
||||
NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION
|
||||
|
||||
#
|
||||
# If this is specified it will be linked in with the XDCData option in the def
|
||||
# file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled
|
||||
# by setting APACHE_UNIPROC in the environment
|
||||
#
|
||||
XDCDATA =
|
||||
|
||||
#
|
||||
# If there is an NLM target, put it here
|
||||
#
|
||||
TARGET_nlm = \
|
||||
$(OBJDIR)/substitute.nlm \
|
||||
$(EOLIST)
|
||||
|
||||
#
|
||||
# If there is an LIB target, put it here
|
||||
#
|
||||
TARGET_lib = \
|
||||
$(EOLIST)
|
||||
|
||||
#
|
||||
# These are the OBJ files needed to create the NLM target above.
|
||||
# Paths must all use the '/' character
|
||||
#
|
||||
FILES_nlm_objs = \
|
||||
$(OBJDIR)/mod_substitute.o \
|
||||
$(EOLIST)
|
||||
|
||||
#
|
||||
# These are the LIB files needed to create the NLM target above.
|
||||
# These will be added as a library command in the link.opt file.
|
||||
#
|
||||
FILES_nlm_libs = \
|
||||
libcpre.o \
|
||||
$(EOLIST)
|
||||
|
||||
#
|
||||
# These are the modules that the above NLM target depends on to load.
|
||||
# These will be added as a module command in the link.opt file.
|
||||
#
|
||||
FILES_nlm_modules = \
|
||||
aprlib \
|
||||
libc \
|
||||
$(EOLIST)
|
||||
|
||||
#
|
||||
# If the nlm has a msg file, put it's path here
|
||||
#
|
||||
FILE_nlm_msg =
|
||||
|
||||
#
|
||||
# If the nlm has a hlp file put it's path here
|
||||
#
|
||||
FILE_nlm_hlp =
|
||||
|
||||
#
|
||||
# If this is specified, it will override $(NWOS)\copyright.txt.
|
||||
#
|
||||
FILE_nlm_copyright =
|
||||
|
||||
#
|
||||
# Any additional imports go here
|
||||
#
|
||||
FILES_nlm_Ximports = \
|
||||
@$(APR)/aprlib.imp \
|
||||
@$(NWOS)/httpd.imp \
|
||||
@libc.imp \
|
||||
$(EOLIST)
|
||||
|
||||
#
|
||||
# Any symbols exported to here
|
||||
#
|
||||
FILES_nlm_exports = \
|
||||
substitute_module \
|
||||
$(EOLIST)
|
||||
|
||||
#
|
||||
# These are the OBJ files needed to create the LIB target above.
|
||||
# Paths must all use the '/' character
|
||||
#
|
||||
FILES_lib_objs = \
|
||||
$(EOLIST)
|
||||
|
||||
#
|
||||
# implement targets and dependancies (leave this section alone)
|
||||
#
|
||||
|
||||
libs :: $(OBJDIR) $(TARGET_lib)
|
||||
|
||||
nlms :: libs $(TARGET_nlm)
|
||||
|
||||
#
|
||||
# Updated this target to create necessary directories and copy files to the
|
||||
# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples)
|
||||
#
|
||||
install :: nlms FORCE
|
||||
|
||||
#
|
||||
# Any specialized rules here
|
||||
#
|
||||
|
||||
#
|
||||
# Include the 'tail' makefile that has targets that depend on variables defined
|
||||
# in this makefile
|
||||
#
|
||||
|
||||
include $(AP_WORK)\build\NWGNUtail.inc
|
||||
|
||||
|
||||
@ -1,541 +0,0 @@
|
||||
/* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed with
|
||||
* this work for additional information regarding copyright ownership.
|
||||
* The ASF licenses this file to You under the Apache License, Version 2.0
|
||||
* (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
/*
|
||||
* mod_substitute.c: Perform content rewriting on the fly
|
||||
*/
|
||||
|
||||
#include "httpd.h"
|
||||
#include "http_config.h"
|
||||
#include "http_core.h"
|
||||
#include "apr_general.h"
|
||||
#include "apr_strings.h"
|
||||
#include "apr_strmatch.h"
|
||||
#include "apr_lib.h"
|
||||
#include "util_filter.h"
|
||||
#include "apr_buckets.h"
|
||||
#include "http_request.h"
|
||||
#define APR_WANT_STRFUNC
|
||||
#include "apr_want.h"
|
||||
|
||||
static const char substitute_filter_name[] = "SUBSTITUTE";
|
||||
|
||||
module AP_MODULE_DECLARE_DATA substitute_module;
|
||||
|
||||
typedef struct subst_pattern_t {
|
||||
const apr_strmatch_pattern *pattern;
|
||||
const ap_regex_t *regexp;
|
||||
const char *replacement;
|
||||
apr_size_t replen;
|
||||
apr_size_t patlen;
|
||||
int flatten;
|
||||
} subst_pattern_t;
|
||||
|
||||
typedef struct {
|
||||
apr_array_header_t *patterns;
|
||||
} subst_dir_conf;
|
||||
|
||||
typedef struct {
|
||||
apr_bucket_brigade *ctxbb;
|
||||
} substitute_module_ctx;
|
||||
|
||||
static void *create_substitute_dcfg(apr_pool_t *p, char *d)
|
||||
{
|
||||
subst_dir_conf *dcfg =
|
||||
(subst_dir_conf *) apr_pcalloc(p, sizeof(subst_dir_conf));
|
||||
|
||||
dcfg->patterns = apr_array_make(p, 10, sizeof(subst_pattern_t));
|
||||
return dcfg;
|
||||
}
|
||||
|
||||
static void *merge_substitute_dcfg(apr_pool_t *p, void *basev, void *overv)
|
||||
{
|
||||
subst_dir_conf *a =
|
||||
(subst_dir_conf *) apr_pcalloc(p, sizeof(subst_dir_conf));
|
||||
subst_dir_conf *base = (subst_dir_conf *) basev;
|
||||
subst_dir_conf *over = (subst_dir_conf *) overv;
|
||||
|
||||
a->patterns = apr_array_append(p, over->patterns,
|
||||
base->patterns);
|
||||
return a;
|
||||
}
|
||||
#define SEDSCAT(s1, s2, pool, buff, blen, repl) do { \
|
||||
if (!s1) { \
|
||||
s1 = apr_pstrmemdup(pool, buff, blen); \
|
||||
} \
|
||||
else { \
|
||||
s2 = apr_pstrmemdup(pool, buff, blen); \
|
||||
s1 = apr_pstrcat(pool, s1, s2, NULL); \
|
||||
} \
|
||||
s1 = apr_pstrcat(pool, s1, repl, NULL); \
|
||||
} while (0)
|
||||
|
||||
#define SEDRMPATBCKT(b, offset, tmp_b, patlen) do { \
|
||||
apr_bucket_split(b, offset); \
|
||||
tmp_b = APR_BUCKET_NEXT(b); \
|
||||
apr_bucket_split(tmp_b, patlen); \
|
||||
b = APR_BUCKET_NEXT(tmp_b); \
|
||||
apr_bucket_delete(tmp_b); \
|
||||
} while (0)
|
||||
|
||||
static apr_bucket_brigade *do_pattmatch(ap_filter_t *f, apr_bucket *inb)
|
||||
{
|
||||
int i;
|
||||
ap_regmatch_t regm[AP_MAX_REG_MATCH];
|
||||
apr_size_t bytes;
|
||||
apr_size_t len;
|
||||
apr_size_t fbytes;
|
||||
const char *buff;
|
||||
const char *repl;
|
||||
char *scratch;
|
||||
char *p;
|
||||
char *s1;
|
||||
char *s2;
|
||||
apr_bucket *b;
|
||||
apr_bucket *tmp_b;
|
||||
apr_bucket_brigade *mybb;
|
||||
apr_pool_t *tpool;
|
||||
|
||||
subst_dir_conf *cfg =
|
||||
(subst_dir_conf *) ap_get_module_config(f->r->per_dir_config,
|
||||
&substitute_module);
|
||||
subst_pattern_t *script;
|
||||
|
||||
mybb = apr_brigade_create(f->r->pool, f->c->bucket_alloc);
|
||||
APR_BRIGADE_INSERT_TAIL(mybb, inb);
|
||||
|
||||
script = (subst_pattern_t *) cfg->patterns->elts;
|
||||
apr_pool_create(&tpool, f->r->pool);
|
||||
scratch = NULL;
|
||||
fbytes = 0;
|
||||
for (i = 0; i < cfg->patterns->nelts; i++) {
|
||||
for (b = APR_BRIGADE_FIRST(mybb);
|
||||
b != APR_BRIGADE_SENTINEL(mybb);
|
||||
b = APR_BUCKET_NEXT(b)) {
|
||||
if (APR_BUCKET_IS_METADATA(b)) {
|
||||
/*
|
||||
* we should NEVER see this, because we should never
|
||||
* be passed any, but "handle" it just in case.
|
||||
*/
|
||||
continue;
|
||||
}
|
||||
if (apr_bucket_read(b, &buff, &bytes, APR_BLOCK_READ)
|
||||
== APR_SUCCESS) {
|
||||
s1 = NULL;
|
||||
if (script->pattern) {
|
||||
while ((repl = apr_strmatch(script->pattern, buff, bytes)))
|
||||
{
|
||||
/* get offset into buff for pattern */
|
||||
len = (apr_size_t) (repl - buff);
|
||||
if (script->flatten) {
|
||||
/*
|
||||
* We are flattening the buckets here, meaning
|
||||
* that we don't do the fast bucket splits.
|
||||
* Instead we copy over what the buckets would
|
||||
* contain and use them. This is slow, since we
|
||||
* are constanting allocing space and copying
|
||||
* strings.
|
||||
*/
|
||||
SEDSCAT(s1, s2, f->r->pool, buff, len,
|
||||
script->replacement);
|
||||
}
|
||||
else {
|
||||
/*
|
||||
* We now split off the stuff before the regex
|
||||
* as its own bucket, then isolate the pattern
|
||||
* and delete it.
|
||||
*/
|
||||
SEDRMPATBCKT(b, len, tmp_b, script->patlen);
|
||||
/*
|
||||
* Finally, we create a bucket that contains the
|
||||
* replacement...
|
||||
*/
|
||||
tmp_b = apr_bucket_pool_create(script->replacement,
|
||||
script->replen, f->r->pool,
|
||||
f->r->connection->bucket_alloc);
|
||||
/* ... and insert it */
|
||||
APR_BUCKET_INSERT_BEFORE(b, tmp_b);
|
||||
}
|
||||
/* now we need to adjust buff for all these changes */
|
||||
len += script->patlen;
|
||||
bytes -= len;
|
||||
buff += len;
|
||||
}
|
||||
if (script->flatten && s1) {
|
||||
/*
|
||||
* we've finished looking at the bucket, so remove the
|
||||
* old one and add in our new one
|
||||
*/
|
||||
s2 = apr_pstrmemdup(f->r->pool, buff, bytes);
|
||||
s1 = apr_pstrcat(f->r->pool, s1, s2, NULL);
|
||||
tmp_b = apr_bucket_pool_create(s1, strlen(s1),
|
||||
f->r->pool, f->r->connection->bucket_alloc);
|
||||
APR_BUCKET_INSERT_BEFORE(b, tmp_b);
|
||||
tmp_b = APR_BUCKET_NEXT(b);
|
||||
apr_bucket_delete(b);
|
||||
b = tmp_b;
|
||||
}
|
||||
|
||||
}
|
||||
else if (script->regexp) {
|
||||
/*
|
||||
* we need a null terminated string here :(. To hopefully
|
||||
* save time and memory, we don't alloc for each run
|
||||
* through, but only if we need to have a larger chunk
|
||||
* to save the string to. So we keep track of how much
|
||||
* we've allocated and only re-alloc when we need it.
|
||||
* NOTE: this screams for a macro.
|
||||
*/
|
||||
if (!scratch || (bytes > (fbytes + 1))) {
|
||||
fbytes = bytes + 1;
|
||||
scratch = apr_palloc(tpool, fbytes);
|
||||
}
|
||||
/* reset pointer to the scratch space */
|
||||
p = scratch;
|
||||
memcpy(p, buff, bytes);
|
||||
p[bytes] = '\0';
|
||||
while (!ap_regexec(script->regexp, p,
|
||||
AP_MAX_REG_MATCH, regm, 0)) {
|
||||
/* first, grab the replacement string */
|
||||
repl = ap_pregsub(f->r->pool, script->replacement, p,
|
||||
AP_MAX_REG_MATCH, regm);
|
||||
if (script->flatten) {
|
||||
SEDSCAT(s1, s2, f->r->pool, p, regm[0].rm_so, repl);
|
||||
}
|
||||
else {
|
||||
len = (apr_size_t) (regm[0].rm_eo - regm[0].rm_so);
|
||||
SEDRMPATBCKT(b, regm[0].rm_so, tmp_b, len);
|
||||
tmp_b = apr_bucket_pool_create(repl, strlen(repl),
|
||||
f->r->pool,
|
||||
f->r->connection->bucket_alloc);
|
||||
APR_BUCKET_INSERT_BEFORE(b, tmp_b);
|
||||
}
|
||||
/*
|
||||
* reset to past what we just did. buff now maps to b
|
||||
* again
|
||||
*/
|
||||
p += regm[0].rm_eo;
|
||||
}
|
||||
if (script->flatten && s1) {
|
||||
s1 = apr_pstrcat(f->r->pool, s1, p, NULL);
|
||||
tmp_b = apr_bucket_pool_create(s1, strlen(s1),
|
||||
f->r->pool, f->r->connection->bucket_alloc);
|
||||
APR_BUCKET_INSERT_BEFORE(b, tmp_b);
|
||||
tmp_b = APR_BUCKET_NEXT(b);
|
||||
apr_bucket_delete(b);
|
||||
b = tmp_b;
|
||||
}
|
||||
|
||||
}
|
||||
else {
|
||||
/* huh? */
|
||||
continue;
|
||||
}
|
||||
}
|
||||
}
|
||||
script++;
|
||||
}
|
||||
|
||||
apr_pool_destroy(tpool);
|
||||
|
||||
return mybb;
|
||||
}
|
||||
|
||||
static apr_status_t substitute_filter(ap_filter_t *f, apr_bucket_brigade *bb)
|
||||
{
|
||||
apr_size_t bytes;
|
||||
apr_size_t len;
|
||||
apr_size_t fbytes;
|
||||
apr_off_t blen;
|
||||
const char *buff;
|
||||
const char *nl = NULL;
|
||||
char *bflat;
|
||||
apr_bucket *b;
|
||||
apr_bucket *tmp_b;
|
||||
apr_bucket_brigade *passbb;
|
||||
apr_bucket_brigade *pattbb;
|
||||
apr_bucket_brigade *tmp_ctxbb = NULL;
|
||||
apr_status_t rv;
|
||||
|
||||
substitute_module_ctx *ctx = f->ctx;
|
||||
|
||||
/*
|
||||
* First time around? Create the saved bb that we used for each pass
|
||||
* through. Note that we can also get here when we explicitly clear ctx,
|
||||
* for error handling
|
||||
*/
|
||||
if (!ctx) {
|
||||
f->ctx = ctx = apr_pcalloc(f->r->pool, sizeof(*ctx));
|
||||
ctx->ctxbb = apr_brigade_create(f->r->pool, f->c->bucket_alloc);
|
||||
apr_table_unset(f->r->headers_out, "Content-Length");
|
||||
}
|
||||
|
||||
/*
|
||||
* Shortcircuit processing
|
||||
*/
|
||||
if (APR_BRIGADE_EMPTY(bb))
|
||||
return APR_SUCCESS;
|
||||
|
||||
/*
|
||||
* Everything to be passed to the next filter goes in
|
||||
* here, our pass brigade.
|
||||
*/
|
||||
passbb = apr_brigade_create(f->r->pool, f->c->bucket_alloc);
|
||||
|
||||
/*
|
||||
* Here's the concept:
|
||||
* Read in the data and look for newlines. Once we
|
||||
* find a full "line", add it to our working brigade.
|
||||
* If we've finished reading the brigade and we have
|
||||
* any left over data (not a "full" line), store that
|
||||
* for the next pass.
|
||||
*
|
||||
* Note: anything stored in ctxbb for sure does not have
|
||||
* a newline char, so we don't concat that bb with the
|
||||
* new bb, since we would spending time searching for the newline
|
||||
* in data we know it doesn't exist. So instead, we simply scan
|
||||
* our current bb and, if we see a newline, prepend ctxbb
|
||||
* to the front of it. This makes the code much less straight-
|
||||
* forward (otherwise we could APR_BRIGADE_CONCAT(ctx->ctxbb, bb)
|
||||
* and just scan for newlines and not bother with needing to know
|
||||
* when ctx->ctxbb needs to be reset) but also faster. We'll take
|
||||
* the speed.
|
||||
*
|
||||
* Note: apr_brigade_split_line would be nice here, but we
|
||||
* really can't use it since we need more control and we want
|
||||
* to re-use already read bucket data.
|
||||
*
|
||||
* See mod_include if still confused :)
|
||||
*/
|
||||
|
||||
while ((b = APR_BRIGADE_FIRST(bb)) && (b != APR_BRIGADE_SENTINEL(bb))) {
|
||||
apr_brigade_length(passbb, 0, &blen);
|
||||
if ((blen != -1) && (blen > AP_MIN_BYTES_TO_WRITE)) {
|
||||
rv = ap_pass_brigade(f->next, passbb);
|
||||
apr_brigade_cleanup(passbb);
|
||||
if (rv != APR_SUCCESS)
|
||||
return rv;
|
||||
}
|
||||
if (APR_BUCKET_IS_EOS(b)) {
|
||||
/*
|
||||
* if we see the EOS, then we need to pass along everything we
|
||||
* have. But if the ctxbb isn't empty, then we need to add that
|
||||
* to the end of what we'll be passing.
|
||||
*/
|
||||
if (!APR_BRIGADE_EMPTY(ctx->ctxbb)) {
|
||||
rv = apr_brigade_pflatten(ctx->ctxbb, &bflat,
|
||||
&fbytes, f->r->pool);
|
||||
tmp_b = apr_bucket_pool_create(bflat, fbytes, f->r->pool,
|
||||
f->r->connection->bucket_alloc);
|
||||
pattbb = do_pattmatch(f, tmp_b);
|
||||
APR_BRIGADE_CONCAT(passbb, pattbb);
|
||||
}
|
||||
apr_brigade_cleanup(ctx->ctxbb);
|
||||
APR_BUCKET_REMOVE(b);
|
||||
APR_BRIGADE_INSERT_TAIL(passbb, b);
|
||||
break;
|
||||
}
|
||||
else if (APR_BUCKET_IS_FLUSH(b)) {
|
||||
APR_BUCKET_REMOVE(b);
|
||||
APR_BRIGADE_INSERT_TAIL(passbb, b);
|
||||
rv = ap_pass_brigade(f->next, passbb);
|
||||
apr_brigade_cleanup(passbb);
|
||||
if (rv != APR_SUCCESS)
|
||||
return rv;
|
||||
}
|
||||
else if (APR_BUCKET_IS_METADATA(b)) {
|
||||
APR_BUCKET_REMOVE(b);
|
||||
APR_BRIGADE_INSERT_TAIL(passbb, b);
|
||||
}
|
||||
else {
|
||||
/*
|
||||
* We have actual "data" so read in as much as we can and start
|
||||
* scanning and splitting from our read buffer
|
||||
*/
|
||||
rv = apr_bucket_read(b, &buff, &bytes, APR_BLOCK_READ);
|
||||
if (rv != APR_SUCCESS || bytes == 0) {
|
||||
APR_BUCKET_REMOVE(b);
|
||||
}
|
||||
else {
|
||||
while (bytes > 0) {
|
||||
nl = memchr(buff, APR_ASCII_LF, bytes);
|
||||
if (nl) {
|
||||
len = (apr_size_t) (nl - buff) + 1;
|
||||
/* split *after* the newline */
|
||||
apr_bucket_split(b, len);
|
||||
/*
|
||||
* We've likely read more data, so bypass rereading
|
||||
* bucket data and continue scanning through this
|
||||
* buffer
|
||||
*/
|
||||
bytes -= len;
|
||||
buff += len;
|
||||
/*
|
||||
* we need b to be updated for future potential
|
||||
* splitting
|
||||
*/
|
||||
tmp_b = APR_BUCKET_NEXT(b);
|
||||
APR_BUCKET_REMOVE(b);
|
||||
/*
|
||||
* Hey, we found a newline! Don't forget the old
|
||||
* stuff that needs to be added to the front. So we
|
||||
* add the split bucket to the end, flatten the whole
|
||||
* bb, morph the whole shebang into a bucket which is
|
||||
* then added to the tail of the newline bb.
|
||||
*/
|
||||
if (!APR_BRIGADE_EMPTY(ctx->ctxbb)) {
|
||||
APR_BRIGADE_INSERT_TAIL(ctx->ctxbb, b);
|
||||
rv = apr_brigade_pflatten(ctx->ctxbb, &bflat,
|
||||
&fbytes, f->r->pool);
|
||||
b = apr_bucket_pool_create(bflat, fbytes,
|
||||
f->r->pool,
|
||||
f->r->connection->bucket_alloc);
|
||||
apr_brigade_cleanup(ctx->ctxbb);
|
||||
}
|
||||
pattbb = do_pattmatch(f, b);
|
||||
APR_BRIGADE_CONCAT(passbb, pattbb);
|
||||
b = tmp_b;
|
||||
}
|
||||
else {
|
||||
/*
|
||||
* no newline in whatever is left of this buffer so
|
||||
* tuck data away and get next bucket
|
||||
*/
|
||||
APR_BUCKET_REMOVE(b);
|
||||
APR_BRIGADE_INSERT_TAIL(ctx->ctxbb, b);
|
||||
bytes = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* Pass it down */
|
||||
rv = ap_pass_brigade(f->next, passbb);
|
||||
|
||||
/* Anything left we want to save/setaside for the next go-around */
|
||||
if (!APR_BRIGADE_EMPTY(ctx->ctxbb)) {
|
||||
ap_save_brigade(f, &tmp_ctxbb, &(ctx->ctxbb), f->r->pool);
|
||||
ctx->ctxbb = tmp_ctxbb;
|
||||
}
|
||||
|
||||
return rv;
|
||||
}
|
||||
|
||||
static const char *set_pattern(cmd_parms *cmd, void *cfg, const char *line)
|
||||
{
|
||||
char *from = NULL;
|
||||
char *to = NULL;
|
||||
char *flags = NULL;
|
||||
char *ourline;
|
||||
char delim;
|
||||
subst_pattern_t *nscript;
|
||||
int is_pattern = 0;
|
||||
int ignore_case = 0;
|
||||
int flatten = 0;
|
||||
ap_regex_t *r = NULL;
|
||||
|
||||
if (apr_tolower(*line) != 's') {
|
||||
return "Bad Substitute format, must be an s/// pattern";
|
||||
}
|
||||
ourline = apr_pstrdup(cmd->pool, line);
|
||||
delim = *++ourline;
|
||||
if (delim)
|
||||
from = ++ourline;
|
||||
if (from) {
|
||||
while (*++ourline && *ourline != delim);
|
||||
if (*ourline) {
|
||||
*ourline = '\0';
|
||||
to = ++ourline;
|
||||
}
|
||||
}
|
||||
if (to) {
|
||||
while (*++ourline && *ourline != delim);
|
||||
if (*ourline) {
|
||||
*ourline = '\0';
|
||||
flags = ++ourline;
|
||||
}
|
||||
}
|
||||
|
||||
if (!delim || !from || !to) {
|
||||
return "Bad Substitute format, must be a complete s/// pattern";
|
||||
}
|
||||
|
||||
while (*flags) {
|
||||
delim = apr_tolower(*flags); /* re-use */
|
||||
if (delim == 'i')
|
||||
ignore_case = 1;
|
||||
else if (delim == 'n')
|
||||
is_pattern = 1;
|
||||
else if (delim == 'f')
|
||||
flatten = 1;
|
||||
else
|
||||
return "Bad Substitute flag, only s///[inf] are supported";
|
||||
flags++;
|
||||
}
|
||||
|
||||
/* first see if we can compile the regex */
|
||||
if (!is_pattern) {
|
||||
r = ap_pregcomp(cmd->pool, from, AP_REG_EXTENDED |
|
||||
(ignore_case ? AP_REG_ICASE : 0));
|
||||
if (!r)
|
||||
return "Substitute could not compile regex";
|
||||
}
|
||||
nscript = apr_array_push(((subst_dir_conf *) cfg)->patterns);
|
||||
/* init the new entries */
|
||||
nscript->pattern = NULL;
|
||||
nscript->regexp = NULL;
|
||||
nscript->replacement = NULL;
|
||||
nscript->patlen = 0;
|
||||
|
||||
if (is_pattern) {
|
||||
nscript->patlen = strlen(from);
|
||||
nscript->pattern = apr_strmatch_precompile(cmd->pool, from,
|
||||
!ignore_case);
|
||||
}
|
||||
else {
|
||||
nscript->regexp = r;
|
||||
}
|
||||
|
||||
nscript->replacement = to;
|
||||
nscript->replen = strlen(to);
|
||||
nscript->flatten = flatten;
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
#define PROTO_FLAGS AP_FILTER_PROTO_CHANGE|AP_FILTER_PROTO_CHANGE_LENGTH
|
||||
static void register_hooks(apr_pool_t *pool)
|
||||
{
|
||||
ap_register_output_filter(substitute_filter_name, substitute_filter,
|
||||
NULL, AP_FTYPE_RESOURCE);
|
||||
}
|
||||
|
||||
static const command_rec substitute_cmds[] = {
|
||||
AP_INIT_TAKE1("Substitute", set_pattern, NULL, OR_ALL,
|
||||
"Pattern to filter the response content (s/foo/bar/[inf])"),
|
||||
{NULL}
|
||||
};
|
||||
|
||||
module AP_MODULE_DECLARE_DATA substitute_module = {
|
||||
STANDARD20_MODULE_STUFF,
|
||||
create_substitute_dcfg, /* dir config creater */
|
||||
merge_substitute_dcfg, /* dir merger --- default is to override */
|
||||
NULL, /* server config */
|
||||
NULL, /* merge server config */
|
||||
substitute_cmds, /* command table */
|
||||
register_hooks /* register hooks */
|
||||
};
|
||||
@ -1,111 +0,0 @@
|
||||
# Microsoft Developer Studio Project File - Name="mod_substitute" - Package Owner=<4>
|
||||
# Microsoft Developer Studio Generated Build File, Format Version 6.00
|
||||
# ** DO NOT EDIT **
|
||||
|
||||
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
|
||||
|
||||
CFG=mod_substitute - Win32 Debug
|
||||
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
|
||||
!MESSAGE use the Export Makefile command and run
|
||||
!MESSAGE
|
||||
!MESSAGE NMAKE /f "mod_substitute.mak".
|
||||
!MESSAGE
|
||||
!MESSAGE You can specify a configuration when running NMAKE
|
||||
!MESSAGE by defining the macro CFG on the command line. For substitute:
|
||||
!MESSAGE
|
||||
!MESSAGE NMAKE /f "mod_substitute.mak" CFG="mod_substitute - Win32 Debug"
|
||||
!MESSAGE
|
||||
!MESSAGE Possible choices for configuration are:
|
||||
!MESSAGE
|
||||
!MESSAGE "mod_substitute - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
|
||||
!MESSAGE "mod_substitute - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
|
||||
!MESSAGE
|
||||
|
||||
# Begin Project
|
||||
# PROP AllowPerConfigDependencies 0
|
||||
# PROP Scc_ProjName ""
|
||||
# PROP Scc_LocalPath ""
|
||||
CPP=cl.exe
|
||||
MTL=midl.exe
|
||||
RSC=rc.exe
|
||||
|
||||
!IF "$(CFG)" == "mod_substitute - Win32 Release"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 0
|
||||
# PROP BASE Output_Dir "Release"
|
||||
# PROP BASE Intermediate_Dir "Release"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 0
|
||||
# PROP Output_Dir "Release"
|
||||
# PROP Intermediate_Dir "Release"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
|
||||
# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\mod_substitute_src" /FD /c
|
||||
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
|
||||
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
|
||||
# ADD BASE RSC /l 0x409 /d "NDEBUG"
|
||||
# ADD RSC /l 0x409 /fo"Release/mod_substitute.res" /i "../../include" /i "../../srclib/apr/include" /d "NDEBUG" /d BIN_NAME="mod_substitute.so" /d LONG_NAME="substitute_module for Apache"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /out:".\Release\mod_substitute.so" /base:@..\..\os\win32\BaseAddr.ref,mod_substitute.so
|
||||
# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Release\mod_substitute.so" /base:@..\..\os\win32\BaseAddr.ref,mod_substitute.so /opt:ref
|
||||
# Begin Special Build Tool
|
||||
TargetPath=.\Release\mod_substitute.so
|
||||
SOURCE="$(InputPath)"
|
||||
PostBuild_Desc=Embed .manifest
|
||||
PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
|
||||
# End Special Build Tool
|
||||
|
||||
!ELSEIF "$(CFG)" == "mod_substitute - Win32 Debug"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 1
|
||||
# PROP BASE Output_Dir "Debug"
|
||||
# PROP BASE Intermediate_Dir "Debug"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 1
|
||||
# PROP Output_Dir "Debug"
|
||||
# PROP Intermediate_Dir "Debug"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
|
||||
# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_substitute_src" /FD /c
|
||||
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
|
||||
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
|
||||
# ADD BASE RSC /l 0x409 /d "_DEBUG"
|
||||
# ADD RSC /l 0x409 /fo"Debug/mod_substitute.res" /i "../../include" /i "../../srclib/apr/include" /d "_DEBUG" /d BIN_NAME="mod_substitute.so" /d LONG_NAME="substitute_module for Apache"
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Debug\mod_substitute.so" /base:@..\..\os\win32\BaseAddr.ref,mod_substitute.so
|
||||
# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Debug\mod_substitute.so" /base:@..\..\os\win32\BaseAddr.ref,mod_substitute.so
|
||||
# Begin Special Build Tool
|
||||
TargetPath=.\Debug\mod_substitute.so
|
||||
SOURCE="$(InputPath)"
|
||||
PostBuild_Desc=Embed .manifest
|
||||
PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
|
||||
# End Special Build Tool
|
||||
|
||||
!ENDIF
|
||||
|
||||
# Begin Target
|
||||
|
||||
# Name "mod_substitute - Win32 Release"
|
||||
# Name "mod_substitute - Win32 Debug"
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\mod_substitute.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\build\win32\httpd.rc
|
||||
# End Source File
|
||||
# End Target
|
||||
# End Project
|
||||
Reference in New Issue
Block a user