You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@locus.apache.org on 2000/06/27 04:23:31 UTC
cvs commit: apache-2.0/src/lib/apr/network_io/win32 sockopt.c
trawick 00/06/26 19:23:30
Modified: src CHANGES
src/lib/apr/network_io/unix sockopt.c
src/lib/apr/network_io/win32 sockopt.c
Log:
Change Unix and Win32 ap_setsockopt() so that APR_SO_NONBLOCK
with non-zero argument makes the socket non-blocking. BeOS and
OS/2 already worked this way.
Revision Changes Path
1.166 +4 -0 apache-2.0/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apache-2.0/src/CHANGES,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- CHANGES 2000/06/27 01:26:14 1.165
+++ CHANGES 2000/06/27 02:23:28 1.166
@@ -1,4 +1,8 @@
Changes with Apache 2.0a5
+ *) Change Unix and Win32 ap_setsockopt() so that APR_SO_NONBLOCK
+ with non-zero argument makes the socket non-blocking. BeOS and
+ OS/2 already worked this way. [Jeff Trawick]
+
*) ap_close() now calls ap_flush() for buffered files, so write
operations work a whole lot better on buffered files.
[Jeff Trawick]
1.30 +2 -2 apache-2.0/src/lib/apr/network_io/unix/sockopt.c
Index: sockopt.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/sockopt.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sockopt.c 2000/06/22 17:42:29 1.29
+++ sockopt.c 2000/06/27 02:23:29 1.30
@@ -142,11 +142,11 @@
}
if (opt & APR_SO_NONBLOCK) {
if (on) {
- if ((stat = soblock(sock->socketdes)) != APR_SUCCESS)
+ if ((stat = sononblock(sock->socketdes)) != APR_SUCCESS)
return stat;
}
else {
- if ((stat = sononblock(sock->socketdes)) != APR_SUCCESS)
+ if ((stat = soblock(sock->socketdes)) != APR_SUCCESS)
return stat;
}
}
1.19 +2 -2 apache-2.0/src/lib/apr/network_io/win32/sockopt.c
Index: sockopt.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/win32/sockopt.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sockopt.c 2000/06/14 20:55:59 1.18
+++ sockopt.c 2000/06/27 02:23:29 1.19
@@ -141,11 +141,11 @@
break;
case APR_SO_NONBLOCK:
if (on) {
- if ((stat = soblock(sock->sock)) != APR_SUCCESS)
+ if ((stat = sononblock(sock->sock)) != APR_SUCCESS)
return stat;
}
else {
- if ((stat = sononblock(sock->sock)) != APR_SUCCESS)
+ if ((stat = soblock(sock->sock)) != APR_SUCCESS)
return stat;
}
break;