some bug fixes from David

Submitted by:	David Reid <beos@server1.jetnet.co.uk>

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

diff --git a/os/beos/beosd.c b/os/beos/beosd.c
index af364c6989900940137d81c141326f01423fd1dd..be05feb208ea2af646001a82c224610e9528fca7 100644 (file)
--- a/os/beos/beosd.c
+++ b/os/beos/beosd.c
@@ -79,19 +79,11 @@ void unixd_detach(void)
     }
     RAISE_SIGSTOP(DETACH);
 
-#ifndef NO_SETSID
     if ((pgrp = setsid()) == -1) {
        perror("setsid");
        fprintf(stderr, "%s: setsid failed\n", ap_server_argv0);
        exit(1);
     }
-#else
-    if ((pgrp = setpgrp(getpid(), 0)) == -1) {
-       perror("setpgrp");
-       fprintf(stderr, "%s: setpgrp failed\n", ap_server_argv0);
-       exit(1);
-    }
-#endif
 
     /* close out the standard file descriptors */
     if (freopen("/dev/null", "r", stdin) == NULL) {

diff --git a/server/listen.c b/server/listen.c
index 9f7c121b7345a51a3a09d8b1cbeb9f7bad783081..14624d6dac38eb8045b0400891e0a920b7d8496e 100644 (file)
--- a/server/listen.c
+++ b/server/listen.c
@@ -121,7 +121,7 @@ static int make_sock(const struct sockaddr_in *server)
      *
      * If no size is specified, use the kernel default.
      */
-#ifndef SO_SNDBUF
+#ifdef SO_SNDBUF
     if (send_buffer_size) {
        if (setsockopt(s, SOL_SOCKET, SO_SNDBUF,
                (char *) &send_buffer_size, sizeof(int)) < 0) {