Commit c90f50f7 authored by Ben Laurie's avatar Ben Laurie
Browse files

Long overdue name change from "generic hook" to "optional hook". 


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

modules/experimental/config.m4

+2 −2
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ APACHE_MODULE(disk_cache, disk caching module, , , no) 
APACHE_MODULE(ext_filter, external filter module, , , no)

APACHE_MODULE(case_filter, example uppercase conversion filter, , , no)

APACHE_MODULE(case_filter_in, example uppercase conversion input filter, , , no)

APACHE_MODULE(generic_hook_export, example hook exporter, , , no)

APACHE_MODULE(generic_hook_import, example hook importer, , , no)

APACHE_MODULE(optional_hook_export, example optional hook exporter, , , no)

APACHE_MODULE(optional_hook_import, example optional hook importer, , , no)

APACHE_MODULE(optional_fn_import, example optional function importer, , , no)

APACHE_MODULE(optional_fn_export, example optional function exporter, , , no)

modules/experimental/mod_generic_hook_export.c→modules/experimental/mod_optional_hook_export.c

+5 −4
Original line number Diff line number Diff line
@@ -54,10 +54,11 @@ 


#include "httpd.h"

#include "http_config.h"

#include "mod_generic_hook_export.h"

#include "mod_optional_hook_export.h"

#include "http_protocol.h"



APR_IMPLEMENT_GENERIC_HOOK_RUN_ALL(ap,AP_MODULE,int,generic_hook_test,(const char *szStr),

APR_IMPLEMENT_OPTIONAL_HOOK_RUN_ALL(ap,AP_MODULE,int,generic_hook_test,

				    (const char *szStr),

				    (szStr),OK,DECLINED)



static int ExportLogTransaction(request_rec *r)
@@ -70,7 +71,7 @@ static void ExportRegisterHooks(apr_pool_t *p) 
    ap_hook_log_transaction(ExportLogTransaction,NULL,NULL,APR_HOOK_MIDDLE);

}



module generic_hook_export_module =

module optional_hook_export_module =

{

    STANDARD20_MODULE_STUFF,

    NULL,

modules/experimental/mod_generic_hook_export.h→modules/experimental/mod_optional_hook_export.h

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 
#ifndef MOD_GENERIC_HOOK_EXPORT_H

#define MOD_GENERIC_HOOK_EXPORT_H



#include "apr_generic_hook.h"

#include "apr_optional_hooks.h"



APR_DECLARE_EXTERNAL_HOOK(ap,AP_MODULE,int,generic_hook_test,(const char *))

modules/experimental/mod_generic_hook_import.c→modules/experimental/mod_optional_hook_import.c

+4 −4
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 
#include "httpd.h"

#include "http_config.h"

#include "http_log.h"

#include "mod_generic_hook_export.h"

#include "mod_optional_hook_export.h"



static int ImportGenericHookTestHook(const char *szStr)

{
@@ -67,11 +67,11 @@ static int ImportGenericHookTestHook(const char *szStr) 


static void ImportRegisterHooks(apr_pool_t *p)

{

    APR_HOOK_GENERIC(ap,generic_hook_test,ImportGenericHookTestHook,NULL,NULL,

    APR_OPTIONAL_HOOK(ap,generic_hook_test,ImportGenericHookTestHook,NULL,NULL,

		      APR_HOOK_MIDDLE);

}



module generic_hook_import_module=

module optional_hook_import_module=

{

    STANDARD20_MODULE_STUFF,

    NULL,

modules/test/mod_optional_hook_export.c

0 → 100644
+83 −0
Original line number Diff line number Diff line 
/* ====================================================================

 * The Apache Software License, Version 1.1

 *

 * Copyright (c) 2000-2001 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 "httpd.h"

#include "http_config.h"

#include "mod_optional_hook_export.h"

#include "http_protocol.h"



APR_IMPLEMENT_OPTIONAL_HOOK_RUN_ALL(ap,AP_MODULE,int,generic_hook_test,

				    (const char *szStr),

				    (szStr),OK,DECLINED)



static int ExportLogTransaction(request_rec *r)

{

    return ap_run_generic_hook_test(r->the_request);

}



static void ExportRegisterHooks(apr_pool_t *p)

{

    ap_hook_log_transaction(ExportLogTransaction,NULL,NULL,APR_HOOK_MIDDLE);

}



module optional_hook_export_module =

{

    STANDARD20_MODULE_STUFF,

    NULL,

    NULL,

    NULL,

    NULL,

    NULL,

    ExportRegisterHooks

};