apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jwool...@apache.org
Subject cvs commit: apr/network_io/unix sockopt.c
Date Wed, 25 Jul 2001 18:01:01 GMT
jwoolley    01/07/25 11:01:01

  Modified:    server   listen.c
  Log:
  
  
  Revision  Changes    Path
  1.58      +1 -1      httpd-2.0/server/listen.c
  
  Index: listen.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/listen.c,v
  retrieving revision 1.57
  retrieving revision 1.58
  diff -u -d -u -r1.57 -r1.58
  --- listen.c	2001/07/18 17:14:09	1.57
  +++ listen.c	2001/07/25 17:59:37	1.58
  @@ -157,7 +157,7 @@
   	return stat;
       }
   
  -#ifdef APR_HAS_SO_ACCEPTFILTER
  +#if APR_HAS_SO_ACCEPTFILTER
   #ifndef ACCEPT_FILTER_NAME
   #define ACCEPT_FILTER_NAME "dataready"
   #endif
  
  
  

  Modified:    .        acconfig.h configure.in
               include  apr.h.in apr.hw apr_network_io.h
               network_io/unix sockopt.c
  Log:
  Fix accept filters by making all the various macro names agree with each other.
  
  Revision  Changes    Path
  1.48      +1 -1      apr/acconfig.h
  
  Index: acconfig.h
  ===================================================================
  RCS file: /home/cvs/apr/acconfig.h,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -d -u -r1.47 -r1.48
  --- acconfig.h	2001/07/21 06:41:09	1.47
  +++ acconfig.h	2001/07/25 18:00:51	1.48
  @@ -13,7 +13,7 @@
   #undef HAVE_TRUERAND
   #undef HAVE_POLLIN
   #undef HAVE_isascii
  -#undef HAVE_SO_ACCEPT_FILTER
  +#undef HAVE_SO_ACCEPTFILTER
   
   /* Cross process serialization techniques */
   #undef USE_FLOCK_SERIALIZE
  
  
  
  1.344     +5 -5      apr/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apr/configure.in,v
  retrieving revision 1.343
  retrieving revision 1.344
  diff -u -d -u -r1.343 -r1.344
  --- configure.in	2001/07/24 10:08:38	1.343
  +++ configure.in	2001/07/25 18:00:51	1.344
  @@ -1221,16 +1221,16 @@
       have_corkable_tcp="1"
   fi
   
  -APR_CHECK_DEFINE(SO_ACCEPT_FILTER, sys/socket.h)
  -if test "x$ac_cv_define_SO_ACCEPT_FILTER" = "xyes"; then
  -    accept_filter="1"
  +APR_CHECK_DEFINE(SO_ACCEPTFILTER, sys/socket.h)
  +if test "x$ac_cv_define_SO_ACCEPTFILTER" = "xyes"; then
  +    acceptfilter="1"
   else
  -    accept_filter="0"
  +    acceptfilter="0"
   fi
   
   AC_SUBST(apr_tcp_nopush_flag)
   AC_SUBST(have_corkable_tcp)
  -AC_SUBST(accept_filter)
  +AC_SUBST(acceptfilter)
   
   AC_CHECK_FUNCS(set_h_errno)
   
  
  
  
  1.88      +1 -1      apr/include/apr.h.in
  
  Index: apr.h.in
  ===================================================================
  RCS file: /home/cvs/apr/include/apr.h.in,v
  retrieving revision 1.87
  retrieving revision 1.88
  diff -u -d -u -r1.87 -r1.88
  --- apr.h.in	2001/07/01 05:49:44	1.87
  +++ apr.h.in	2001/07/25 18:00:57	1.88
  @@ -131,7 +131,7 @@
   #define APR_HAS_XLATE             @iconv@
   #define APR_HAS_OTHER_CHILD       @oc@
   #define APR_HAS_DSO               @aprdso@
  -#define APR_HAS_SO_ACCEPT_FILTER  @accept_filter@
  +#define APR_HAS_SO_ACCEPTFILTER   @acceptfilter@
   #define APR_HAS_UNICODE_FS        0
   #define APR_HAS_USER              1
   #define APR_HAS_LARGE_FILES       0
  
  
  
  1.74      +1 -0      apr/include/apr.hw
  
  Index: apr.hw
  ===================================================================
  RCS file: /home/cvs/apr/include/apr.hw,v
  retrieving revision 1.73
  retrieving revision 1.74
  diff -u -d -u -r1.73 -r1.74
  --- apr.hw	2001/07/12 23:25:57	1.73
  +++ apr.hw	2001/07/25 18:00:57	1.74
  @@ -208,6 +208,7 @@
   #define APR_HAS_XLATE             0
   #define APR_HAS_OTHER_CHILD       1
   #define APR_HAS_DSO               1
  +#define APR_HAS_SO_ACCEPTFILTER   0
   #define APR_HAS_UNICODE_FS        1
   #define APR_HAS_USER              1
   #define APR_HAS_LARGE_FILES       1
  
  
  
  1.106     +3 -3      apr/include/apr_network_io.h
  
  Index: apr_network_io.h
  ===================================================================
  RCS file: /home/cvs/apr/include/apr_network_io.h,v
  retrieving revision 1.105
  retrieving revision 1.106
  diff -u -d -u -r1.105 -r1.106
  --- apr_network_io.h	2001/07/18 16:51:48	1.105
  +++ apr_network_io.h	2001/07/25 18:00:57	1.106
  @@ -790,7 +790,7 @@
    */
   APR_DECLARE(int) apr_ipsubnet_test(apr_ipsubnet_t *ipsub, apr_sockaddr_t *sa);
   
  -#ifdef APR_OS_ACCEPT_FILTER
  +#if APR_HAS_SO_ACCEPTFILTER
   /**
    * Set an OS level accept filter.
    * @param sock The socket to put the accept filter on.
  @@ -798,8 +798,8 @@
    * @param args Any extra args to the accept filter.  Passing NULL here removes
    *             the accept filter. 
    */
  -apr_status_t apr_socket_accept_filter(apr_socket_t *sock, char name[16],
  -                                      char args[256 - 16]);
  +apr_status_t apr_socket_accept_filter(apr_socket_t *sock, char *name,
  +                                      char *args);
   #endif
   
   /**
  
  
  
  1.47      +1 -1      apr/network_io/unix/sockopt.c
  
  Index: sockopt.c
  ===================================================================
  RCS file: /home/cvs/apr/network_io/unix/sockopt.c,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -d -u -r1.46 -r1.47
  --- sockopt.c	2001/07/07 22:48:08	1.46
  +++ sockopt.c	2001/07/25 18:01:01	1.47
  @@ -290,7 +290,7 @@
           return APR_SUCCESS;
   }
   
  -#ifdef SO_ACCEPTFILTER
  +#if APR_HAS_SO_ACCEPTFILTER
   apr_status_t apr_socket_accept_filter(apr_socket_t *sock, char *name, 
                                         char *args)
   {
  
  
  

Mime
View raw message