cvs commit: apache-1.3/src/modules/proxy proxy_ftp.c

[martin]

martin      98/03/25 07:09:00

  Modified:    src/modules/proxy proxy_ftp.c
  Log:
  On BS2000, the reuse-addr option is set by default, and cannot be en/disabled
  
  Revision  Changes    Path
  1.54      +4 -0      apache-1.3/src/modules/proxy/proxy_ftp.c
  
  Index: proxy_ftp.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/modules/proxy/proxy_ftp.c,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -u -r1.53 -r1.54
  --- proxy_ftp.c       1998/03/20 11:17:14     1.53
  +++ proxy_ftp.c       1998/03/25 15:08:59     1.54
  @@ -578,10 +578,12 @@
   
       if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void *) &one,
                   sizeof(one)) == -1) {
  +#ifndef _OSD_POSIX /* BS2000 has this option "always on" */
        proxy_log_uerror("setsockopt", NULL,
                         "proxy: error setting reuseaddr option", r->server);
        pclosesocket(p, sock);
        return SERVER_ERROR;
  +#endif /*_OSD_POSIX*/
       }
   
   #ifdef SINIX_D_RESOLVER_BUG
  @@ -847,12 +849,14 @@
   
        if (setsockopt(dsock, SOL_SOCKET, SO_REUSEADDR, (void *) &one,
                       sizeof(one)) == -1) {
  +#ifndef _OSD_POSIX /* BS2000 has this option "always on" */
            proxy_log_uerror("setsockopt", NULL,
                        "proxy: error setting reuseaddr option", r->server);
            pclosesocket(p, dsock);
            bclose(f);
            kill_timeout(r);
            return SERVER_ERROR;
  +#endif /*_OSD_POSIX*/
        }
   
        if (bind(dsock, (struct sockaddr *) &server,