httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dr...@locus.apache.org
Subject cvs commit: apache-2.0/src/main http_vhost.c
Date Fri, 10 Nov 2000 00:58:27 GMT
dreid       00/11/09 16:58:27

  Modified:    src/include httpd.h
               src/lib/apr/include apr_network_io.h
               src/lib/apr/network_io/unix sa_common.c
               src/main http_vhost.c
  Log:
  Bring the apr_in_addr type into line with naming conventions and make changes
  where appropriate.  At least on my system virtual hosts seem to still work :)
  
  Revision  Changes    Path
  1.116     +1 -1      apache-2.0/src/include/httpd.h
  
  Index: httpd.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/httpd.h,v
  retrieving revision 1.115
  retrieving revision 1.116
  diff -u -r1.115 -r1.116
  --- httpd.h	2000/11/09 00:36:46	1.115
  +++ httpd.h	2000/11/10 00:58:25	1.116
  @@ -900,7 +900,7 @@
       /** The next server in the list */
       server_addr_rec *next;
       /** The bound address, for this server */
  -    apr_in_addr host_addr;
  +    apr_in_addr_t host_addr;
       /** The bound port, for this server */
       apr_port_t host_port;
       /** The name given in <VirtualHost> */
  
  
  
  1.65      +2 -3      apache-2.0/src/lib/apr/include/apr_network_io.h
  
  Index: apr_network_io.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_network_io.h,v
  retrieving revision 1.64
  retrieving revision 1.65
  diff -u -r1.64 -r1.65
  --- apr_network_io.h	2000/11/09 15:01:25	1.64
  +++ apr_network_io.h	2000/11/10 00:58:25	1.65
  @@ -132,12 +132,11 @@
   typedef struct apr_socket_t     apr_socket_t;
   typedef struct apr_pollfd_t     apr_pollfd_t;
   typedef struct apr_hdtr_t       apr_hdtr_t;
  -typedef struct in_addr          apr_in_addr;
  +typedef struct in_addr          apr_in_addr_t;
   
   /* use apr_uint16_t just in case some system has a short that isn't 16 bits... */
   typedef apr_uint16_t            apr_port_t;
   
  -
   #if APR_HAS_SENDFILE
   /* Define flags passed in on apr_sendfile() */
   #define APR_SENDFILE_DISCONNECT_SOCKET      1
  @@ -562,7 +561,7 @@
    * @param addr The apr_in_addr structure to return.
    * @param hostname The hostname to lookup.
    */
  -apr_status_t apr_get_inaddr(apr_in_addr *addr, char* hostname);
  +apr_status_t apr_get_inaddr(apr_in_addr_t *addr, char *hostname);
   
   #ifdef __cplusplus
   }
  
  
  
  1.2       +3 -3      apache-2.0/src/lib/apr/network_io/unix/sa_common.c
  
  Index: sa_common.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/sa_common.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sa_common.c	2000/11/09 16:05:25	1.1
  +++ sa_common.c	2000/11/10 00:58:25	1.2
  @@ -114,10 +114,10 @@
       return APR_SUCCESS;
   }
   
  -apr_status_t apr_get_inaddr(apr_in_addr *addr, char *hostname)
  +apr_status_t apr_get_inaddr(apr_in_addr_t *addr, char *hostname)
   {
       struct hostent *he;
  -
  +    
       if (strcmp(hostname,"*") == 0){
           addr->s_addr = htonl(INADDR_ANY);
           return APR_SUCCESS;
  @@ -130,7 +130,7 @@
       if (!he || he->h_addrtype != AF_INET || !he->h_addr_list[0])
           return (h_errno + APR_OS_START_SYSERR);
   
  -    addr = (struct in_addr*)he->h_addr_list[0];
  +    *addr = *(struct in_addr*)he->h_addr_list[0];
   
       return APR_SUCCESS;
   }
  
  
  
  1.36      +2 -2      apache-2.0/src/main/http_vhost.c
  
  Index: http_vhost.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_vhost.c,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- http_vhost.c	2000/11/09 15:09:50	1.35
  +++ http_vhost.c	2000/11/10 00:58:25	1.36
  @@ -187,7 +187,7 @@
   				 server_addr_rec ***paddr, apr_port_t port)
   {
       struct hostent *hep;
  -    apr_in_addr my_addr;
  +    apr_in_addr_t my_addr;
       server_addr_rec *sar;
       char *t;
       int i, is_an_ip_addr;
  @@ -402,7 +402,7 @@
   }
   
   
  -static apr_inline ipaddr_chain *find_ipaddr(struct in_addr *server_ip,
  +static apr_inline ipaddr_chain *find_ipaddr(apr_in_addr_t *server_ip,
       apr_port_t port)
   {
       unsigned bucket;
  
  
  

Mime
View raw message