Commit 2670e689 authored by Ryan Bloom's avatar Ryan Bloom
Browse files

Greg Stein and Dale Ghent both reminded me I forgot to add this.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87865 13f79535-47bb-0310-9956-ffa450edef68
parent bd0fdead
Loading
Loading
Loading
Loading
+104 −0
Original line number Diff line number Diff line
/* ====================================================================
 * The Apache Software License, Version 1.1
 *
 * Copyright (c) 2000 The Apache Software Foundation.  All rights
 * reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 *
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
 *
 * 3. The end-user documentation included with the redistribution,
 *    if any, must include the following acknowledgment:
 *       "This product includes software developed by the
 *        Apache Software Foundation (http://www.apache.org/)."
 *    Alternately, this acknowledgment may appear in the software itself,
 *    if and wherever such third-party acknowledgments normally appear.
 *
 * 4. The names "Apache" and "Apache Software Foundation" must
 *    not be used to endorse or promote products derived from this
 *    software without prior written permission. For written
 *    permission, please contact apache@apache.org.
 *
 * 5. Products derived from this software may not be called "Apache",
 *    nor may "Apache" appear in their name, without prior written
 *    permission of the Apache Software Foundation.
 *
 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
 * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 * ====================================================================
 *
 * This software consists of voluntary contributions made by many
 * individuals on behalf of the Apache Software Foundation.  For more
 * information on the Apache Software Foundation, please see
 * <http://www.apache.org/>.
 */

#include "http_protocol.h"
#include "apr_buckets.h"
#include "apr_strings.h"
#include <stdlib.h>
#if APR_HAVE_STRINGS_H
#include <strings.h>
#endif

static apr_status_t error_read(apr_bucket *b, const char **str, 
			       apr_size_t *len, apr_read_type_e block)
{
    ap_bucket_error *e = b->data;

    *str = e->start;
    *len = b->length;
    return APR_SUCCESS;
}

AP_DECLARE(apr_bucket *) ap_bucket_make_error(apr_bucket *b, int error, 
		const char *buf, apr_pool_t *p)
{
    ap_bucket_error *h;

    h = malloc(sizeof(*h));
    if (h == NULL) {
        return NULL;
    }

    h->start = apr_psprintf(p, "%d %s", error, buf);

    b->length = strlen(h->start);
    b->type = &ap_bucket_type_error;
    b->data = h;
    return b;
}

AP_DECLARE(apr_bucket *) ap_bucket_create_error(int error, 
		const char *buf, apr_pool_t *p)
{
    apr_bucket_do_create(ap_bucket_make_error(b, error, buf, p));
}

AP_DECLARE_DATA const apr_bucket_type_t ap_bucket_type_error = {
    "ERROR", 5,
    free,
    error_read,
    apr_bucket_setaside_notimpl,
    apr_bucket_split_notimpl,
    apr_bucket_copy_notimpl
};