Changes with Apache 2.0.25-dev
+ *) Fix for mod_include. Ryan's patch to check error
+ codes put a return in the wrong place. Also, the
+ include handler return code wasn't being checked.
+ I don't like macros with returns, so I converted
+ SPLIT_AND_PASS_PRETAG_BUCKETS into a function.
+ [Paul J. Reder <rederpj@raleigh.ibm.com>]
+
*) fix segv in mod_mime if no AddTypes are configured
[John Sterling <sterling@covalent.net>]
#define BYTE_COUNT_THRESHOLD AP_MIN_BYTES_TO_WRITE
+/* This function is used to split the brigade at the beginning of
+ * the tag and forward the pretag buckets before any substitution
+ * work is performed on the tag. This maintains proper ordering.
+ */
+static int split_and_pass_pretag_buckets(apr_bucket_brigade **brgd,
+ include_ctx_t *cntxt,
+ ap_filter_t *next)
+{
+ apr_bucket_brigade *tag_plus;
+ int rv;
+
+ if ((APR_BRIGADE_EMPTY(cntxt->ssi_tag_brigade)) &&
+ (cntxt->head_start_bucket != NULL)) {
+ tag_plus = apr_brigade_split(*brgd, cntxt->head_start_bucket);
+ rv = ap_pass_brigade(next, *brgd);
+ cntxt->bytes_parsed = 0;
+ *brgd = tag_plus;
+ if (rv != APR_SUCCESS) {
+ return rv;
+ }
+ }
+}
+
/* ------------------------ Environment function -------------------------- */
/* XXX: could use ap_table_overlap here */
if (!error_fmt) {
int rv;
- SPLIT_AND_PASS_PRETAG_BUCKETS(*bb, ctx, f->next);
+ rv = split_and_pass_pretag_buckets(bb, ctx, f->next);
+ if (rv != APR_SUCCESS) {
+ return rv;
+ }
if ((rv = ap_run_sub_req(rr))) {
if (APR_STATUS_IS_EPIPE(rv)) {
apr_bucket *dptr = APR_BRIGADE_FIRST(*bb);
apr_bucket *tmp_dptr;
apr_bucket_brigade *tag_and_after;
- int ret;
apr_status_t rv;
if (r->args) { /* add QUERY stuff to env cause it ain't yet */
*bb = tag_and_after;
}
else if (ctx->bytes_parsed >= BYTE_COUNT_THRESHOLD) {
- SPLIT_AND_PASS_PRETAG_BUCKETS(*bb, ctx, f->next);
+ rv = split_and_pass_pretag_buckets(bb, ctx, f->next);
+ if (rv != APR_SUCCESS) {
+ return rv;
+ }
}
}
else {
ctx->combined_tag,
ctx->directive_length+1);
if (handle_func != NULL) {
- ret = (*handle_func)(ctx, bb, r, f, dptr, &content_head);
+ rv = (*handle_func)(ctx, bb, r, f, dptr, &content_head);
+ if ((rv != 0) && (rv != 1)) {
+ return (rv);
+ }
}
else {
ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
} \
}
-#define SPLIT_AND_PASS_PRETAG_BUCKETS(brgd, cntxt, next) \
-if ((APR_BRIGADE_EMPTY(cntxt->ssi_tag_brigade)) && \
- (cntxt->head_start_bucket != NULL)) { \
- apr_bucket_brigade *tag_plus; \
- int rv; \
- \
- tag_plus = apr_brigade_split(brgd, cntxt->head_start_bucket); \
- rv = ap_pass_brigade(next, brgd); \
- if (rv != APR_SUCCESS) { \
- return rv; \
- } \
- cntxt->bytes_parsed = 0; \
- brgd = tag_plus; \
-}
-
-
typedef int (include_handler_fn_t)(include_ctx_t *ctx, apr_bucket_brigade **bb,
request_rec *r, ap_filter_t *f, apr_bucket *head_ptr,
apr_bucket **inserted_head);
int bufbytes;
} cgi_server_conf;
+/* This function is used to split the brigade at the beginning of
+ * the tag and forward the pretag buckets before any substitution
+ * work is performed on the tag. This maintains proper ordering.
+ */
+static int split_and_pass_pretag_buckets(apr_bucket_brigade **brgd,
+ include_ctx_t *cntxt,
+ ap_filter_t *next)
+{
+ apr_bucket_brigade *tag_plus;
+ int rv;
+
+ if ((APR_BRIGADE_EMPTY(cntxt->ssi_tag_brigade)) &&
+ (cntxt->head_start_bucket != NULL)) {
+ tag_plus = apr_brigade_split(*brgd, cntxt->head_start_bucket);
+ rv = ap_pass_brigade(next, *brgd);
+ cntxt->bytes_parsed = 0;
+ *brgd = tag_plus;
+ if (rv != APR_SUCCESS) {
+ return rv;
+ }
+ }
+}
+
static void *create_cgi_config(apr_pool_t *p, server_rec *s)
{
cgi_server_conf *c =
else {
procnew = apr_pcalloc(p, sizeof(*procnew));
if (e_info->prog_type == RUN_AS_SSI) {
- SPLIT_AND_PASS_PRETAG_BUCKETS(*(e_info->bb), e_info->ctx, e_info->next);
+ rc = split_and_pass_pretag_buckets(e_info->bb, e_info->ctx, e_info->next);
+ if (rc != APR_SUCCESS) {
+ return rc;
+ }
}
rc = ap_os_create_privileged_process(r, procnew, command, argv, env, procattr, p);
char *tag = NULL;
char *tag_val = NULL;
char *file = r->filename;
+ int retval;
apr_bucket *tmp_buck;
char parsed_string[MAX_STRING_LEN];
}
else if (!strcmp(tag, "cgi")) {
cgi_pfn_ps(r, tag_val, parsed_string, sizeof(parsed_string), 0);
- SPLIT_AND_PASS_PRETAG_BUCKETS(*bb, ctx, f->next);
+ retval = split_and_pass_pretag_buckets(bb, ctx, f->next);
+ if (retval != APR_SUCCESS) {
+ return retval;
+ }
+
if (include_cgi(parsed_string, r, f->next, head_ptr, inserted_head) == -1) {
ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
"invalid CGI ref \"%s\" in %s", tag_val, file);
int bufbytes;
} cgid_server_conf;
+/* This function is used to split the brigade at the beginning of
+ * the tag and forward the pretag buckets before any substitution
+ * work is performed on the tag. This maintains proper ordering.
+ */
+static int split_and_pass_pretag_buckets(apr_bucket_brigade **brgd,
+ include_ctx_t *cntxt,
+ ap_filter_t *next)
+{
+ apr_bucket_brigade *tag_plus;
+ int rv;
+
+ if ((APR_BRIGADE_EMPTY(cntxt->ssi_tag_brigade)) &&
+ (cntxt->head_start_bucket != NULL)) {
+ tag_plus = apr_brigade_split(*brgd, cntxt->head_start_bucket);
+ rv = ap_pass_brigade(next, *brgd);
+ cntxt->bytes_parsed = 0;
+ *brgd = tag_plus;
+ if (rv != APR_SUCCESS) {
+ return rv;
+ }
+ }
+}
+
/* If a request includes query info in the URL (stuff after "?"), and
* the query info does not contain "=" (indicative of a FORM submission),
* then this routine is called to create the argument list to be passed
"unable to connect to cgi daemon");
}
- SPLIT_AND_PASS_PRETAG_BUCKETS(*bb, ctx, f->next);
+ retval = split_and_pass_pretag_buckets(bb, ctx, f->next);
+ if (retval != APR_SUCCESS) {
+ return retval;
+ }
send_req(sd, r, command, env, SSI_REQ);
char *file = r->filename;
apr_bucket *tmp_buck;
char parsed_string[MAX_STRING_LEN];
+ int retval;
*inserted_head = NULL;
if (ctx->flags & FLAG_PRINTING) {
}
else if (!strcmp(tag, "cgi")) {
cgid_pfn_ps(r, tag_val, parsed_string, sizeof(parsed_string), 0);
- SPLIT_AND_PASS_PRETAG_BUCKETS(*bb, ctx, f->next);
+ retval = split_and_pass_pretag_buckets(bb, ctx, f->next);
+ if (retval != APR_SUCCESS) {
+ return retval;
+ }
+
if (include_cgi(parsed_string, r, f->next, head_ptr, inserted_head) == -1) {
ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
"invalid CGI ref \"%s\" in %s", tag_val, file);