trawick 2002/10/18 07:13:38
Modified: network_io/os2 sockets.c
network_io/unix sockets.c
network_io/win32 sockets.c
Log:
apr_os_sock_put() shouldn't assume any particular protocol
Submitted by: Randall Stewart <[EMAIL PROTECTED]>
Reviewed by: Jeff Trawick
Revision Changes Path
1.58 +1 -1 apr/network_io/os2/sockets.c
Index: sockets.c
===================================================================
RCS file: /home/cvs/apr/network_io/os2/sockets.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sockets.c 18 Oct 2002 12:03:59 -0000 1.57
+++ sockets.c 18 Oct 2002 14:13:38 -0000 1.58
@@ -297,7 +297,7 @@
}
if ((*sock) == NULL) {
alloc_socket(sock, cont);
- set_socket_vars(*sock, AF_INET, SOCK_STREAM, APR_PROTO_TCP);
+ set_socket_vars(*sock, AF_INET, SOCK_STREAM, 0);
(*sock)->timeout = -1;
}
1.103 +1 -1 apr/network_io/unix/sockets.c
Index: sockets.c
===================================================================
RCS file: /home/cvs/apr/network_io/unix/sockets.c,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- sockets.c 18 Oct 2002 12:03:59 -0000 1.102
+++ sockets.c 18 Oct 2002 14:13:38 -0000 1.103
@@ -377,7 +377,7 @@
/* XXX IPv6 figure out the family here! */
/* XXX figure out the actual socket type here */
/* *or* just decide that apr_os_sock_put() has to be told the family
and type */
- set_socket_vars(*sock, APR_INET, SOCK_STREAM, APR_PROTO_TCP);
+ set_socket_vars(*sock, APR_INET, SOCK_STREAM, 0);
(*sock)->timeout = -1;
}
(*sock)->local_port_unknown = (*sock)->local_interface_unknown = 1;
1.88 +1 -1 apr/network_io/win32/sockets.c
Index: sockets.c
===================================================================
RCS file: /home/cvs/apr/network_io/win32/sockets.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- sockets.c 18 Oct 2002 14:03:42 -0000 1.87
+++ sockets.c 18 Oct 2002 14:13:38 -0000 1.88
@@ -466,7 +466,7 @@
alloc_socket(sock, cont);
/* XXX figure out the actual socket type here */
/* *or* just decide that apr_os_sock_put() has to be told the family
and type */
- set_socket_vars(*sock, AF_INET, SOCK_STREAM, APR_PROTO_TCP);
+ set_socket_vars(*sock, AF_INET, SOCK_STREAM, 0);
(*sock)->timeout = -1;
(*sock)->disconnected = 0;
}
