Commit 0984d20b authored by Jeff Trawick's avatar Jeff Trawick
Browse files

yank some dead code and variables 


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

server/mpm/winnt/mpm_winnt.c

+0 −19
Changes for server/mpm/winnt/mpm_winnt.c: 0 added lines, 19 removed lines.
Original line number Diff line number Diff line
@@ -91,25 +91,6 @@ void child_main(apr_pool_t *pconf); 
 */

static HANDLE pipe;



/* Stub functions until this MPM supports the connection status API */



AP_DECLARE(void) ap_update_connection_status(long conn_id, const char *key, \

                                             const char *value)

{

    /* NOP */

}



AP_DECLARE(void) ap_reset_connection_status(long conn_id)

{

    /* NOP */

}



AP_DECLARE(apr_array_header_t *) ap_get_status_table(apr_pool_t *p)

{

    /* NOP */

    return NULL;

}



/*

 * Command processors

 */

server/mpm/winnt/nt_eventlog.c

+0 −2
Changes for server/mpm/winnt/nt_eventlog.c: 0 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -132,10 +132,8 @@ void mpm_nt_eventlog_stderr_flush(void) 
void mpm_nt_eventlog_stderr_open(char *argv0, apr_pool_t *p)

{

    SECURITY_ATTRIBUTES sa;

    HANDLE hProc = GetCurrentProcess();

    HANDLE hPipeRead = NULL;

    HANDLE hPipeWrite = NULL;

    HANDLE hDup = NULL;

    DWORD  threadid;

    apr_file_t *eventlog_file;

    apr_file_t *stderr_file;

server/mpm/winnt/service.c

+0 −36
Changes for server/mpm/winnt/service.c: 0 added lines, 36 removed lines.
Original line number Diff line number Diff line
@@ -159,8 +159,6 @@ void hold_console_open_on_error(void) 
    while ((remains > 0) && WaitForSingleObject(hConIn, 1000) != WAIT_FAILED);

}



static BOOL  die_on_logoff = FALSE;



static BOOL CALLBACK console_control_handler(DWORD ctrl_type)

{

    switch (ctrl_type)
@@ -210,39 +208,6 @@ void mpm_start_console_handler(void) 
}





/* Special situation - children of services need to mind their

 * P's & Q's and wait quietly, ignoring the mean OS signaling

 * shutdown and other horrors, to kill them gracefully...

 */



static BOOL CALLBACK child_control_handler(DWORD ctrl_type)

{

    switch (ctrl_type)

    {

        case CTRL_C_EVENT:

        case CTRL_BREAK_EVENT:

            /* for Interrupt signals, ignore them.

             * The system will also signal the parent process,

             * which will terminate Apache.

             */

            return TRUE;



        case CTRL_CLOSE_EVENT:

        case CTRL_LOGOFF_EVENT:

        case CTRL_SHUTDOWN_EVENT:

            /* for Shutdown signals, ignore them, but...             .

             * The system will also signal the parent process,

             * which will terminate Apache, so we need to wait.

             */

            Sleep(30000);

            return TRUE;

    }



    /* We should never get here, but this is (mostly) harmless */

    return FALSE;

}





void mpm_start_child_console_handler(void)

{

    FreeConsole();
@@ -302,7 +267,6 @@ static void set_service_description(void) 
{

    const char *full_description;

    SC_HANDLE schSCManager;

    BOOL ret = 0;



    /* Nothing to do if we are a console

     */