From: David Reid <dreid@apache.org>
Date: Tue, 2 Nov 1999 12:26:41 +0000 (+0000)
Subject: Change the BeOS iol_socket layer to use apr.  Also update mpmt_beos.c
X-Git-Tag: 1.3.10~198
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc88b5f0097864886b4374f2cbfe1caa7b55021f;p=thirdparty%2Fapache%2Fhttpd.git

Change the BeOS iol_socket layer to use apr.  Also update mpmt_beos.c
to reflect this change.


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

diff --git a/server/mpm/mpmt_beos/mpmt_beos.c b/server/mpm/mpmt_beos/mpmt_beos.c
index e013096f751..042c7a978a2 100644
--- a/server/mpm/mpmt_beos/mpmt_beos.c
+++ b/server/mpm/mpmt_beos/mpmt_beos.c
@@ -643,11 +643,7 @@ static void process_socket(ap_context_t *p, ap_socket_t *sock, int my_child_num,
     long conn_id = my_child_num * HARD_THREAD_LIMIT + my_thread_num;
     int csd;
 
-    ap_get_os_sock(&csd, sock);
-
-    sock_disable_nagle(csd);
-
-    iol = beos_attach_socket(csd);
+    iol = beos_attach_socket(sock);
     if (iol == NULL) {
         if (errno == EBADF) {
             ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, errno, NULL,
@@ -659,7 +655,7 @@ static void process_socket(ap_context_t *p, ap_socket_t *sock, int my_child_num,
             ap_log_error(APLOG_MARK, APLOG_WARNING, errno, NULL,
                 "error attaching to socket");
         }
-        closesocket(csd);
+        ap_close_socket(sock);
 	return;
     }