apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From orlikow...@apache.org
Subject cvs commit: apr/network_io/unix poll.c
Date Thu, 07 Jun 2001 10:31:27 GMT
orlikowski    01/06/07 03:31:26

  Modified:    modules/mappers mod_so.c
               .        configure.in
               include/arch/unix networkio.h
               network_io/unix poll.c
  Log:
  Ooopsie. Some unintended things slipped in.
  Backing them out.
  Sorry.
  
  Revision  Changes    Path
  1.41      +2 -2      httpd-2.0/modules/mappers/mod_so.c
  
  Index: mod_so.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_so.c,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- mod_so.c	2001/06/07 10:03:09	1.40
  +++ mod_so.c	2001/06/07 10:31:09	1.41
  @@ -238,7 +238,7 @@
   			  apr_dso_error(modhandle, my_error, sizeof(my_error)),
   			  NULL);
       }
  -    ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, cmd->server,
  +    ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, cmd->pool,
   		 "loaded module %s", modname);
   
       /*
  @@ -309,7 +309,7 @@
   			  NULL);
       }
       
  -    ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, cmd->server,
  +    ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, NULL,
   		 "loaded file %s", filename);
   
       return NULL;
  
  
  
  1.313     +0 -2      apr/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apr/configure.in,v
  retrieving revision 1.312
  retrieving revision 1.313
  diff -u -r1.312 -r1.313
  --- configure.in	2001/06/07 10:03:17	1.312
  +++ configure.in	2001/06/07 10:31:14	1.313
  @@ -330,7 +330,6 @@
   AC_SUBST(threads)
   AC_SUBST(have_sigwait)
   
  -AC_CHECK_FUNCS(kqueue)
   AC_CHECK_FUNCS(poll)
   
   dnl #----------------------------- Checking for missing POSIX thread functions
  @@ -557,7 +556,6 @@
       net/errno.h		\
       netinet/in.h	\
       sys/file.h		\
  -    sys/event.h		\
       sys/mman.h		\
       sys/poll.h		\
       sys/resource.h	\
  
  
  
  1.44      +0 -3      apr/include/arch/unix/networkio.h
  
  Index: networkio.h
  ===================================================================
  RCS file: /home/cvs/apr/include/arch/unix/networkio.h,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- networkio.h	2001/06/07 10:03:21	1.43
  +++ networkio.h	2001/06/07 10:31:20	1.44
  @@ -69,9 +69,6 @@
   #if APR_HAVE_SYS_UIO_H
   #include <sys/uio.h>
   #endif
  -#ifdef HAVE_SYS_EVENT_H
  -#include <sys/event.h>
  -#endif
   #ifdef HAVE_SYS_POLL_H
   #include <sys/poll.h>
   #endif
  
  
  
  1.47      +1 -39     apr/network_io/unix/poll.c
  
  Index: poll.c
  ===================================================================
  RCS file: /home/cvs/apr/network_io/unix/poll.c,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- poll.c	2001/06/07 10:03:25	1.46
  +++ poll.c	2001/06/07 10:31:24	1.47
  @@ -55,45 +55,7 @@
   #include "networkio.h"
   #include "fileio.h"
   
  -#if defined(HAVE_KQUEUE)  /* FreeBSD provides kqueue, let's use it :) */
  -
  -apr_status_t apr_poll_setup(apr_pollfd_t **new, apr_int32_t num, apr_pool_t *cont)
  -{
  -    (*new) = (apr_pollfd_t *)apr_pcalloc(cont, sizeof(apr_pollfd_t) * num);
  -    if ((*new) == NULL) {
  -        return APR_ENOMEM;
  -    }
  -
  -}
  -
  -apr_status_t apr_poll_socket_add(apr_pollfd_t *aprset,
  -                               apr_socket_t *sock, apr_int16_t event)
  -{
  -}
  -
  -apr_status_t apr_poll(apr_pollfd_t *aprset, apr_int32_t *nsds,
  -                    apr_interval_time_t timeout)
  -{
  -}
  -
  -apr_status_t apr_poll_revents_get(apr_int16_t *event, apr_socket_t *sock, apr_pollfd_t
*aprset)
  -{
  -}
  -
  -apr_status_t apr_poll_socket_mask(apr_pollfd_t *aprset,
  -                                  apr_socket_t *sock, apr_int16_t events)
  -{
  -}
  -
  -apr_status_t apr_poll_socket_remove(apr_pollfd_t *aprset, apr_socket_t *sock)
  -{
  -}
  -
  -apr_status_t apr_poll_socket_clear(apr_pollfd_t *aprset, apr_int16_t events)
  -{
  -}
  -
  -#elif defined(HAVE_POLL)    /* We can just use poll to do our socket polling. */
  +#ifdef HAVE_POLL    /* We can just use poll to do our socket polling. */
   
   apr_status_t apr_poll_setup(apr_pollfd_t **new, apr_int32_t num, apr_pool_t *cont)
   {
  
  
  

Mime
View raw message