rbb 99/10/10 13:35:07
Modified: src/lib/apr Makefile.in
src/lib/apr/include apr_network_io.h apr_portable.h
src/lib/apr/network_io/beos poll.c sockets.c sockopt.c
src/lib/apr/network_io/os2 poll.c sockopt.c
src/lib/apr/network_io/unix poll.c sockets.c sockopt.c
src/lib/apr/network_io/win32 poll.c sockets.c sockopt.c
src/lib/apr/test ab_apr.c server.c
src/main listen.c rfc1413.c
src/modules/mpm/dexter dexter.c
src/modules/mpm/mpmt_pthread mpmt_pthread.c
src/modules/mpm/prefork prefork.c
src/modules/mpm/winnt winnt.c
Log:
Bring network code to the parameter order spec. This means contexts go last,
and result parameters go first. Also fixed a small bug in the Makefile. We
should be removing the libs dir when we do a distclean, we are now.
Revision Changes Path
1.11 +1 -0 apache-2.0/src/lib/apr/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/Makefile.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile.in 1999/10/08 16:10:38 1.10
+++ Makefile.in 1999/10/10 20:34:52 1.11
@@ -52,6 +52,7 @@
-$(RM) -f *.o *.a *.so
-$(RM) -f config.cache config.status config.log
-$(RM) -f Makefile
+ -$(RM) -Rf libs
subdirs:
@for i in $(SUBDIRS); do \
1.10 +7 -10 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- apr_network_io.h 1999/10/10 17:07:59 1.9
+++ apr_network_io.h 1999/10/10 20:34:54 1.10
@@ -114,8 +114,8 @@
ap_status_t ap_connect(ap_socket_t *, char *);
ap_status_t ap_get_remote_hostname(char **, ap_socket_t *);
-ap_status_t ap_gethostname(ap_context_t *, char *, int);
-ap_status_t ap_get_socketdata(ap_socket_t *, char *, void *);
+ap_status_t ap_gethostname(char *, int, ap_context_t *);
+ap_status_t ap_get_socketdata(void *, char *, ap_socket_t *);
ap_status_t ap_set_socketdata(ap_socket_t *, void *, char *,
ap_status_t (*cleanup) (void*));
@@ -125,18 +125,15 @@
ap_status_t ap_setsocketopt(ap_socket_t *, ap_int32_t, ap_int32_t);
ap_status_t ap_setport(ap_socket_t *, ap_uint32_t);
ap_status_t ap_setipaddr(ap_socket_t *, const char *);
-ap_status_t ap_getport(ap_socket_t *, ap_uint32_t *);
+ap_status_t ap_getport(ap_uint32_t *, ap_socket_t *);
ap_status_t ap_getipaddr(char *buf, ap_ssize_t len, const ap_socket_t *sock);
-ap_status_t ap_setup_poll(ap_pollfd_t **pollset, ap_context_t *ctx,
- ap_int32_t nsocks);
-ap_status_t ap_poll(struct pollfd_t *pollset, ap_int32_t *nsocks,
- ap_int32_t timeout);
-ap_status_t ap_add_poll_socket(ap_pollfd_t *pollset, ap_socket_t *sock,
- ap_int16_t events);
+ap_status_t ap_setup_poll(ap_pollfd_t **, ap_int32_t, ap_context_t *);
+ap_status_t ap_poll(ap_pollfd_t *, ap_int32_t *, ap_int32_t);
+ap_status_t ap_add_poll_socket(ap_pollfd_t *, ap_socket_t *, ap_int16_t);
ap_status_t ap_remove_poll_socket(ap_pollfd_t *, ap_socket_t *, ap_int16_t);
ap_status_t ap_clear_poll_sockets(ap_pollfd_t *, ap_int16_t);
-ap_status_t ap_get_revents(ap_pollfd_t *, ap_socket_t *, ap_int16_t *);
+ap_status_t ap_get_revents(ap_int16_t *, ap_socket_t *, ap_pollfd_t *);
ap_status_t ap_get_polldata(ap_pollfd_t *, char *, void *);
ap_status_t ap_set_polldata(ap_pollfd_t *, void *, char *,
ap_status_t (*cleanup) (void *));
1.7 +1 -1 apache-2.0/src/lib/apr/include/apr_portable.h
Index: apr_portable.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_portable.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- apr_portable.h 1999/10/06 23:04:01 1.6
+++ apr_portable.h 1999/10/10 20:34:54 1.7
@@ -182,7 +182,7 @@
ap_status_t ap_get_os_file(ap_os_file_t *, ap_file_t *);
ap_status_t ap_get_os_dir(ap_os_dir_t *, ap_dir_t *);
-ap_status_t ap_get_os_sock(ap_socket_t *, ap_os_sock_t *);
+ap_status_t ap_get_os_sock(ap_os_sock_t *, ap_socket_t *);
ap_status_t ap_get_os_lock(ap_lock_t *, ap_os_lock_t *);
ap_status_t ap_get_os_thread(ap_thread_t *, ap_os_thread_t *);
ap_status_t ap_get_os_proc(ap_proc_t *, ap_os_proc_t *);
1.5 +2 -2 apache-2.0/src/lib/apr/network_io/beos/poll.c
Index: poll.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/poll.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- poll.c 1999/10/08 20:04:13 1.4
+++ poll.c 1999/10/10 20:34:55 1.5
@@ -68,7 +68,7 @@
/* select for R4.5 of BeOS. So here we use code that uses the write */
/* bits. */
-ap_status_t ap_setup_poll(struct pollfd_t **new, ap_context_t *cont,
ap_int32_t num)
+ap_status_t ap_setup_poll(struct pollfd_t **new, ap_int32_t num,
ap_context_t *cont)
{
(*new) = (struct pollfd_t *)ap_palloc(cont, sizeof(struct pollfd_t) *
num);
if ((*new) == NULL) {
@@ -132,7 +132,7 @@
return APR_SUCCESS;
}
-ap_status_t ap_get_revents(struct pollfd_t *aprset, struct socket_t *sock,
ap_int16_t *event)
+ap_status_t ap_get_revents(ap_int16_t *event, struct socket_t *sock, struct
pollfd_t *aprset)
{
ap_int16_t revents = 0;
char data[256];
1.7 +3 -3 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sockets.c 1999/10/08 21:27:39 1.6
+++ sockets.c 1999/10/10 20:34:55 1.7
@@ -126,7 +126,7 @@
return APR_SUCCESS;
}
-ap_status_t ap_getport(struct socket_t *sock, ap_uint32_t *port)
+ap_status_t ap_getport(ap_uint32_t *port, struct socket_t *sock)
{
*port = ntohs(sock->addr->sin_port);
return APR_SUCCESS;
@@ -216,7 +216,7 @@
return APR_SUCCESS;
}
-ap_status_t ap_get_socketdata(struct socket_t *sock, char *key, void *data)
+ap_status_t ap_get_socketdata(void *data, char *key, struct socket_t *sock)
{
if (socket != NULL) {
return ap_get_userdata(&data, key, sock->cntxt);
@@ -239,7 +239,7 @@
}
}
-ap_status_t ap_get_os_sock(struct socket_t *sock, ap_os_sock_t *thesock)
+ap_status_t ap_get_os_sock(ap_os_sock_t *thesock, struct socket_t *sock)
{
if (sock == NULL) {
return APR_ENOSOCKET;
1.7 +1 -1 apache-2.0/src/lib/apr/network_io/beos/sockopt.c
Index: sockopt.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/sockopt.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sockopt.c 1999/10/10 17:25:30 1.6
+++ sockopt.c 1999/10/10 20:34:55 1.7
@@ -92,7 +92,7 @@
return APR_SUCCESS;
}
-ap_status_t ap_gethostname(ap_context_t *cont, char * buf, int len)
+ap_status_t ap_gethostname(char * buf, int len, ap_context_t *cont)
{
if (gethostname(buf, len) == -1){
return errno;
1.4 +2 -2 apache-2.0/src/lib/apr/network_io/os2/poll.c
Index: poll.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/os2/poll.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- poll.c 1999/10/04 16:37:08 1.3
+++ poll.c 1999/10/10 20:34:56 1.4
@@ -62,7 +62,7 @@
/* OS/2 doesn't have a poll function, implement using select */
-ap_status_t ap_setup_poll(struct pollfd_t **new, ap_context_t *cont,
ap_int32_t num)
+ap_status_t ap_setup_poll(struct pollfd_t **new, ap_int32_t num,
ap_context_t *cont)
{
(*new) = (struct pollfd_t *)ap_palloc(cont, sizeof(struct pollfd_t) *
num);
@@ -154,7 +154,7 @@
-ap_status_t ap_get_revents(struct pollfd_t *aprset, struct socket_t *sock,
ap_int16_t *event)
+ap_status_t ap_get_revents(ap_int16_t *event, struct socket_t *sock, struct
pollfd_t *aprset)
{
int i = 0;
1.4 +1 -1 apache-2.0/src/lib/apr/network_io/os2/sockopt.c
Index: sockopt.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/os2/sockopt.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sockopt.c 1999/10/08 21:27:58 1.3
+++ sockopt.c 1999/10/10 20:34:56 1.4
@@ -155,7 +155,7 @@
return APR_SUCCESS;
}
-ap_status_t ap_gethostname(ap_context_t *cont, char *buf, int len)
+ap_status_t ap_gethostname(char *buf, int len, ap_context_t *cont)
{
if (gethostname(buf, len) == -1)
return errno;
1.13 +6 -6 apache-2.0/src/lib/apr/network_io/unix/poll.c
Index: poll.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/poll.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- poll.c 1999/10/10 17:08:00 1.12
+++ poll.c 1999/10/10 20:34:57 1.13
@@ -67,13 +67,13 @@
#ifdef HAVE_POLL /* We can just use poll to do our socket polling. */
/* ***APRDOC********************************************************
- * ap_status_t ap_setup_poll(ap_pollfd_t **, ap_context_t *, ap_int32_t)
+ * ap_status_t ap_setup_poll(ap_pollfd_t **, ap_int32_t, ap_context_t *)
* Setup the memory required for poll to operate properly.
* arg 1) The context to operate on.
* arg 2) The number of socket descriptors to be polled.
* arg 3) The poll structure to be used.
*/
-ap_status_t ap_setup_poll(struct pollfd_t **new, ap_context_t *cont,
ap_int32_t num)
+ap_status_t ap_setup_poll(struct pollfd_t **new, ap_int32_t num,
ap_context_t *cont)
{
(*new) = (struct pollfd_t *)ap_palloc(cont, sizeof(struct pollfd_t));
(*new)->sock = ap_palloc(cont, sizeof(struct socket_t) * num);
@@ -199,7 +199,7 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_get_revents(ap_pollfd_t *, ap_socket_t *, ap_int_16_t *)
+ * ap_status_t ap_get_revents(ap_int_16_t *, ap_socket_t *, ap_pollfd_t *)
* Get the return events for the specified socket.
* arg 1) The poll structure we will be using.
* arg 2) The socket we wish to get information about.
@@ -212,7 +212,7 @@
* APR_POLLNVAL -- This is an invalid socket to poll on.
* Socket not open.
*/
-ap_status_t ap_get_revents(struct pollfd_t *aprset, struct socket_t *sock,
ap_int16_t *event)
+ap_status_t ap_get_revents(ap_int16_t *event, struct socket_t *sock, struct
pollfd_t *aprset)
{
int i = 0;
@@ -283,7 +283,7 @@
#else /* Use select to mimic poll */
-ap_status_t ap_setup_poll(struct pollfd_t **new, ap_context_t *cont,
ap_int32_t num)
+ap_status_t ap_setup_poll(struct pollfd_t **new, ap_int32_t num,
ap_context_t *cont)
{
(*new) = (struct pollfd_t *)ap_palloc(cont, sizeof(struct pollfd_t) *
num);
if ((*new) == NULL) {
@@ -346,7 +346,7 @@
return APR_SUCCESS;
}
-ap_status_t ap_get_revents(struct pollfd_t *aprset, struct socket_t *sock,
ap_int16_t *event)
+ap_status_t ap_get_revents(ap_int16_t *event, struct socket_t *sock, struct
pollfd_t *aprset)
{
ap_int16_t revents = 0;
char data[1];
1.15 +6 -6 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sockets.c 1999/10/10 17:08:00 1.14
+++ sockets.c 1999/10/10 20:34:57 1.15
@@ -162,12 +162,12 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_getport(ap_socket_t *, ap_uint32_t *)
+ * ap_status_t ap_getport(ap_uint32_t *, ap_socket_t *)
* Return the port with a socket.
* arg 1) The socket use
* arg 2) The port this socket will be dealing with.
*/
-ap_status_t ap_getport(struct socket_t *sock, ap_uint32_t *port)
+ap_status_t ap_getport(ap_uint32_t *port, struct socket_t *sock)
{
*port = ntohs(sock->addr->sin_port);
return APR_SUCCESS;
@@ -318,12 +318,12 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_get_socketdata(ap_socket_t *, char *, void *)
+ * ap_status_t ap_get_socketdata(void *, char *, ap_socket_t *)
* Return the context associated with the current socket.
* arg 1) The currently open socket.
* arg 2) The user data associated with the socket.
*/
-ap_status_t ap_get_socketdata(struct socket_t *sock, char *key, void *data)
+ap_status_t ap_get_socketdata(void *data, char *key, struct socket_t *sock)
{
if (socket != NULL) {
return ap_get_userdata(&data, key, sock->cntxt);
@@ -354,12 +354,12 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_get_os_sock(ap_socket_t *, ap_os_sock_t *)
+ * ap_status_t ap_get_os_sock(ap_os_sock_t *, ap_socket_t *)
* Convert the socket from an apr type to an OS specific socket
* arg 1) The socket to convert.
* arg 2) The os specifc equivelant of the apr socket..
*/
-ap_status_t ap_get_os_sock(struct socket_t *sock, ap_os_sock_t *thesock)
+ap_status_t ap_get_os_sock(ap_os_sock_t *thesock, struct socket_t *sock)
{
if (sock == NULL) {
return APR_ENOSOCKET;
1.8 +2 -2 apache-2.0/src/lib/apr/network_io/unix/sockopt.c
Index: sockopt.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/sockopt.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sockopt.c 1999/10/08 21:28:24 1.7
+++ sockopt.c 1999/10/10 20:34:57 1.8
@@ -179,14 +179,14 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_gethostname(ap_context_t *, char *, ap_int32_t)
+ * ap_status_t ap_gethostname(char *, ap_int32_t, ap_context_t *)
* Get name of the current machine
* arg 1) The context to use.
* arg 2) A buffer to store the hostname in.
* arg 3) The maximum length of the hostname that can be stored in the
* buffer provided.
*/
-ap_status_t ap_gethostname(ap_context_t *cont, char *buf, ap_int32_t len)
+ap_status_t ap_gethostname(char *buf, ap_int32_t len, ap_context_t *cont)
{
if (gethostname(buf, len) == -1)
return errno;
1.6 +2 -2 apache-2.0/src/lib/apr/network_io/win32/poll.c
Index: poll.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/win32/poll.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- poll.c 1999/10/08 20:04:22 1.5
+++ poll.c 1999/10/10 20:34:58 1.6
@@ -62,7 +62,7 @@
#include <time.h>
-ap_status_t ap_setup_poll(struct pollfd_t **new, ap_context_t *cont,
ap_int32_t num)
+ap_status_t ap_setup_poll(struct pollfd_t **new, ap_int32_t num,
ap_context_t *cont)
{
(*new) = (struct pollfd_t *)ap_palloc(cont, sizeof(struct pollfd_t) *
num);
if ((*new) == NULL) {
@@ -143,7 +143,7 @@
return APR_SUCCESS;
}
-ap_status_t ap_get_revents(struct pollfd_t *aprset, struct socket_t *sock,
ap_int16_t *event)
+ap_status_t ap_get_revents(ap_int16_t *event, struct socket_t *sock, struct
pollfd_t *aprset)
{
ap_int16_t revents = 0;
WSABUF data;
1.9 +3 -3 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sockets.c 1999/10/08 21:28:38 1.8
+++ sockets.c 1999/10/10 20:34:59 1.9
@@ -145,7 +145,7 @@
sock->addr->sin_port = htons((short)port);
return APR_SUCCESS;
}
-ap_status_t ap_getport(struct socket_t *sock, ap_uint32_t *port)
+ap_status_t ap_getport(ap_uint32_t *port, struct socket_t *sock)
{
*port = ntohs(sock->addr->sin_port);
return APR_SUCCESS;
@@ -253,7 +253,7 @@
}
}
-ap_status_t ap_get_socketdata(struct socket_t *socket, char *key, void *data)
+ap_status_t ap_get_socketdata(void *data, char *key, struct socket_t *socket)
{
if (socket != NULL) {
return ap_get_userdata(&data, key, socket->cntxt);
@@ -276,7 +276,7 @@
}
}
-ap_status_t ap_get_os_sock(struct socket_t *sock, ap_os_sock_t *thesock)
+ap_status_t ap_get_os_sock(ap_os_sock_t *thesock, struct socket_t *sock)
{
if (sock == NULL) {
return APR_ENOSOCKET;
1.4 +1 -1 apache-2.0/src/lib/apr/network_io/win32/sockopt.c
Index: sockopt.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/win32/sockopt.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sockopt.c 1999/10/08 21:28:41 1.3
+++ sockopt.c 1999/10/10 20:34:59 1.4
@@ -126,7 +126,7 @@
return APR_SUCCESS;
}
-ap_status_t ap_gethostname(ap_context_t *cont, char *buf, int len)
+ap_status_t ap_gethostname(char *buf, int len, ap_context_t *cont)
{
if (gethostname(buf, len) == -1)
return APR_EEXIST;
1.7 +2 -2 apache-2.0/src/lib/apr/test/ab_apr.c
Index: ab_apr.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/test/ab_apr.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ab_apr.c 1999/10/06 23:04:06 1.6
+++ ab_apr.c 1999/10/10 20:35:00 1.7
@@ -683,7 +683,7 @@
memset(con, 0, concurrency * sizeof(struct connection));
stats = (struct data *)malloc(requests * sizeof(struct data));
- ap_setup_poll(&readbits, cntxt, concurrency);
+ ap_setup_poll(&readbits, concurrency, cntxt);
for (i = 0; i < concurrency; i++) {
ap_make_time(&con[i].start, cntxt);
@@ -761,7 +761,7 @@
err("select");
for (i = 0; i < concurrency; i++) {
- ap_get_revents(readbits, con[i].aprsock, &rv);
+ ap_get_revents(&rv, con[i].aprsock, readbits);
if ((rv & APR_POLLERR) || (rv & APR_POLLNVAL) || (rv &
APR_POLLHUP)) {
bad++;
err_except++;
1.5 +1 -1 apache-2.0/src/lib/apr/test/server.c
Index: server.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/test/server.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- server.c 1999/10/04 16:37:23 1.4
+++ server.c 1999/10/10 20:35:00 1.5
@@ -117,7 +117,7 @@
fprintf(stdout, "OK\n");
fprintf(stdout, "\tServer: Setting up socket for polling.......");
- ap_setup_poll(&sdset, context, 1);
+ ap_setup_poll(&sdset, 1, context);
ap_add_poll_socket(sdset, sock, APR_POLLIN);
fprintf(stdout, "OK\n");
1.13 +1 -1 apache-2.0/src/main/listen.c
Index: listen.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/listen.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- listen.c 1999/10/08 12:56:40 1.12
+++ listen.c 1999/10/10 20:35:01 1.13
@@ -160,7 +160,7 @@
/* see if we've got an old listener for this address:port */
for (walk = &old_listeners; *walk; walk = &(*walk)->next) {
- ap_getport((*walk)->sd, &oldport);
+ ap_getport(&oldport, (*walk)->sd);
ap_getipaddr(oldaddr,sizeof oldaddr,(*walk)->sd);
if (!strcmp(oldaddr, addr) && port == oldport) {
/* re-use existing record */
1.5 +2 -2 apache-2.0/src/main/rfc1413.c
Index: rfc1413.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/rfc1413.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rfc1413.c 1999/10/04 16:37:54 1.4
+++ rfc1413.c 1999/10/10 20:35:01 1.5
@@ -131,7 +131,7 @@
"bind: rfc1413: Error binding to local port");
return -1;
}
- ap_getport(sock, &sav_our_port);
+ ap_getport(&sav_our_port, sock);
/*
* errors from connect usually imply the remote machine doesn't support
@@ -142,7 +142,7 @@
if (ap_connect(sock, NULL) != APR_SUCCESS)
return -1;
- ap_getport(sock, &sav_rmt_port);
+ ap_getport(&sav_rmt_port, sock);
/* send the data */
buflen = ap_snprintf(buffer, sizeof(buffer), "%u,%u\r\n", sav_rmt_port,
1.42 +2 -2 apache-2.0/src/modules/mpm/dexter/dexter.c
Index: dexter.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/dexter/dexter.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- dexter.c 1999/10/07 22:21:04 1.41
+++ dexter.c 1999/10/10 20:35:02 1.42
@@ -952,7 +952,7 @@
pthread_mutex_unlock(&idle_thread_count_mutex);
break;
}
- ap_get_os_sock(csd, &native_socket);
+ ap_get_os_sock(&native_socket, csd);
process_socket(ptrans, &sa_client, native_socket, conn_id);
ap_clear_pool(ptrans);
requests_this_child--;
@@ -1011,7 +1011,7 @@
listenfds[0].events = POLLIN;
listenfds[0].revents = 0;
for (lr = ap_listeners, i = 1; i <= num_listenfds; lr = lr->next, ++i) {
- ap_get_os_sock(lr->sd, &listenfds[i].fd);
+ ap_get_os_sock(&listenfds[i].fd, lr->sd);
listenfds[i].events = POLLIN; /* should we add POLLPRI ?*/
listenfds[i].revents = 0;
}
1.37 +4 -4 apache-2.0/src/modules/mpm/mpmt_pthread/mpmt_pthread.c
Index: mpmt_pthread.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/mpmt_pthread.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- mpmt_pthread.c 1999/10/10 17:08:07 1.36
+++ mpmt_pthread.c 1999/10/10 20:35:04 1.37
@@ -816,7 +816,7 @@
worker_thread_count++;
pthread_mutex_unlock(&worker_thread_count_mutex);
- ap_setup_poll(&pollset, tpool, num_listensocks+1);
+ ap_setup_poll(&pollset, num_listensocks+1, tpool);
for(n=0 ; n <= num_listensocks ; ++n)
ap_add_poll_socket(pollset, listensocks[n], APR_POLLIN);
@@ -853,7 +853,7 @@
if (workers_may_exit) break;
- ap_get_revents(pollset, listensocks[0], &event);
+ ap_get_revents(&event, listensocks[0], pollset);
if (event & APR_POLLIN) {
/* A process got a signal on the shutdown pipe. Check if
we're
* the lucky process to die. */
@@ -874,7 +874,7 @@
curr_pollfd = 1;
}
/* XXX: Should we check for POLLERR? */
- ap_get_revents(pollset, listensocks[curr_pollfd], &event);
+ ap_get_revents(&event, listensocks[curr_pollfd], pollset);
if (event & APR_POLLIN) {
last_pollfd = curr_pollfd;
sd=listensocks[curr_pollfd];
@@ -894,7 +894,7 @@
SAFE_ACCEPT(intra_mutex_off(0));
break;
}
- ap_get_os_sock(csd, &thesock);
+ ap_get_os_sock(&thesock, csd);
process_socket(ptrans, &sa_client, thesock, process_slot,
thread_slot);
ap_clear_pool(ptrans);
requests_this_child--;
1.41 +3 -3 apache-2.0/src/modules/mpm/prefork/prefork.c
Index: prefork.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/prefork/prefork.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- prefork.c 1999/10/07 22:23:54 1.40
+++ prefork.c 1999/10/10 20:35:05 1.41
@@ -2047,7 +2047,7 @@
}
first_lr=lr;
do {
- ap_get_os_sock(lr->sd, &sockdes);
+ ap_get_os_sock(&sockdes, lr->sd);
if (FD_ISSET(sockdes, &main_fds))
goto got_listener;
lr = lr->next;
@@ -2206,7 +2206,7 @@
* socket options, file descriptors, and read/write buffers.
*/
- ap_get_os_sock(csd, &sockdes);
+ ap_get_os_sock(&sockdes, csd);
clen = sizeof(sa_server);
if (getsockname(sockdes, &sa_server, &clen) < 0) {
@@ -2544,7 +2544,7 @@
listenmaxfd = -1;
FD_ZERO(&listenfds);
for (lr = ap_listeners; lr; lr = lr->next) {
- ap_get_os_sock(lr->sd, &sockdes);
+ ap_get_os_sock(&sockdes, lr->sd);
FD_SET(sockdes, &listenfds);
if (sockdes > listenmaxfd) {
listenmaxfd = sockdes;
1.18 +5 -5 apache-2.0/src/modules/mpm/winnt/winnt.c
Index: winnt.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/winnt/winnt.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- winnt.c 1999/10/08 19:06:58 1.17
+++ winnt.c 1999/10/10 20:35:06 1.18
@@ -353,7 +353,7 @@
SOCKET nsd;
for (lr = head_listener; lr ; lr = lr->next) {
- ap_get_os_sock(lr->sd, &nsd);
+ ap_get_os_sock(&nsd, lr->sd);
if (FD_ISSET(nsd, main_fds)) {
head_listener = lr->next;
if (head_listener == NULL)
@@ -379,7 +379,7 @@
for (lr = ap_listeners; lr; lr = lr->next) {
num_listeners++;
if (lr->sd != NULL) {
- ap_get_os_sock(lr->sd, &nsd);
+ ap_get_os_sock(&nsd, lr->sd);
FD_SET(nsd, &listenfds);
if (listenmaxfd == INVALID_SOCKET || nsd > listenmaxfd) {
listenmaxfd = nsd;
@@ -749,7 +749,7 @@
context->conn_io = ap_bcreate(context->ptrans, B_RDWR);
context->recv_buf = context->conn_io->inbase;
context->recv_buf_size = context->conn_io->bufsiz - 2*PADDED_ADDR_SIZE;
- ap_get_os_sock(context->lr->sd, &nsd);
+ ap_get_os_sock(&nsd, context->lr->sd);
AcceptEx(nsd,//context->lr->fd,
context->accept_socket,
@@ -779,7 +779,7 @@
context->conn_io = ap_bcreate(context->ptrans, B_RDWR);
context->recv_buf = context->conn_io->inbase;
context->recv_buf_size = context->conn_io->bufsiz - 2*PADDED_ADDR_SIZE;
- ap_get_os_sock(context->lr->sd, &nsd);
+ ap_get_os_sock(&nsd, context->lr->sd);
rc = AcceptEx(nsd, //context->lr->fd,
context->accept_socket,
@@ -1082,7 +1082,7 @@
/* Associate each listener with the completion port */
for (lr = ap_listeners; lr != NULL; lr = lr->next) {
- ap_get_os_sock(lr->sd, &nsd);
+ ap_get_os_sock(&nsd, lr->sd);
CreateIoCompletionPort((HANDLE) nsd, //(HANDLE)lr->fd,
AcceptExCompPort,
0,
