httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@locus.apache.org
Subject cvs commit: apache-2.0/src/support httpd.exp
Date Fri, 01 Dec 2000 18:49:54 GMT
trawick     00/12/01 10:49:52

  Modified:    src/main http_connection.c
               src/support httpd.exp
  Log:
  Stop referencing apr_get_socket_inaddr(), apr_get_remote_name(), and
  apr_get_local_name().  They have been removed.
  
  Revision  Changes    Path
  1.64      +5 -4      apache-2.0/src/main/http_connection.c
  
  Index: http_connection.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_connection.c,v
  retrieving revision 1.63
  retrieving revision 1.64
  diff -u -r1.63 -r1.64
  --- http_connection.c	2000/11/21 19:10:16	1.63
  +++ http_connection.c	2000/12/01 18:49:51	1.64
  @@ -303,9 +303,10 @@
   conn_rec *ap_new_apr_connection(apr_pool_t *p, server_rec *server, 
                                   apr_socket_t *conn_socket, long id)
   {
  -    struct sockaddr_in *sa_local, *sa_remote;
  +    apr_sockaddr_t *sa_local, *sa_remote;
   
  -    apr_get_local_name(&sa_local, conn_socket);
  -    apr_get_remote_name(&sa_remote, conn_socket);
  -    return ap_new_connection(p, server, conn_socket, sa_remote, sa_local, id);
  +    apr_get_sockaddr(&sa_local, APR_LOCAL, conn_socket);
  +    apr_get_sockaddr(&sa_remote, APR_REMOTE, conn_socket);
  +    return ap_new_connection(p, server, conn_socket, 
  +                             &sa_remote->sa.sin, &sa_local->sa.sin, id);
   }
  
  
  
  1.16      +0 -3      apache-2.0/src/support/httpd.exp
  
  Index: httpd.exp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/support/httpd.exp,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- httpd.exp	2000/11/29 10:27:53	1.15
  +++ httpd.exp	2000/12/01 18:49:52	1.16
  @@ -409,7 +409,6 @@
   apr_get_hostname
   apr_get_inaddr
   apr_get_ipaddr
  -apr_get_local_name
   apr_get_lockdata
   apr_get_os_dir
   apr_get_os_exp_time
  @@ -422,10 +421,8 @@
   apr_get_pipe_timeout
   apr_get_polldata
   apr_get_port
  -apr_get_remote_name
   apr_get_revents
   apr_get_sockaddr
  -apr_get_socket_inaddr
   apr_get_socketdata
   apr_get_thread_private
   apr_get_threaddata
  
  
  

Mime
View raw message