You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by mt...@apache.org on 2006/09/12 10:48:26 UTC
svn commit: r442526 - /apr/apr/branches/0.9.x/network_io/unix/sockets.c
Author: mturk
Date: Tue Sep 12 01:48:25 2006
New Revision: 442526
URL: http://svn.apache.org/viewvc?view=rev&rev=442526
Log:
Backport r442135 from trunk.
Modified:
apr/apr/branches/0.9.x/network_io/unix/sockets.c
Modified: apr/apr/branches/0.9.x/network_io/unix/sockets.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/0.9.x/network_io/unix/sockets.c?view=diff&rev=442526&r1=442525&r2=442526
==============================================================================
--- apr/apr/branches/0.9.x/network_io/unix/sockets.c (original)
+++ apr/apr/branches/0.9.x/network_io/unix/sockets.c Tue Sep 12 01:48:25 2006
@@ -153,27 +153,34 @@
apr_status_t apr_socket_accept(apr_socket_t **new, apr_socket_t *sock,
apr_pool_t *connection_context)
{
- alloc_socket(new, connection_context);
- set_socket_vars(*new, sock->local_addr->sa.sin.sin_family, SOCK_STREAM, sock->protocol);
+ int s;
+ apr_sockaddr_t sa;
-#ifndef HAVE_POLL
- (*new)->connected = 1;
-#endif
- (*new)->timeout = -1;
-
- (*new)->socketdes = accept(sock->socketdes,
- (struct sockaddr *)&(*new)->remote_addr->sa,
- &(*new)->remote_addr->salen);
+ apr_sockaddr_vars_set(&sa, sock->local_addr->sa.sin.sin_family, 0);
+ sa.pool = connection_context;
+ s = accept(sock->socketdes, (struct sockaddr *)&sa.sa, &sa.salen);
- if ((*new)->socketdes < 0) {
+ if (s < 0) {
return errno;
}
#ifdef TPF
- if ((*new)->socketdes == 0) {
+ if (s == 0) {
/* 0 is an invalid socket for TPF */
return APR_EINTR;
}
#endif
+ alloc_socket(new, connection_context);
+ set_socket_vars(*new, sock->local_addr->sa.sin.sin_family, SOCK_STREAM, sock->protocol);
+
+#ifndef HAVE_POLL
+ (*new)->connected = 1;
+#endif
+ (*new)->timeout = -1;
+
+ (*new)->remote_addr_unknown = 0;
+
+ (*new)->socketdes = s;
+ *(*new)->remote_addr = sa;
*(*new)->local_addr = *sock->local_addr;