httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/server listen.c util_script.c vhost.c
Date Fri, 05 Dec 2003 00:59:29 GMT
trawick     2003/12/04 16:59:29

  Modified:    modules/dav/main util.c
               modules/metadata mod_ident.c
               modules/proxy proxy_ftp.c
               server   listen.c util_script.c vhost.c
  Log:
  stop using apr_sockaddr_port_get() accessor function, as it will
  disappear from APR 1.0 API shortly
  
  Revision  Changes    Path
  1.50      +1 -1      httpd-2.0/modules/dav/main/util.c
  
  Index: util.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/dav/main/util.c,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- util.c	25 Nov 2003 13:54:39 -0000	1.49
  +++ util.c	5 Dec 2003 00:59:28 -0000	1.50
  @@ -252,7 +252,7 @@
           /* now, verify that the URI uses the same scheme as the current.
              request. the port must match our port.
           */
  -        apr_sockaddr_port_get(&port, r->connection->local_addr);
  +        port = r->connection->local_addr->port;
           if (strcasecmp(comp.scheme, scheme) != 0
   #ifdef APACHE_PORT_HANDLING_IS_BUSTED
               || comp.port != port
  
  
  
  1.3       +2 -2      httpd-2.0/modules/metadata/mod_ident.c
  
  Index: mod_ident.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/metadata/mod_ident.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mod_ident.c	3 Sep 2003 19:27:07 -0000	1.2
  +++ mod_ident.c	5 Dec 2003 00:59:28 -0000	1.3
  @@ -210,8 +210,8 @@
       char user[RFC1413_USERLEN + 1];     /* XXX */
       apr_size_t buflen;
   
  -    apr_sockaddr_port_get(&sav_our_port, conn->local_addr);
  -    apr_sockaddr_port_get(&sav_rmt_port, conn->remote_addr);
  +    sav_our_port = conn->local_addr->port;
  +    sav_rmt_port = conn->remote_addr->port;
   
       /* send the data */
       buflen = apr_snprintf(buffer, sizeof(buffer), "%hu,%hu\r\n", sav_rmt_port,
  
  
  
  1.135     +1 -1      httpd-2.0/modules/proxy/proxy_ftp.c
  
  Index: proxy_ftp.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/proxy/proxy_ftp.c,v
  retrieving revision 1.134
  retrieving revision 1.135
  diff -u -r1.134 -r1.135
  --- proxy_ftp.c	24 Oct 2003 16:20:28 -0000	1.134
  +++ proxy_ftp.c	5 Dec 2003 00:59:28 -0000	1.135
  @@ -1412,7 +1412,7 @@
               return HTTP_INTERNAL_SERVER_ERROR;
           }
           apr_socket_addr_get(&local_addr, APR_LOCAL, sock);
  -        apr_sockaddr_port_get(&local_port, local_addr);
  +        local_port = local_addr->port;
           apr_sockaddr_ip_get(&local_ip, local_addr);
   
           if ((rv = apr_socket_opt_set(local_sock, APR_SO_REUSEADDR, one)) 
  
  
  
  1.94      +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.93
  retrieving revision 1.94
  diff -u -r1.93 -r1.94
  --- listen.c	28 Sep 2003 16:30:43 -0000	1.93
  +++ listen.c	5 Dec 2003 00:59:29 -0000	1.94
  @@ -244,7 +244,7 @@
               ap_listen_rec *new;
               apr_port_t oldport;
   
  -            apr_sockaddr_port_get(&oldport, sa);
  +            oldport = sa->port;
               /* If both ports are equivalent, then if their names are equivalent,
                * then we will re-use the existing record.
                */
  
  
  
  1.84      +1 -1      httpd-2.0/server/util_script.c
  
  Index: util_script.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/util_script.c,v
  retrieving revision 1.83
  retrieving revision 1.84
  diff -u -r1.83 -r1.84
  --- util_script.c	3 Sep 2003 19:27:09 -0000	1.83
  +++ util_script.c	5 Dec 2003 00:59:29 -0000	1.84
  @@ -280,7 +280,7 @@
       apr_table_addn(e, "SERVER_ADMIN", s->server_admin);	/* Apache */
       apr_table_addn(e, "SCRIPT_FILENAME", r->filename);	/* Apache */
   
  -    apr_sockaddr_port_get(&rport, c->remote_addr);
  +    rport = c->remote_addr->port;
       apr_table_addn(e, "REMOTE_PORT", apr_itoa(r->pool, rport));
   
       if (r->user) {
  
  
  
  1.80      +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.79
  retrieving revision 1.80
  diff -u -r1.79 -r1.80
  --- vhost.c	3 Feb 2003 17:53:20 -0000	1.79
  +++ vhost.c	5 Dec 2003 00:59:29 -0000	1.80
  @@ -913,7 +913,7 @@
   
       last_s = NULL;
   
  -    apr_sockaddr_port_get(&port, r->connection->local_addr);
  +    port = r->connection->local_addr->port;
   
       /* Recall that the name_chain is a list of server_addr_recs, some of
        * whose ports may not match.  Also each server may appear more than
  @@ -969,7 +969,7 @@
       name_chain *src;
       apr_port_t port;
   
  -    apr_sockaddr_port_get(&port, r->connection->local_addr);
  +    port = r->connection->local_addr->port;
   
       /*
        * This is in conjunction with the ServerPath code in http_core, so we
  @@ -1044,7 +1044,7 @@
       /* maybe there's a default server or wildcard name-based vhost
        * matching this port
        */
  -    apr_sockaddr_port_get(&port, conn->local_addr);
  +    port = conn->local_addr->port;
   
       trav = find_default_server(port);
       if (trav) {
  
  
  

Mime
View raw message