httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/support ab.c
Date Wed, 18 Jul 2001 16:56:55 GMT
wrowe       01/07/18 09:56:55

  Modified:    server   listen.c mpm_common.c rfc1413.c
               server/mpm/winnt mpm_winnt.c
               support  ab.c
  Log:
    Changes to back out inherit flag from apr_os_sock_make()
    and apr_socket_create()
  
  Revision  Changes    Path
  1.55      +3 -2      httpd-2.0/server/listen.c
  
  Index: listen.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/listen.c,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- listen.c	2001/07/16 16:11:03	1.54
  +++ listen.c	2001/07/18 16:56:55	1.55
  @@ -191,7 +191,7 @@
       if (default_family == APR_UNSPEC) {
           apr_socket_t *tmp_sock;
   
  -        if (apr_socket_create(&tmp_sock, APR_INET6, SOCK_STREAM, APR_INHERIT,
  +        if (apr_socket_create(&tmp_sock, APR_INET6, SOCK_STREAM,
                                 p) == APR_SUCCESS) {
               apr_socket_close(tmp_sock);
               default_family = APR_INET6;
  @@ -254,11 +254,12 @@
           return;
       }
       if ((status = apr_socket_create(&new->sd, new->bind_addr->sa.sin.sin_family,

  -                                    SOCK_STREAM, APR_INHERIT, process->pool)) != APR_SUCCESS)
{
  +                                    SOCK_STREAM, process->pool)) != APR_SUCCESS) {
           ap_log_perror(APLOG_MARK, APLOG_CRIT, status, process->pool,
                        "alloc_listener: failed to get a socket for %s", addr);
           return;
       }
  +    apr_socket_inherit_set();
       new->next = ap_listeners;
       ap_listeners = new;
   }
  
  
  
  1.57      +1 -1      httpd-2.0/server/mpm_common.c
  
  Index: mpm_common.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm_common.c,v
  retrieving revision 1.56
  retrieving revision 1.57
  diff -u -r1.56 -r1.57
  --- mpm_common.c	2001/07/16 16:11:03	1.56
  +++ mpm_common.c	2001/07/18 16:56:55	1.57
  @@ -403,7 +403,7 @@
       }
       
       apr_sockaddr_info_get(&sa, "127.0.0.1", APR_UNSPEC, ap_listeners->bind_addr->port,
0, pod->p);
  -    rv = apr_socket_create(&sock, sa->family, SOCK_STREAM, APR_NO_INHERIT, pod->p);
  +    rv = apr_socket_create(&sock, sa->family, SOCK_STREAM, pod->p);
       if (rv != APR_SUCCESS) {
           ap_log_error(APLOG_MARK, APLOG_WARNING, rv, ap_server_conf,
                        "get socket to connect to listener");
  
  
  
  1.42      +1 -1      httpd-2.0/server/rfc1413.c
  
  Index: rfc1413.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/rfc1413.c,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- rfc1413.c	2001/07/16 16:11:03	1.41
  +++ rfc1413.c	2001/07/18 16:56:55	1.42
  @@ -141,7 +141,7 @@
   
       if ((rv = apr_socket_create(newsock, 
                                   localsa->sa.sin.sin_family, /* has to match */
  -                                SOCK_STREAM, APR_NO_INHERIT, conn->pool)) != APR_SUCCESS)
{
  +                                SOCK_STREAM, conn->pool)) != APR_SUCCESS) {
   	ap_log_error(APLOG_MARK, APLOG_CRIT, rv, srv,
                        "rfc1413: error creating query socket");
           return rv;
  
  
  
  1.164     +1 -1      httpd-2.0/server/mpm/winnt/mpm_winnt.c
  
  Index: mpm_winnt.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/winnt/mpm_winnt.c,v
  retrieving revision 1.163
  retrieving revision 1.164
  diff -u -r1.163 -r1.164
  --- mpm_winnt.c	2001/07/16 18:14:51	1.163
  +++ mpm_winnt.c	2001/07/18 16:56:55	1.164
  @@ -899,7 +899,7 @@
           sockinfo.family  = APR_INET;
           sockinfo.type    = SOCK_STREAM;
           /* ### is this correct?  Shouldn't be inheritable (at this point) */
  -        apr_os_sock_make(&context->sock, &sockinfo, APR_NO_INHERIT, context->ptrans);
  +        apr_os_sock_make(&context->sock, &sockinfo, context->ptrans);
   
           c = ap_new_connection(context->ptrans, server_conf, context->sock,
                                 thread_num);
  
  
  
  1.74      +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.73
  retrieving revision 1.74
  diff -u -r1.73 -r1.74
  --- ab.c	2001/07/16 16:11:05	1.73
  +++ ab.c	2001/07/18 16:56:55	1.74
  @@ -844,7 +844,7 @@
   	apr_err(buf, rv);
       }
       if ((rv = apr_socket_create(&c->aprsock, destsa->sa.sin.sin_family,
  -				SOCK_STREAM, APR_NO_INHERIT, cntxt)) != APR_SUCCESS) {
  +				SOCK_STREAM, cntxt)) != APR_SUCCESS) {
   	apr_err("socket", rv);
       }
       c->start = apr_time_now();
  @@ -1289,14 +1289,14 @@
   static void copyright(void)
   {
       if (!use_html) {
  -	printf("This is ApacheBench, Version %s\n", AB_VERSION " <$Revision: 1.73 $> apache-2.0");
  +	printf("This is ApacheBench, Version %s\n", AB_VERSION " <$Revision: 1.74 $> 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>&lt;%s&gt;</i> apache-2.0<br>\n",
AB_VERSION, "$Revision: 1.73 $");
  +	printf(" This is ApacheBench, Version %s <i>&lt;%s&gt;</i> apache-2.0<br>\n",
AB_VERSION, "$Revision: 1.74 $");
   	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");
  
  
  

Mime
View raw message