Commit 00f5659d authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  Fix some symbols which should -not- be exported, and decorate real_exit_code
  with ap_ (this symbol must be exported.)  If the others were desired to be
  public, they should have been ap_xxx decorated.


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

include/ap_mmn.h

+4 −1
Original line number Diff line number Diff line
@@ -89,12 +89,15 @@ 
 * 20050127.0 (2.1.3-dev) renamed regex_t->ap_regex_t, regmatch_t->ap_regmatch_t,

 *                        REG_*->AP_REG_*, removed reg* in place of ap_reg*;

 *                        added ap_regex.h

 * 20050217.0 (2.1.3-dev) Axed find_child_by_pid, mpm_*_completion_context (winnt mpm)

 *                        symbols from the public sector, and decorated real_exit_code

 *                        with ap_ in the win32 os.h.

 */



#define MODULE_MAGIC_COOKIE 0x41503230UL /* "AP20" */



#ifndef MODULE_MAGIC_NUMBER_MAJOR

#define MODULE_MAGIC_NUMBER_MAJOR 20050127

#define MODULE_MAGIC_NUMBER_MAJOR 20050217

#endif

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

include/ap_release.h

+3 −0
Original line number Diff line number Diff line
@@ -17,6 +17,9 @@ 
#ifndef AP_RELEASE_H

#define AP_RELEASE_H



/* The numeric compile-time version constants. These constants are the

 * authoritative version numbers for APR. 

 */

/** Properly quote a value as a string in the C preprocessor */

#define AP_STRINGIFY(n) AP_STRINGIFY_HELPER(n)

/** Helper macro for AP_STRINGIFY */

include/scoreboard.h

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,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);

    

AP_DECLARE(int) find_child_by_pid(apr_proc_t *pid);

int 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);

server/mpm/winnt/child.c

+4 −4
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ static HANDLE ThreadDispatchIOCP = NULL; 
static HANDLE qwait_event = NULL;





AP_DECLARE(void) mpm_recycle_completion_context(PCOMP_CONTEXT context)

void mpm_recycle_completion_context(PCOMP_CONTEXT context)

{

    /* Recycle the completion context.

     * - clear the ptrans pool
@@ -94,7 +94,7 @@ AP_DECLARE(void) mpm_recycle_completion_context(PCOMP_CONTEXT context) 
    }

}



AP_DECLARE(PCOMP_CONTEXT) mpm_get_completion_context(void)

PCOMP_CONTEXT mpm_get_completion_context(void)

{

    apr_status_t rv;

    PCOMP_CONTEXT context = NULL;
@@ -190,7 +190,7 @@ AP_DECLARE(PCOMP_CONTEXT) mpm_get_completion_context(void) 
    return context;

}



AP_DECLARE(apr_status_t) mpm_post_completion_context(PCOMP_CONTEXT context, 

apr_status_t mpm_post_completion_context(PCOMP_CONTEXT context, 

                                         io_state_e state)

{

    LPOVERLAPPED pOverlapped;

server/mpm/winnt/mpm_winnt.c

+4 −4
Original line number Diff line number Diff line
@@ -1109,7 +1109,7 @@ void winnt_rewrite_args(process_rec *process) 
        parent_pid = (DWORD) atol(pid);



        /* Prevent holding open the (nonexistant) console */

        real_exit_code = 0;

        ap_real_exit_code = 0;



        /* The parent is responsible for providing the

         * COMPLETE ARGUMENTS REQUIRED to the child.
@@ -1182,11 +1182,11 @@ void winnt_rewrite_args(process_rec *process) 
        switch (optbuf[1]) {



        /* Shortcuts; include the -w option to hold the window open on error.

         * This must not be toggled once we reset real_exit_code to 0!

         * This must not be toggled once we reset ap_real_exit_code to 0!

         */

        case 'w':

            if (real_exit_code)

                real_exit_code = 2;

            if (ap_real_exit_code)

                ap_real_exit_code = 2;

            break;



        case 'n':