repair some compile warnings, axe a wasted getsockname() call and

some unnecessary local vars, fix bug in a rare trace of a pid

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

diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index 61b9e02f76027d15d228b0b9c3482a6dc24dadc5..a2b4971862b8bea79162bf9967d9acb5baa5b5df 100644 (file)
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -89,6 +89,7 @@
 
 #include "ap_config.h"
 #include "apr_portable.h"
+#include "apr_thread_proc.h"
 #include "httpd.h"
 #include "mpm_default.h"
 #include "mpm_status.h"
@@ -1397,13 +1398,6 @@ int ap_graceful_stop_signalled(void)
 
 static void child_main(int child_num_arg)
 {
-/* XXX replace int with NET_SIZE_T, this is defined in ap_config.h which
-   has macros we can't make visible to this file, but it is the original 
-   type for clen.
-*/
-    int clen;
-    struct sockaddr sa_server;
-    struct sockaddr sa_client;
     ap_listen_rec *lr;
     ap_listen_rec *last_lr;
     ap_listen_rec *first_lr;
@@ -1542,7 +1536,6 @@ static void child_main(int child_num_arg)
                    /* we didn't get a socket, and we were told to die */
                    clean_child_exit(0);
                }
-               clen = sizeof(sa_client);
                stat = ap_accept(&csd, sd, ptrans);
                if (stat == APR_SUCCESS || stat != APR_EINTR)
                    break;
@@ -1672,13 +1665,6 @@ static void child_main(int child_num_arg)
 
         ap_get_os_sock(&sockdes, csd);
 
-       clen = sizeof(sa_server);
-       if (getsockname(sockdes, &sa_server, &clen) < 0) {
-           ap_log_error(APLOG_MARK, APLOG_ERR, errno, server_conf, "getsockname");
-           ap_close_socket(csd);
-           continue;
-       }
-
        sock_disable_nagle(sockdes);
 
        iol = unix_attach_socket(csd);
@@ -2136,9 +2122,12 @@ int ap_mpm_run(ap_pool_t *_pconf, ap_pool_t *plog, server_rec *s)
                    * scoreboard.  Somehow we don't know about this
                    * child.
                    */
+                ap_os_proc_t os_pid;
+
+                ap_get_os_proc(&os_pid, pid);
                ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 
                             0, server_conf,
-                           "long lost child came home! (pid %d)", pid);
+                           "long lost child came home! (pid %d)", os_pid);
            }
            /* Don't perform idle maintenance when a child dies,
                * only do it when there's a timeout.  Remember only a