Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Date: 13 Mar 2002 22:34:46 -0000
Message-ID: <20020313223446.95284.qmail@icarus.apache.org>
From: stoddard@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/server vhost.c

stoddard    02/03/13 14:34:46

  Modified:    include  http_vhost.h
               server   vhost.c
  Log:
  Fix win32 compile breakage.
  
  Revision  Changes    Path
  1.14      +3 -3      httpd-2.0/include/http_vhost.h
  
  Index: http_vhost.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/include/http_vhost.h,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- http_vhost.h	13 Mar 2002 20:47:42 -0000	1.13
  +++ http_vhost.h	13 Mar 2002 22:34:45 -0000	1.14
  @@ -67,7 +67,7 @@
    * called before any config is read
    * @param p Pool to allocate out of
    */
  -void ap_init_vhost_config(apr_pool_t *p);
  +AP_DECLARE(void) ap_init_vhost_config(apr_pool_t *p);
   
   /**
    * called after the config has been read to compile the tables needed to do 
  @@ -94,14 +94,14 @@
    * given an ip address only, give our best guess as to what vhost it is 
    * @param conn The current connection
    */
  -void ap_update_vhost_given_ip(conn_rec *conn);
  +AP_DECLARE(void) ap_update_vhost_given_ip(conn_rec *conn);
   
   /**
    * ap_update_vhost_given_ip is never enough, and this is always called after 
    * the headers have been read.  It may change r->server.
    * @param r The current request
    */
  -void ap_update_vhost_from_headers(request_rec *r);
  +AP_DECLARE(void) ap_update_vhost_from_headers(request_rec *r);
   
   /**
    * Match the host in the header with the hostname of the server for this
  
  
  
  1.70      +3 -3      httpd-2.0/server/vhost.c
  
  Index: vhost.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/vhost.c,v
  retrieving revision 1.69
  retrieving revision 1.70
  diff -u -r1.69 -r1.70
  --- vhost.c	13 Mar 2002 20:48:01 -0000	1.69
  +++ vhost.c	13 Mar 2002 22:34:46 -0000	1.70
  @@ -161,7 +161,7 @@
   
   
   /* called at the beginning of the config */
  -void ap_init_vhost_config(apr_pool_t *p)
  +AP_DECLARE(void) ap_init_vhost_config(apr_pool_t *p)
   {
       memset(iphash_table, 0, sizeof(iphash_table));
       default_list = NULL;
  @@ -997,7 +997,7 @@
   }
   
   
  -void ap_update_vhost_from_headers(request_rec *r)
  +AP_DECLARE(void) ap_update_vhost_from_headers(request_rec *r)
   {
       /* must set this for HTTP/1.1 support */
       if (r->hostname || (r->hostname = apr_table_get(r->headers_in, "Host"))) {
  @@ -1018,7 +1018,7 @@
   /* Called for a new connection which has a known local_addr.  Note that the
    * new connection is assumed to have conn->server == main server.
    */
  -void ap_update_vhost_given_ip(conn_rec *conn)
  +AP_DECLARE(void) ap_update_vhost_given_ip(conn_rec *conn)
   {
       ipaddr_chain *trav;
       apr_port_t port;