Commit 95fecc66 authored by Ryan Bloom's avatar Ryan Bloom
Browse files

Get the Unix MPMs restarting again. If we are going to register a cleanup 

for ap_cleanup_scoreboard, then we have to kill that cleanup with the same
function.  This also makes ap_cleanup_scoreboard a non-static function, and
makes ap_cleanup_shared_mem a static function.


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

CHANGES

+5 −0
Original line number Diff line number Diff line 
Changes with Apache 2.0b1



  *) Get the Unix MPM's to do a graceful restart again.  If we are going

     to register a cleanup with ap_cleanup_scoreboard, then we have to

     kill the cleanup with the same function,  and that function can't be

     static.  [Ryan Bloom]



  *) Install all required header files.  Without these, it was not

     possible to compile some modules outside of the server.

     [Ryan Bloom]

include/scoreboard.h

+1 −1
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ typedef struct { 
AP_DECLARE(int) ap_exists_scoreboard_image(void);

AP_DECLARE(void) ap_create_scoreboard(apr_pool_t *p, ap_scoreboard_e t);

void reinit_scoreboard(apr_pool_t *p);

apr_status_t ap_cleanup_shared_mem(void *d);

AP_DECLARE(apr_status_t) ap_cleanup_scoreboard(void *d);



AP_DECLARE(void) reopen_scoreboard(apr_pool_t *p);

server/mpm/dexter/dexter.c

+1 −1
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ static void ap_start_restart(int graceful) 
    restart_pending = 1;

    is_graceful = graceful;

    if (is_graceful) {

        apr_kill_cleanup(pconf, NULL, ap_cleanup_shared_mem);

        apr_kill_cleanup(pconf, NULL, ap_cleanup_scoreboard);

    }

}

server/mpm/experimental/perchild/perchild.c

+1 −1
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ static void ap_start_restart(int graceful) 
    restart_pending = 1;

    is_graceful = graceful;

    if (is_graceful) {

        apr_kill_cleanup(pconf, NULL, ap_cleanup_shared_mem);

        apr_kill_cleanup(pconf, NULL, ap_cleanup_scoreboard);

    }

}

server/mpm/mpmt_pthread/mpmt_pthread.c

+1 −1
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ static void ap_start_restart(int graceful) 
    restart_pending = 1;

    is_graceful = graceful;

    if (is_graceful) {

        apr_kill_cleanup(pconf, NULL, ap_cleanup_shared_mem);

        apr_kill_cleanup(pconf, NULL, ap_cleanup_scoreboard);

    }

}