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...@apache.org on 2002/03/13 00:15:54 UTC
cvs commit: httpd-2.0/support ab.c
trawick 02/03/12 15:15:54
Modified: server/mpm/beos beos.c
server/mpm/mpmt_os2 mpmt_os2.c
server listen.c
support ab.c
Log:
simplify the way we find the family of an apr_sockaddr_t
Revision Changes Path
1.86 +1 -1 httpd-2.0/server/mpm/beos/beos.c
Index: beos.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/beos/beos.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- beos.c 21 Feb 2002 18:52:28 -0000 1.85
+++ beos.c 12 Mar 2002 23:15:54 -0000 1.86
@@ -782,7 +782,7 @@
"couldn't create control socket information, shutting down");
return 1;
}
- if (apr_socket_create(&udp_sock, udp_sa->sa.sin.sin_family, SOCK_DGRAM,
+ if (apr_socket_create(&udp_sock, udp_sa->family, SOCK_DGRAM,
_pconf) != APR_SUCCESS){
ap_log_error(APLOG_MARK, APLOG_ALERT, errno, s,
"couldn't create control socket, shutting down");
1.16 +1 -1 httpd-2.0/server/mpm/mpmt_os2/mpmt_os2.c
Index: mpmt_os2.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/mpmt_os2/mpmt_os2.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mpmt_os2.c 23 Feb 2002 11:25:57 -0000 1.15
+++ mpmt_os2.c 12 Mar 2002 23:15:54 -0000 1.16
@@ -181,7 +181,7 @@
ap_listeners = lr;
apr_sockaddr_info_get(&lr->bind_addr, "0.0.0.0", APR_UNSPEC,
DEFAULT_HTTP_PORT, 0, s->process->pool);
- apr_socket_create(&lr->sd, lr->bind_addr->sa.sin.sin_family,
+ apr_socket_create(&lr->sd, lr->bind_addr->family,
SOCK_STREAM, s->process->pool);
}
1.74 +1 -1 httpd-2.0/server/listen.c
Index: listen.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/listen.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- listen.c 7 Mar 2002 20:03:02 -0000 1.73
+++ listen.c 12 Mar 2002 23:15:54 -0000 1.74
@@ -272,7 +272,7 @@
return;
}
if ((status = apr_socket_create(&new->sd,
- new->bind_addr->sa.sin.sin_family,
+ new->bind_addr->family,
SOCK_STREAM, process->pool))
!= APR_SUCCESS) {
ap_log_perror(APLOG_MARK, APLOG_CRIT, status, process->pool,
1.88 +3 -3 httpd-2.0/support/ab.c
Index: ab.c
===================================================================
RCS file: /home/cvs/httpd-2.0/support/ab.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- ab.c 27 Jan 2002 06:38:25 -0000 1.87
+++ ab.c 12 Mar 2002 23:15:54 -0000 1.88
@@ -849,7 +849,7 @@
apr_pool_destroy(c->ctx);
apr_pool_create(&c->ctx, cntxt);
- if ((rv = apr_socket_create(&c->aprsock, destsa->sa.sin.sin_family,
+ if ((rv = apr_socket_create(&c->aprsock, destsa->family,
SOCK_STREAM, c->ctx)) != APR_SUCCESS) {
apr_err("socket", rv);
}
@@ -1302,14 +1302,14 @@
static void copyright(void)
{
if (!use_html) {
- printf("This is ApacheBench, Version %s\n", AP_SERVER_BASEREVISION " <$Revision: 1.87 $> apache-2.0");
+ printf("This is ApacheBench, Version %s\n", AP_SERVER_BASEREVISION " <$Revision: 1.88 $> apache-2.0");
printf("Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/\n");
printf("Copyright (c) 1998-2001 The Apache Software Foundation, http://www.apache.org/\n");
printf("\n");
}
else {
printf("<p>\n");
- printf(" This is ApacheBench, Version %s <i><%s></i> apache-2.0<br>\n", AP_SERVER_BASEREVISION, "$Revision: 1.87 $");
+ printf(" This is ApacheBench, Version %s <i><%s></i> apache-2.0<br>\n", AP_SERVER_BASEREVISION, "$Revision: 1.88 $");
printf(" Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/<br>\n");
printf(" Copyright (c) 1998-2001 The Apache Software Foundation, http://www.apache.org/<br>\n");
printf("</p>\n<p>\n");