cvs commit: httpd-2.0/server/mpm/winnt mpm_winnt.c

[wr...@apache.org]

wrowe       02/01/17 16:11:16

  Modified:    server/mpm/winnt mpm_winnt.c
  Log:
    Provide the win32 worker process a null (but valid) stdout pipe, and
    redirect child startup errors to the main server error log.
    Corresponds to the change in Apache 1.3.23
  
  Revision  Changes    Path
  1.206     +55 -4     httpd-2.0/server/mpm/winnt/mpm_winnt.c
  
  Index: mpm_winnt.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/winnt/mpm_winnt.c,v
  retrieving revision 1.205
  retrieving revision 1.206
  diff -u -r1.205 -r1.206
  --- mpm_winnt.c	10 Jan 2002 08:47:23 -0000	1.205
  +++ mpm_winnt.c	18 Jan 2002 00:11:16 -0000	1.206
  @@ -1222,9 +1222,14 @@
   
       ap_listen_rec *lr;
       DWORD BytesWritten;
  -    HANDLE hPipeRead = NULL;
  -    HANDLE hPipeWrite = NULL;
  -    SECURITY_ATTRIBUTES sa = {0};  
  +    HANDLE hPipeRead;
  +    HANDLE hPipeWrite;
  +    HANDLE hPipeWriteDup;
  +    HANDLE hNullOutput;
  +    HANDLE hShareError;
  +    HANDLE hShareErrorDup;
  +    HANDLE hCurrentProcess = GetCurrentProcess();
  +    SECURITY_ATTRIBUTES sa = {sizeof(SECURITY_ATTRIBUTES), NULL, TRUE};
   
       LPWSAPROTOCOL_INFO  lpWSAProtocolInfo;
   
  @@ -1284,6 +1289,42 @@
           return -1;
       }
   
  +    /* Make our end of the handle non-inherited */
  +    if (DuplicateHandle(hCurrentProcess, hPipeWrite, hCurrentProcess,
  +                        &hPipeWriteDup, 0, FALSE, DUPLICATE_SAME_ACCESS))
  +    {
  +        CloseHandle(hPipeWrite);
  +        hPipeWrite = hPipeWriteDup;
  +    }
  +
  +    /* Open a null handle to soak info from the child */
  +    hNullOutput = CreateFile("nul", GENERIC_READ | GENERIC_WRITE, 
  +                             FILE_SHARE_READ | FILE_SHARE_WRITE, 
  +                             &sa, OPEN_EXISTING, 0, NULL);
  +    if (hNullOutput == INVALID_HANDLE_VALUE) {
  +        ap_log_error(APLOG_MARK, APLOG_CRIT, APR_FROM_OS_ERROR(rv), ap_server_conf,
  +                     "Parent: Unable to create null output pipe for child process.\n");
  +        return -1;
  +    }
  +
  +    /* Child's initial stderr -> our main server error log (or, failing that, stderr) */
  +    if (ap_server_conf->error_log) {
  +        rv = apr_os_file_get(&hShareError, ap_server_conf->error_log);
  +        if (rv == APR_SUCCESS && hShareError != INVALID_HANDLE_VALUE) {
  +            if (DuplicateHandle(hCurrentProcess, hShareError, 
  +                                hCurrentProcess, &hShareErrorDup, 
  +                                0, TRUE, DUPLICATE_SAME_ACCESS)) {
  +                hShareError = hShareErrorDup;
  +            }
  +            else {
  +                rv = apr_get_os_error();
  +            }
  +        }
  +        if (rv != APR_SUCCESS || hShareError == INVALID_HANDLE_VALUE) {
  +            hShareError = GetStdHandle(STD_ERROR_HANDLE);
  +        }
  +    }
  +
       /* Give the read end of the pipe (hPipeRead) to the child as stdin. The 
        * parent will write the socket data to the child on this pipe.
        */
  @@ -1293,6 +1334,8 @@
       si.dwFlags     = STARTF_USESHOWWINDOW | STARTF_USESTDHANDLES;
       si.wShowWindow = SW_HIDE;
       si.hStdInput   = hPipeRead;
  +    si.hStdOutput  = hNullOutput;
  +    si.hStdError   = hShareError;
   
       if (!CreateProcess(NULL, pCommand, NULL, NULL, 
                          TRUE,               /* Inherit handles */
  @@ -1306,11 +1349,19 @@
            * We must close the handles to the new process and its main thread
            * to prevent handle and memory leaks.
            */ 
  +        CloseHandle(hPipeWrite);
  +        CloseHandle(hPipeRead);
  +        CloseHandle(hNullOutput);
  +        CloseHandle(hShareError);
           CloseHandle(pi.hProcess);
           CloseHandle(pi.hThread);
           return -1;
       }
   
  +    CloseHandle(hPipeRead);
  +    CloseHandle(hNullOutput);
  +    CloseHandle(hShareError);
  +
       ap_log_error(APLOG_MARK, APLOG_INFO, APR_SUCCESS, ap_server_conf,
                    "Parent: Created child process %d", pi.dwProcessId);
   
  @@ -1325,6 +1376,7 @@
       if (!(*child_exit_event)) {
           ap_log_error(APLOG_MARK, APLOG_CRIT, apr_get_os_error(), ap_server_conf,
                        "Parent: Could not create exit event for child process");
  +        CloseHandle(hPipeWrite);
           CloseHandle(pi.hProcess);
           CloseHandle(pi.hThread);
           return -1;
  @@ -1370,7 +1422,6 @@
                        "Parent: BytesWritten = %d WSAProtocolInfo = %x20", BytesWritten, *lpWSAProtocolInfo);
       }
   
  -    CloseHandle(hPipeRead);
       CloseHandle(hPipeWrite);        
   
       return 0;