Fix OS_Accept arg on Win32.

Use consistent name for webServerAddrs arg.

diff --git a/include/fcgios.h b/include/fcgios.h
index d76b8ee..c6a5e5e 100755 (executable)
--- a/include/fcgios.h
+++ b/include/fcgios.h
@@ -112,7 +112,7 @@ DLLAPI int OS_AsyncWrite(int fd, int offset, void *buf, int len,
 DLLAPI int OS_Close(int fd);
 DLLAPI int OS_CloseRead(int fd);
 DLLAPI int OS_DoIo(struct timeval *tmo);
-DLLAPI int OS_Accept(int listen_sock, int fail_on_intr, const char *clientAddrList);
+DLLAPI int OS_Accept(int listen_sock, int fail_on_intr, const char *webServerAddrs);
 DLLAPI int OS_IpcClose(int ipcFd);
 DLLAPI int OS_IsFcgi(int sock);
 DLLAPI void OS_SetFlags(int fd, int flags);

diff --git a/libfcgi/os_unix.c b/libfcgi/os_unix.c
index e190e13..e275392 100755 (executable)
--- a/libfcgi/os_unix.c
+++ b/libfcgi/os_unix.c
@@ -17,7 +17,7 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$Id: os_unix.c,v 1.13 1999/08/10 22:27:13 roberts Exp $";
+static const char rcsid[] = "$Id: os_unix.c,v 1.14 1999/08/12 23:56:11 roberts Exp $";
 #endif /* not lint */
 
 #include "fcgi_config.h"
@@ -1042,7 +1042,7 @@ static int is_af_unix_keeper(const int fd)
  *
  *----------------------------------------------------------------------
  */
-int OS_Accept(int listen_sock, int fail_on_intr, const char *clientAddrList)
+int OS_Accept(int listen_sock, int fail_on_intr, const char *webServerAddrs)
 {
     int socket;
     union {
@@ -1085,7 +1085,7 @@ int OS_Accept(int listen_sock, int fail_on_intr, const char *clientAddrList)
 #endif
 
                 /* Check that the client IP address is approved */
-                if (ClientAddrOK(&sa.in, clientAddrList))
+                if (ClientAddrOK(&sa.in, webServerAddrs))
                     break;
 
                 close(socket);

diff --git a/libfcgi/os_win32.c b/libfcgi/os_win32.c
index 0ea95f7..f1b17cd 100755 (executable)
--- a/libfcgi/os_win32.c
+++ b/libfcgi/os_win32.c
@@ -17,7 +17,7 @@
  *  significantly more enjoyable.)
  */
 #ifndef lint
-static const char rcsid[] = "$Id: os_win32.c,v 1.3 1999/08/05 21:25:56 roberts Exp $";
+static const char rcsid[] = "$Id: os_win32.c,v 1.4 1999/08/12 23:56:13 roberts Exp $";
 #endif /* not lint */
 
 #include "fcgi_config.h"
@@ -1396,7 +1396,7 @@ int OS_DoIo(struct timeval *tmo)
  *
  *----------------------------------------------------------------------
  */
-int OS_Accept(int listen_sock, int fail_on_intr, const char *clientAddrList)
+int OS_Accept(int listen_sock, int fail_on_intr, const char *webServerAddrs)
 {
     /* XXX This is broken for listen_sock & fail_on_intr */
     struct sockaddr_in sa;
@@ -1461,12 +1461,12 @@ int OS_Accept(int listen_sock, int fail_on_intr, const char *clientAddrList)
        } else {
            char        *tp1, *tp2;
            int match = 0;
-           if (serverHostList == NULL)
+           if (webServerAddrs == NULL)
                isNewConnection = TRUE;
            else {
-               tp1 = (char *) malloc(strlen(serverHostList)+1);
+               tp1 = (char *) malloc(strlen(webServerAddrs)+1);
             ASSERT(tp1 != NULL);
-               strcpy(tp1, serverHostList);
+               strcpy(tp1, webServerAddrs);
                while(tp1) {
                    if ((tp2 = strchr(tp1, ',')) != NULL)
                        *tp2++ = 0;