Commit 6dd932f6 authored by Ryan Bloom's avatar Ryan Bloom
Browse files

First step to getting configuration modules working. This step creates 

a tree, but does not use the tree for anything.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84949 13f79535-47bb-0310-9956-ffa450edef68
parent dac58711

include/util_cfgtree.h

0 → 100644
+70 −0
Changes for include/util_cfgtree.h: 70 added lines, 0 removed lines.
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/>.

 */



#ifndef AP_CONFTREE_H

#define AP_CONFTREE_H



typedef struct ap_directive_t {

    const char *directive;

    const char *args;

    int line_num;

    struct ap_directive_t *next;

    struct ap_directive_t *first_child;

    struct ap_directive_t *parent;

} ap_directive_t;



ap_directive_t *ap_add_node(ap_directive_t **parent, ap_directive_t *current, 

                            ap_directive_t *todadd, int child);



#endif

server/Makefile.in

+1 −1
Changes for server/Makefile.in: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ LTLIBRARY_SOURCES = \ 
    uri_delims.h test_char.h \

	buff.c http_config.c http_core.c http_log.c http_main.c \

	http_protocol.c http_request.c http_vhost.c util.c util_date.c \

	util_script.c util_uri.c util_md5.c \

	util_script.c util_uri.c util_md5.c util_cfgtree.c \

	rfc1413.c http_connection.c iol_file.c listen.c



include $(top_srcdir)/build/ltlib.mk

server/config.c

+23 −0
Changes for server/config.c: 23 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ 
#include "http_request.h"	/* for default_handler (see invoke_handler) */

#include "http_main.h"

#include "http_vhost.h"

#include "util_cfgtree.h"



HOOK_STRUCT(

	    HOOK_LINK(header_parser)
@@ -837,6 +838,9 @@ CORE_EXPORT(const char *) ap_handle_command(cmd_parms *parms, void *config, cons 
    const char *args, *cmd_name, *retval;

    const command_rec *cmd;

    module *mod = top_module;

    ap_directive_t *newdir;

    static ap_directive_t *current = NULL;

    static ap_directive_t *curr_parent = NULL;



    if ((l[0] == '#') || (!l[0]))

	return NULL;
@@ -850,6 +854,25 @@ CORE_EXPORT(const char *) ap_handle_command(cmd_parms *parms, void *config, cons 
    if (*cmd_name == '\0')

	return NULL;



    newdir = ap_pcalloc(parms->pool, sizeof(ap_directive_t));

    newdir->line_num = parms->config_file->line_number;

    newdir->directive = ap_pstrdup(parms->pool, cmd_name);

    newdir->args = ap_pstrdup(parms->pool, args);



    if (cmd_name[0] == '<') {

        if (cmd_name[1] != '/') {

            current = ap_add_node(&curr_parent, current, newdir, 1);

        }

        else {

            current = curr_parent;

            curr_parent = current->parent;

        }

    }

    else {

        current = ap_add_node(&curr_parent, current, newdir, 0);

    }

    newdir = NULL;



    oldconfig = parms->context;

    parms->context = config;

    do {

server/util_cfgtree.c

0 → 100644
+89 −0
Changes for server/util_cfgtree.c: 89 added lines, 0 removed lines.
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/>.

 *

 * Portions of this software are based upon public domain software

 * originally written at the National Center for Supercomputing Applications,

 * University of Illinois, Urbana-Champaign.

 */



#define CORE_PRIVATE

#include "util_cfgtree.h"

#include <stdlib.h>



ap_directive_t *conf_tree;



ap_directive_t *ap_add_node(ap_directive_t **parent, ap_directive_t *current, 

                            ap_directive_t *toadd, int child)

{

    if (current == NULL) {

        /* we just started a new parent */

        if (*parent == NULL) {

            /* no parent, no current: root of tree */

            conf_tree = toadd;

        }

        else {

            (*parent)->first_child = toadd;

        }

        return toadd;

    }

    current->next = toadd;

    toadd->parent = *parent;

    if (child) {

        /* switch parents, navigate into child */

        *parent = toadd;

        return NULL;

    }

    return conf_tree;

}