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: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85700 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/include/http_connection.h b/include/http_connection.h
index cb504534ef15ceaae1a2b9c65c4aadd20a205e6e..4bda0a95d2bb3e7e20a0c1b4095839528df0572a 100644 (file)
--- a/include/http_connection.h
+++ b/include/http_connection.h
@@ -67,7 +67,7 @@ conn_rec *ap_new_connection(ap_pool_t *p, server_rec *server, BUFF *inout,
                            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 *);

diff --git a/server/connection.c b/server/connection.c
index a6a64f97d0e08616bcaac61acfcf5d15c9b0aa71..1d20ee463c30b152b9b191463f11fa49fcbaed6a 100644 (file)
--- a/server/connection.c
+++ b/server/connection.c
@@ -280,7 +280,7 @@ conn_rec *ap_new_connection(ap_pool_t *p, server_rec *server, BUFF *inout,
 
 
 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;