apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gst...@apache.org
Subject cvs commit: apr/threadproc/unix proc.c
Date Sun, 11 Feb 2001 01:08:25 GMT
gstein      01/02/10 17:08:25

  Modified:    server   log.c
               server/mpm/dexter dexter.c
               server/mpm/mpmt_pthread mpmt_pthread.c
               server/mpm/perchild perchild.c
               server/mpm/prefork prefork.c
               support  htdigest.c
               threadproc/unix proc.c
  Log:
  *) include "apr_signal.h" when needed
  *) some other minor include tweaks
  
  Revision  Changes    Path
  1.86      +1 -0      httpd-2.0/server/log.c
  
  Index: log.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/log.c,v
  retrieving revision 1.85
  retrieving revision 1.86
  diff -u -u -r1.85 -r1.86
  --- log.c	2001/02/10 13:05:27	1.85
  +++ log.c	2001/02/11 01:08:21	1.86
  @@ -69,6 +69,7 @@
   #include "apr_errno.h"
   #include "apr_thread_proc.h"
   #include "apr_lib.h"
  +#include "apr_signal.h"
   
   #define APR_WANT_STDIO
   #define APR_WANT_STRFUNC
  
  
  
  1.146     +16 -12    httpd-2.0/server/mpm/dexter/dexter.c
  
  Index: dexter.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/dexter/dexter.c,v
  retrieving revision 1.145
  retrieving revision 1.146
  diff -u -u -r1.145 -r1.146
  --- dexter.c	2001/02/09 16:11:46	1.145
  +++ dexter.c	2001/02/11 01:08:21	1.146
  @@ -56,12 +56,21 @@
    * University of Illinois, Urbana-Champaign.
    */
   
  -#define CORE_PRIVATE 
  - 
  -#include "ap_config.h"
   #include "apr_portable.h"
   #include "apr_strings.h"
   #include "apr_file_io.h"
  +#include "apr_signal.h"
  +
  +#if APR_HAVE_UNISTD_H
  +#include <unistd.h>
  +#endif
  +#if APR_HAVE_SYS_SOCKET_H
  +#include <sys/socket.h>
  +#endif
  +
  +#define CORE_PRIVATE 
  + 
  +#include "ap_config.h"
   #include "httpd.h" 
   #include "http_main.h" 
   #include "http_log.h" 
  @@ -76,18 +85,13 @@
   #include "mpm.h"
   #include "scoreboard.h"
   
  -#ifdef HAVE_UNISTD_H
  -#include <unistd.h>
  -#endif
  +/* ### should be APR-ized */
   #include <poll.h>
  -#ifdef HAVE_SYS_SOCKET_H
  -#include <sys/socket.h>
  -#endif
  -#ifdef HAVE_NETINET_TCP_H
  +#include <pthread.h>
  +
  +#if HAVE_NETINET_TCP_H
   #include <netinet/tcp.h>
   #endif
  -#include <pthread.h>
  -#include <signal.h>
   
   /*
    * Actual definitions of config globals
  
  
  
  1.146     +1 -0      httpd-2.0/server/mpm/mpmt_pthread/mpmt_pthread.c
  
  Index: mpmt_pthread.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/mpmt_pthread/mpmt_pthread.c,v
  retrieving revision 1.145
  retrieving revision 1.146
  diff -u -u -r1.145 -r1.146
  --- mpmt_pthread.c	2001/02/10 17:47:26	1.145
  +++ mpmt_pthread.c	2001/02/11 01:08:22	1.146
  @@ -61,6 +61,7 @@
   #include "apr_strings.h"
   #include "apr_file_io.h"
   #include "apr_thread_proc.h"
  +#include "apr_signal.h"
   
   #if APR_HAVE_UNISTD_H
   #include <unistd.h>
  
  
  
  1.43      +18 -12    httpd-2.0/server/mpm/perchild/perchild.c
  
  Index: perchild.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/perchild/perchild.c,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -u -r1.42 -r1.43
  --- perchild.c	2001/02/09 16:11:49	1.42
  +++ perchild.c	2001/02/11 01:08:22	1.43
  @@ -56,14 +56,26 @@
    * University of Illinois, Urbana-Champaign.
    */
   
  -#define CORE_PRIVATE 
  - 
  -#include "ap_config.h"
   #include "apr_hash.h"
   #include "apr_strings.h"
   #include "apr_pools.h"
   #include "apr_portable.h"
   #include "apr_file_io.h"
  +#include "apr_signal.h"
  +
  +#define APR_WANT_IOVEC
  +#include "apr_want.h"
  +
  +#if APR_HAVE_UNISTD_H
  +#include <unistd.h>
  +#endif
  +#if APR_HAVE_SYS_SOCKET_H
  +#include <sys/socket.h>
  +#endif
  +
  +#define CORE_PRIVATE 
  + 
  +#include "ap_config.h"
   #include "httpd.h" 
   #include "http_main.h" 
   #include "http_log.h" 
  @@ -80,25 +92,19 @@
   #include "scoreboard.h"
   #include "util_filter.h"
   
  -#ifdef HAVE_UNISTD_H
  -#include <unistd.h>
  -#endif
  -#include <poll.h>
  -#ifdef HAVE_SYS_SOCKET_H
  -#include <sys/socket.h>
  -#endif
   #ifdef HAVE_NETINET_TCP_H
   #include <netinet/tcp.h>
   #endif
  +
  +/* ### should be APR-ized */
  +#include <poll.h>
   #include <grp.h>
   #include <pwd.h>
   #include <pthread.h>
   #include <sys/stat.h>
   #include <sys/un.h>
  -#include <signal.h>
   #include <setjmp.h>
   #include <stropts.h>
  -#include <sys/uio.h>
   
   /*
    * Actual definitions of config globals
  
  
  
  1.161     +1 -0      httpd-2.0/server/mpm/prefork/prefork.c
  
  Index: prefork.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/prefork/prefork.c,v
  retrieving revision 1.160
  retrieving revision 1.161
  diff -u -u -r1.160 -r1.161
  --- prefork.c	2001/02/11 00:24:49	1.160
  +++ prefork.c	2001/02/11 01:08:24	1.161
  @@ -88,6 +88,7 @@
   #include "apr_portable.h"
   #include "apr_strings.h"
   #include "apr_thread_proc.h"
  +#include "apr_signal.h"
   
   #define APR_WANT_STDIO
   #define APR_WANT_STRFUNC
  
  
  
  1.22      +6 -12     httpd-2.0/support/htdigest.c
  
  Index: htdigest.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/htdigest.c,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -u -r1.21 -r1.22
  --- htdigest.c	2001/02/08 07:45:32	1.21
  +++ htdigest.c	2001/02/11 01:08:24	1.22
  @@ -69,28 +69,22 @@
   #include "apr_md5.h"
   #include "apr_lib.h"            /* for apr_getpass() */
   #include "apr_general.h"
  +#include "apr_signal.h"
   
  -#if APR_HAVE_STDIO_H
  -#include <stdio.h>
  -#endif
  +#define APR_WANT_STDIO
  +#include "apr_want.h"
   
   #if APR_HAVE_SYS_TYPES_H
   #include <sys/types.h>
  -#endif
  -
  -#if APR_HAVE_SYS_SIGNAL_H
  -#include <sys/signal.h>
  -#endif
  -
  -#if APR_HAVE_SIGNAL_H
  -#include <signal.h>
   #endif
  -
  +#if APR_HAVE_STDLIB_H
   #include <stdlib.h>
  +#endif
   
   #ifdef WIN32
   #include <conio.h>
   #endif
  +
   
   #if APR_CHARSET_EBCDIC
   #define LF '\n'
  
  
  
  1.44      +1 -0      apr/threadproc/unix/proc.c
  
  Index: proc.c
  ===================================================================
  RCS file: /home/cvs/apr/threadproc/unix/proc.c,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -u -r1.43 -r1.44
  --- proc.c	2001/02/08 07:45:16	1.43
  +++ proc.c	2001/02/11 01:08:25	1.44
  @@ -55,6 +55,7 @@
   #include "threadproc.h"
   #include "apr_strings.h"
   #include "apr_portable.h"
  +#include "apr_signal.h"
   
   apr_status_t apr_procattr_create(apr_procattr_t **new, apr_pool_t *cont)
   {
  
  
  

Mime
View raw message