httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@locus.apache.org
Subject cvs commit: apache-2.0/src/lib/apr hints.m4
Date Tue, 22 Aug 2000 21:20:12 GMT
trawick     00/08/22 14:20:11

  Modified:    src/lib/apr/network_io/unix sockopt.c
               src/lib/apr hints.m4
  Log:
  Don't fail to compile unix/sockopt.c if TCP_NODELAY isn't defined.
  
  Define TCP_NODELAY on OS/390.  libc doesn't define it in a header file
  we'd want to include.
  
  TCP_NODELAY was busted all along on OS/390; we just didn't realize it.
  
  Revision  Changes    Path
  1.34      +4 -0      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.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- sockopt.c	2000/08/22 15:09:23	1.33
  +++ sockopt.c	2000/08/22 21:20:10	1.34
  @@ -171,9 +171,13 @@
           sock->timeout = on; 
       } 
       if (opt & APR_TCP_NODELAY) {
  +#if defined(TCP_NODELAY)
           if (setsockopt(sock->socketdes, IPPROTO_TCP, TCP_NODELAY, (void *)&on, sizeof(int))
== -1) {
               return errno;
           }
  +#else
  +        return APR_ENOTIMPL;
  +#endif
       }
       return APR_SUCCESS; 
   }         
  
  
  
  1.15      +1 -0      apache-2.0/src/lib/apr/hints.m4
  
  Index: hints.m4
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/hints.m4,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- hints.m4	2000/07/21 20:24:27	1.14
  +++ hints.m4	2000/08/22 21:20:11	1.15
  @@ -397,6 +397,7 @@
          APR_ADDTO(CFLAGS, [-DPTHREAD_SETS_ERRNO])
          APR_ADDTO(CFLAGS, [-DPTHREAD_DETACH_ARG1_ADDR])
          APR_ADDTO(CFLAGS, [-DSIGPROCMASK_SETS_THREAD_MASK])
  +       APR_ADDTO(CFLAGS, [-DTCP_NODELAY=1])
          ;;
   esac
   APR_DOEXTRA
  
  
  

Mime
View raw message