You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by dr...@locus.apache.org on 2000/07/03 13:32:51 UTC
cvs commit: apache-2.0/src/lib/apr/network_io/beos sockopt.c
dreid 00/07/03 04:32:50
Modified: src/os/beos Makefile.in
src/lib/apr/network_io/beos sockopt.c
Log:
Bring beos back into line following the changes to iol_socket.
Revision Changes Path
1.5 +1 -1 apache-2.0/src/os/beos/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/os/beos/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.in 2000/04/30 00:06:06 1.4
+++ Makefile.in 2000/07/03 11:32:39 1.5
@@ -1,5 +1,5 @@
LTLIBRARY_NAME = libos.la
-LTLIBRARY_SOURCES = os.c beosd.c iol_socket.c
+LTLIBRARY_SOURCES = os.c beosd.c
include $(top_srcdir)/build/ltlib.mk
1.21 +13 -1 apache-2.0/src/lib/apr/network_io/beos/sockopt.c
Index: sockopt.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/sockopt.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sockopt.c 2000/06/14 14:01:40 1.20
+++ sockopt.c 2000/07/03 11:32:48 1.21
@@ -58,7 +58,7 @@
#else
#include "networkio.h"
-int setnonblocking(int on, int sock)
+static int setnonblocking(int on, int sock)
{
return setsockopt(sock, SOL_SOCKET, SO_NONBLOCK,
&on, sizeof(on));
@@ -109,6 +109,18 @@
}
return APR_SUCCESS;
}
+
+ap_status_t ap_getsocketopt(ap_socket_t *sock, ap_int32_t opt, ap_int32_t *on)
+{
+ switch(opt) {
+ case APR_SO_TIMEOUT:
+ *on = sock->timeout;
+ break;
+ default:
+ return APR_EINVAL;
+ }
+ return APR_SUCCESS;
+}
ap_status_t ap_gethostname(char * buf, int len, ap_pool_t *cont)
{