cvs commit: apache/src http_main.c

[Jim Jagielski]

jim         97/02/28 05:58:08

  Modified:    src       http_main.c
  Log:
  Description: Minor MPE portability fixes
  
  Revision  Changes    Path
  1.126     +5 -1      apache/src/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/http_main.c,v
  retrieving revision 1.125
  retrieving revision 1.126
  diff -C3 -r1.125 -r1.126
  *** http_main.c       1997/02/25 21:04:43     1.125
  --- http_main.c       1997/02/28 13:58:07     1.126
  ***************
  *** 335,341 ****
  --- 335,345 ----
         */
        lsd = r->connection->client->fd;
    
  + #ifdef MPE
  +     if (((shutdown(lsd, 1)) != 0) || (sfcntl(lsd, F_SETFL, FNDELAY) == -1)) 
{
  + #else
        if (((shutdown(lsd, 1)) != 0) || (fcntl(lsd, F_SETFL, FNDELAY) == -1)) {
  + #endif
        /* if it fails, no need to go through the rest of the routine */
        if (errno != ENOTCONN)
            log_unixerr("shutdown", NULL, "lingering_close", r->server);
  ***************
  *** 1547,1553 ****
        return conn;
    }
    
  ! #if defined(TCP_NODELAY)
    static void sock_disable_nagle (int s)
    {
        /* The Nagle algorithm says that we should delay sending partial
  --- 1551,1557 ----
        return conn;
    }
    
  ! #if defined(TCP_NODELAY) && !defined(MPE)
    static void sock_disable_nagle (int s)
    {
        /* The Nagle algorithm says that we should delay sending partial