Commit 1ba2bf72 authored by Paul Querna's avatar Paul Querna
Browse files

API Cleanup in preperation for 2.4.x, make sure all exported functions or... 

API Cleanup in preperation for 2.4.x, make sure all exported functions or variables contain an ap_ prefix.


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

CHANGES

+12 −0
Original line number Diff line number Diff line
@@ -2,6 +2,18 @@ 
Changes with Apache 2.3.0

[ When backported to 2.2.x, remove entry from this file ]



  *) Rename APIs to include ap_ prefix:

        find_child_by_pid -> ap_find_child_by_pid

        suck_in_APR -> ap_suck_in_APR

        sys_privileges_handlers -> ap_sys_privileges_handlers

        unixd_accept -> ap_unixd_accept

        unixd_config -> ap_unixd_config

        unixd_killpg -> ap_unixd_killpg

        unixd_set_global_mutex_perms -> ap_unixd_set_global_mutex_perms

        unixd_set_proc_mutex_perms -> ap_unixd_set_proc_mutex_perms

        unixd_set_rlimit -> ap_unixd_set_rlimit

     [Paul Querna]



  *) core: When the ap_http_header_filter processes an error bucket, cleanup

     the passed brigade before returning AP_FILTER_ERROR down the filter 

     chain. This unambiguously ensures the same error bucket isn't revisited

include/ap_mmn.h

+2 −1
Original line number Diff line number Diff line
@@ -181,12 +181,13 @@ 
 *                         from util_filter.h to httpd.h and change their

 *                         numeric values so they do not overlap with other

 *                         potential status codes

 * 20081201.0 (2.3.0-dev)  Rename several APIs to include ap_ prefix.

 */



#define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */



#ifndef MODULE_MAGIC_NUMBER_MAJOR

#define MODULE_MAGIC_NUMBER_MAJOR 20081129

#define MODULE_MAGIC_NUMBER_MAJOR 20081201

#endif

#define MODULE_MAGIC_NUMBER_MINOR 0                     /* 0...n */

include/mpm_common.h

+1 −1
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ extern const char *ap_mpm_set_exception_hook(cmd_parms *cmd, void *dummy, 
AP_DECLARE_HOOK(int,monitor,(apr_pool_t *p))



/* register modules that undertake to manage system security */

AP_DECLARE(int) sys_privileges_handlers(int inc);

AP_DECLARE(int) ap_sys_privileges_handlers(int inc);

AP_DECLARE_HOOK(int, drop_privileges, (apr_pool_t * pchild, server_rec * s))



#ifdef __cplusplus

include/scoreboard.h

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ apr_status_t ap_cleanup_scoreboard(void *d); 
AP_DECLARE(void) ap_create_sb_handle(ap_sb_handle_t **new_sbh, apr_pool_t *p,

                                     int child_num, int thread_num);

    

int find_child_by_pid(apr_proc_t *pid);

AP_DECLARE(int) ap_find_child_by_pid(apr_proc_t *pid);

AP_DECLARE(int) ap_update_child_status(ap_sb_handle_t *sbh, int status, request_rec *r);

AP_DECLARE(int) ap_update_child_status_from_indexes(int child_num, int thread_num,

                                                    int status, request_rec *r);

modules/arch/netware/mod_netware.c

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ static int 
netware_pre_config(apr_pool_t *pconf, apr_pool_t *plog,

                 apr_pool_t *ptemp)

{

    sys_privileges_handlers(1);

    ap_sys_privileges_handlers(1);

    return OK;

}