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/main http_connection.c
Date Mon, 26 Jun 2000 20:37:51 GMT
trawick     00/06/26 13:37:49

  Modified:    src/include http_connection.h
               src/lib/apr/include apr_network_io.h
               src/lib/apr/network_io/beos sockaddr.c sockets.c
               src/lib/apr/network_io/os2 sockets.c
               src/lib/apr/network_io/unix sockaddr.c sockets.c
               src/lib/apr/network_io/win32 sockaddr.c sockets.c
               src/main http_connection.c
  Log:
  Remove const from ap_socket_t parameters on APR functions so that
  APR can modify the ap_socket_t as it sees fit.  It may choose to
  modify the ap_socket_t on functions which only read from the ap_socket_t
  conceptually.
  
  Note: http_connection::ap_new_apr_connection() passes its ap_socket_t
  arg to one of the changed functions, so const was removed there also.
  
  Revision  Changes    Path
  1.19      +1 -1      apache-2.0/src/include/http_connection.h
  
  Index: http_connection.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/http_connection.h,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- http_connection.h	2000/05/27 22:53:47	1.18
  +++ http_connection.h	2000/06/26 20:37:32	1.19
  @@ -67,7 +67,7 @@
   			    const struct sockaddr_in *remaddr,
   			    const struct sockaddr_in *saddr, long id);
   conn_rec *ap_new_apr_connection(ap_pool_t *p, server_rec *server, BUFF *inout,
  -			    const ap_socket_t *conn_socket, long id);
  +                                ap_socket_t *conn_socket, long id);
   CORE_EXPORT(void) ap_process_connection(conn_rec *);
   int ap_process_http_connection(conn_rec *);
   void ap_lingering_close(conn_rec *);
  
  
  
  1.43      +9 -9      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.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- apr_network_io.h	2000/06/22 19:09:44	1.42
  +++ apr_network_io.h	2000/06/26 20:37:34	1.43
  @@ -226,7 +226,7 @@
   
   =cut
    */
  -ap_status_t ap_accept(ap_socket_t **new_sock, const ap_socket_t *sock, 
  +ap_status_t ap_accept(ap_socket_t **new_sock, ap_socket_t *sock, 
                         ap_pool_t *connection_pool);
   
   /*
  @@ -540,7 +540,7 @@
   
   /*
   
  -=head1 ap_status_t ap_get_local_ipaddr(char **addr, const ap_socket_t *sock)
  +=head1 ap_status_t ap_get_local_ipaddr(char **addr, ap_socket_t *sock)
   
   B<Return the local IP address associated with an apr socket.>
   
  @@ -549,11 +549,11 @@
   
   =cut
    */
  -ap_status_t ap_get_local_ipaddr(char **addr, const ap_socket_t *sock);
  +ap_status_t ap_get_local_ipaddr(char **addr, ap_socket_t *sock);
   
   /*
   
  -=head1 ap_status_t ap_get_remote_ipaddr(char **addr, const ap_socket_t *sock)
  +=head1 ap_status_t ap_get_remote_ipaddr(char **addr, ap_socket_t *sock)
   
   B<Return the remote IP address associated with an apr socket.>
   
  @@ -562,11 +562,11 @@
   
   =cut
    */
  -ap_status_t ap_get_remote_ipaddr(char **addr, const ap_socket_t *sock);
  +ap_status_t ap_get_remote_ipaddr(char **addr, ap_socket_t *sock);
   
   /*
   
  -=head1 ap_status_t ap_get_local_name(struct sockaddr_in **name, const ap_socket_t *sock)
  +=head1 ap_status_t ap_get_local_name(struct sockaddr_in **name, ap_socket_t *sock)
   
   B<Return the local socket name as a BSD style struct sockaddr_in.>
   
  @@ -575,11 +575,11 @@
   
   =cut
    */
  -ap_status_t ap_get_local_name(struct sockaddr_in **name, const ap_socket_t *sock);
  +ap_status_t ap_get_local_name(struct sockaddr_in **name, ap_socket_t *sock);
   
   /*
   
  -=head1 ap_status_t ap_get_remote_name(struct sockaddr_in **name, const ap_socket_t *sock)
  +=head1 ap_status_t ap_get_remote_name(struct sockaddr_in **name, ap_socket_t *sock)
   
   B<Return the remote socket name as a BSD style struct sockaddr_in.>
   
  @@ -588,7 +588,7 @@
   
   =cut
    */
  -ap_status_t ap_get_remote_name(struct sockaddr_in **name, const ap_socket_t *sock);
  +ap_status_t ap_get_remote_name(struct sockaddr_in **name, ap_socket_t *sock);
   
   /*
   
  
  
  
  1.13      +5 -5      apache-2.0/src/lib/apr/network_io/beos/sockaddr.c
  
  Index: sockaddr.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/sockaddr.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- sockaddr.c	2000/06/13 16:44:29	1.12
  +++ sockaddr.c	2000/06/26 20:37:36	1.13
  @@ -140,7 +140,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_local_ipaddr(char **addr, const ap_socket_t *sock)
  +ap_status_t ap_get_local_ipaddr(char **addr, ap_socket_t *sock)
   {
       if (!sock) {
           return APR_EBADF;
  @@ -150,7 +150,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_remote_ipaddr(char **addr, const ap_socket_t *sock)
  +ap_status_t ap_get_remote_ipaddr(char **addr, ap_socket_t *sock)
   {
       if (!sock) {
           return APR_EBADF;
  @@ -161,7 +161,7 @@
   }
   
   
  -ap_status_t ap_get_local_name(struct sockaddr_in **name, const ap_socket_t *sock)
  +ap_status_t ap_get_local_name(struct sockaddr_in **name, ap_socket_t *sock)
   {
       if (!sock) {
           return APR_EBADF;
  @@ -171,7 +171,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_remote_name(struct sockaddr_in **name, const ap_socket_t *sock)
  +ap_status_t ap_get_remote_name(struct sockaddr_in **name, ap_socket_t *sock)
   {
       if (!sock) {
           return APR_EBADF;
  @@ -180,4 +180,4 @@
       *name = sock->remote_addr;
       return APR_SUCCESS;
   }
  -#endif
  \ No newline at end of file
  +#endif
  
  
  
  1.29      +2 -2      apache-2.0/src/lib/apr/network_io/beos/sockets.c
  
  Index: sockets.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/sockets.c,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- sockets.c	2000/06/13 16:44:29	1.28
  +++ sockets.c	2000/06/26 20:37:37	1.29
  @@ -131,7 +131,7 @@
           return APR_SUCCESS; 
   } 
   
  -ap_status_t ap_accept(ap_socket_t **new, const ap_socket_t *sock, ap_pool_t *connection_context)

  +ap_status_t ap_accept(ap_socket_t **new, ap_socket_t *sock, ap_pool_t *connection_context)

   { 
   	(*new) = (ap_socket_t *)ap_palloc(connection_context,
   	                        sizeof(ap_socket_t)); 
  @@ -235,4 +235,4 @@
       (*sock)->socketdes = *thesock;
       return APR_SUCCESS;
   }
  -#endif
  \ No newline at end of file
  +#endif
  
  
  
  1.22      +1 -1      apache-2.0/src/lib/apr/network_io/os2/sockets.c
  
  Index: sockets.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/os2/sockets.c,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- sockets.c	2000/04/28 18:27:43	1.21
  +++ sockets.c	2000/06/26 20:37:40	1.22
  @@ -147,7 +147,7 @@
           return APR_SUCCESS;
   }
   
  -ap_status_t ap_accept(ap_socket_t **new, const ap_socket_t *sock, ap_pool_t *connection_context)
  +ap_status_t ap_accept(ap_socket_t **new, ap_socket_t *sock, ap_pool_t *connection_context)
   {
       (*new) = (ap_socket_t *)ap_palloc(connection_context, 
                               sizeof(ap_socket_t));
  
  
  
  1.12      +4 -4      apache-2.0/src/lib/apr/network_io/unix/sockaddr.c
  
  Index: sockaddr.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/sockaddr.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- sockaddr.c	2000/06/22 00:36:05	1.11
  +++ sockaddr.c	2000/06/26 20:37:42	1.12
  @@ -128,7 +128,7 @@
   
   
   
  -ap_status_t ap_get_local_ipaddr(char **addr, const ap_socket_t *sock)
  +ap_status_t ap_get_local_ipaddr(char **addr, ap_socket_t *sock)
   {
       *addr = ap_pstrdup(sock->cntxt, inet_ntoa(sock->local_addr->sin_addr));
       return APR_SUCCESS;
  @@ -136,7 +136,7 @@
   
   
   
  -ap_status_t ap_get_remote_ipaddr(char **addr, const ap_socket_t *sock)
  +ap_status_t ap_get_remote_ipaddr(char **addr, ap_socket_t *sock)
   {
       *addr = ap_pstrdup(sock->cntxt, inet_ntoa(sock->remote_addr->sin_addr));
       return APR_SUCCESS;
  @@ -145,7 +145,7 @@
   
   
   #if APR_HAVE_NETINET_IN_H
  -ap_status_t ap_get_local_name(struct sockaddr_in **name, const ap_socket_t *sock)
  +ap_status_t ap_get_local_name(struct sockaddr_in **name, ap_socket_t *sock)
   {
       *name = sock->local_addr;
       return APR_SUCCESS;
  @@ -153,7 +153,7 @@
   
   
   
  -ap_status_t ap_get_remote_name(struct sockaddr_in **name, const ap_socket_t *sock)
  +ap_status_t ap_get_remote_name(struct sockaddr_in **name, ap_socket_t *sock)
   {
       *name = sock->remote_addr;
       return APR_SUCCESS;
  
  
  
  1.49      +1 -1      apache-2.0/src/lib/apr/network_io/unix/sockets.c
  
  Index: sockets.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/sockets.c,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- sockets.c	2000/06/15 00:07:22	1.48
  +++ sockets.c	2000/06/26 20:37:42	1.49
  @@ -127,7 +127,7 @@
           return APR_SUCCESS;
   }
   
  -ap_status_t ap_accept(ap_socket_t **new, const ap_socket_t *sock, ap_pool_t *connection_context)
  +ap_status_t ap_accept(ap_socket_t **new, ap_socket_t *sock, ap_pool_t *connection_context)
   {
       (*new) = (ap_socket_t *)ap_pcalloc(connection_context, 
                               sizeof(ap_socket_t));
  
  
  
  1.8       +4 -4      apache-2.0/src/lib/apr/network_io/win32/sockaddr.c
  
  Index: sockaddr.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/win32/sockaddr.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- sockaddr.c	2000/04/14 01:38:46	1.7
  +++ sockaddr.c	2000/06/26 20:37:46	1.8
  @@ -129,7 +129,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_local_ipaddr(char **addr, const ap_socket_t *sock)
  +ap_status_t ap_get_local_ipaddr(char **addr, ap_socket_t *sock)
   {
       *addr = ap_pstrdup(sock->cntxt, inet_ntoa(sock->local_addr->sin_addr));
       return APR_SUCCESS;
  @@ -137,14 +137,14 @@
   
   
   
  -ap_status_t ap_get_remote_ipaddr(char **addr, const ap_socket_t *sock)
  +ap_status_t ap_get_remote_ipaddr(char **addr, ap_socket_t *sock)
   {
       *addr = ap_pstrdup(sock->cntxt, inet_ntoa(sock->remote_addr->sin_addr));
       return APR_SUCCESS;
   }
   
   
  -ap_status_t ap_get_local_name(struct sockaddr_in **name, const ap_socket_t *sock)
  +ap_status_t ap_get_local_name(struct sockaddr_in **name, ap_socket_t *sock)
   {
       *name = sock->local_addr;
       return APR_SUCCESS;
  @@ -152,7 +152,7 @@
   
   
   
  -ap_status_t ap_get_remote_name(struct sockaddr_in **name, const ap_socket_t *sock)
  +ap_status_t ap_get_remote_name(struct sockaddr_in **name, ap_socket_t *sock)
   {
       *name = sock->remote_addr;
       return APR_SUCCESS;
  
  
  
  1.31      +1 -1      apache-2.0/src/lib/apr/network_io/win32/sockets.c
  
  Index: sockets.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/win32/sockets.c,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- sockets.c	2000/06/14 17:16:47	1.30
  +++ sockets.c	2000/06/26 20:37:46	1.31
  @@ -158,7 +158,7 @@
           return APR_SUCCESS;
   }
   
  -ap_status_t ap_accept(ap_socket_t **new, const ap_socket_t *sock, ap_pool_t *connection_context)
  +ap_status_t ap_accept(ap_socket_t **new, ap_socket_t *sock, ap_pool_t *connection_context)
   {
       (*new) = (ap_socket_t *)ap_palloc(connection_context, 
                               sizeof(ap_socket_t));
  
  
  
  1.41      +1 -1      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.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- http_connection.c	2000/06/20 04:22:39	1.40
  +++ http_connection.c	2000/06/26 20:37:49	1.41
  @@ -280,7 +280,7 @@
   
   
   conn_rec *ap_new_apr_connection(ap_pool_t *p, server_rec *server, BUFF *inout,
  -			    const ap_socket_t *conn_socket, long id)
  +                                ap_socket_t *conn_socket, long id)
   {
       struct sockaddr_in *sa_local, *sa_remote;
   
  
  
  

Mime
View raw message