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.


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@60260 13f79535-47bb-0310-9956-ffa450edef68

7 files changed, 18 insertions, 18 deletions

diff --git a/network_io/beos/sockaddr.c b/network_io/beos/sockaddr.c
index 17bcb4b19..57ce8343d 100644
--- a/network_io/beos/sockaddr.c
+++ b/network_io/beos/sockaddr.c
@@ -140,7 +140,7 @@ ap_status_t ap_set_remote_ipaddr(ap_socket_t *sock, const char *addr)
     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 @@ ap_status_t ap_get_local_ipaddr(char **addr, const ap_socket_t *sock)
     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_remote_ipaddr(char **addr, const ap_socket_t *sock)
 }
 
 
-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 @@ ap_status_t ap_get_local_name(struct sockaddr_in **name, const ap_socket_t *sock
     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 @@ ap_status_t ap_get_remote_name(struct sockaddr_in **name, const ap_socket_t *soc
     *name = sock->remote_addr;
     return APR_SUCCESS;
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/network_io/beos/sockets.c b/network_io/beos/sockets.c
index 9a251bf91..0a9495f46 100644
--- a/network_io/beos/sockets.c
+++ b/network_io/beos/sockets.c
@@ -131,7 +131,7 @@ ap_status_t ap_listen(ap_socket_t *sock, ap_int32_t backlog)
         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 @@ ap_status_t ap_put_os_sock(ap_socket_t **sock, ap_os_sock_t *thesock,
     (*sock)->socketdes = *thesock;
     return APR_SUCCESS;
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/network_io/os2/sockets.c b/network_io/os2/sockets.c
index 737af928b..61f5b1959 100644
--- a/network_io/os2/sockets.c
+++ b/network_io/os2/sockets.c
@@ -147,7 +147,7 @@ ap_status_t ap_listen(ap_socket_t *sock, ap_int32_t backlog)
         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));
diff --git a/network_io/unix/sockaddr.c b/network_io/unix/sockaddr.c
index 0a67769a2..f17a16b9b 100644
--- a/network_io/unix/sockaddr.c
+++ b/network_io/unix/sockaddr.c
@@ -128,7 +128,7 @@ ap_status_t ap_set_remote_ipaddr(ap_socket_t *sock, const char *addr)
 
 
 
-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_local_ipaddr(char **addr, const ap_socket_t *sock)
 
 
 
-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 @@ ap_status_t ap_get_remote_ipaddr(char **addr, const ap_socket_t *sock)
 
 
 #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_local_name(struct sockaddr_in **name, const ap_socket_t *sock
 
 
 
-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;
diff --git a/network_io/unix/sockets.c b/network_io/unix/sockets.c
index ba0d24355..5445248b5 100644
--- a/network_io/unix/sockets.c
+++ b/network_io/unix/sockets.c
@@ -127,7 +127,7 @@ ap_status_t ap_listen(ap_socket_t *sock, ap_int32_t backlog)
         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));
diff --git a/network_io/win32/sockaddr.c b/network_io/win32/sockaddr.c
index 7010539fb..fe025c00c 100644
--- a/network_io/win32/sockaddr.c
+++ b/network_io/win32/sockaddr.c
@@ -129,7 +129,7 @@ ap_status_t ap_set_remote_ipaddr(ap_socket_t *sock, const char *addr)
     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_local_ipaddr(char **addr, const ap_socket_t *sock)
 
 
 
-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_local_name(struct sockaddr_in **name, const ap_socket_t *sock
 
 
 
-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;
diff --git a/network_io/win32/sockets.c b/network_io/win32/sockets.c
index 63c19b03a..9eb5143fe 100644
--- a/network_io/win32/sockets.c
+++ b/network_io/win32/sockets.c
@@ -158,7 +158,7 @@ ap_status_t ap_listen(ap_socket_t *sock, ap_int32_t backlog)
         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));