httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stodd...@locus.apache.org
Subject cvs commit: apache-2.0/src/modules/standard mod_cgid.c
Date Tue, 11 Jul 2000 22:12:19 GMT
stoddard    00/07/11 15:12:18

  Modified:    src/main http_main.c mpm_common.c
               src/modules/mpm/beos beos.c
               src/modules/mpm/dexter dexter.c
               src/modules/mpm/mpmt mpmt.c
               src/modules/mpm/mpmt_beos mpmt_beos.c
               src/modules/mpm/mpmt_pthread mpmt_pthread.c
               src/modules/mpm/prefork prefork.c
               src/modules/mpm/spmt_os2 spmt_os2.c
               src/modules/standard mod_cgid.c
  Log:
  #ifdef APR_HAS_OTHER_CHILD to #if APR_HAS_OTHER_CHILD. Not tested.
  
  Revision  Changes    Path
  1.60      +1 -1      apache-2.0/src/main/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_main.c,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- http_main.c	2000/06/11 22:06:57	1.59
  +++ http_main.c	2000/07/11 22:12:15	1.60
  @@ -130,7 +130,7 @@
   #ifdef SINGLE_LISTEN_UNSERIALIZED_ACCEPT
       printf(" -D SINGLE_LISTEN_UNSERIALIZED_ACCEPT\n");
   #endif
  -#ifdef APR_HAS_OTHER_CHILD
  +#if APR_HAS_OTHER_CHILD
       printf(" -D APR_HAS_OTHER_CHILD\n");
   #endif
   #ifdef HAVE_RELIABLE_PIPED_LOGS
  
  
  
  1.23      +1 -1      apache-2.0/src/main/mpm_common.c
  
  Index: mpm_common.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/mpm_common.c,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- mpm_common.c	2000/07/11 19:00:14	1.22
  +++ mpm_common.c	2000/07/11 22:12:15	1.23
  @@ -202,7 +202,7 @@
       ++wait_or_timeout_counter;
       if (wait_or_timeout_counter == INTERVAL_OF_WRITABLE_PROBES) {
           wait_or_timeout_counter = 0;
  -#ifdef APR_HAS_OTHER_CHILD
  +#if APR_HAS_OTHER_CHILD
           ap_probe_writable_fds();
   #endif
       }
  
  
  
  1.10      +1 -1      apache-2.0/src/modules/mpm/beos/beos.c
  
  Index: beos.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/beos/beos.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- beos.c	2000/07/10 22:08:08	1.9
  +++ beos.c	2000/07/11 22:12:16	1.10
  @@ -623,7 +623,7 @@
   		    make_worker(ap_server_conf, child_slot, time(NULL));
   		    --remaining_threads_to_start;
   		}
  -#ifdef APR_HAS_OTHER_CHILD
  +#if APR_HAS_OTHER_CHILD
   	    }
   	    else if (ap_reap_other_child(&pid, status) == 0) {
   		/* handled */
  
  
  
  1.113     +1 -1      apache-2.0/src/modules/mpm/dexter/dexter.c
  
  Index: dexter.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/dexter/dexter.c,v
  retrieving revision 1.112
  retrieving revision 1.113
  diff -u -r1.112 -r1.113
  --- dexter.c	2000/07/10 22:08:08	1.112
  +++ dexter.c	2000/07/11 22:12:16	1.113
  @@ -923,7 +923,7 @@
   		    make_child(ap_server_conf, child_slot, time(NULL));
   		    --remaining_children_to_start;
   		}
  -#ifdef APR_HAS_OTHER_CHILD
  +#if APR_HAS_OTHER_CHILD
   	    }
   	    else if (ap_reap_other_child(&pid, status) == 0) {
   		/* handled */
  
  
  
  1.11      +1 -1      apache-2.0/src/modules/mpm/mpmt/mpmt.c
  
  Index: mpmt.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt/mpmt.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- mpmt.c	2000/07/11 19:00:24	1.10
  +++ mpmt.c	2000/07/11 22:12:16	1.11
  @@ -1367,7 +1367,7 @@
                       make_child(ap_server_conf, child_slot, time(NULL));
                       --remaining_children_to_start;
                   }
  -#ifdef APR_HAS_OTHER_CHILD
  +#if APR_HAS_OTHER_CHILD
               }
               else if (ap_reap_other_child(&pid, status) == 0) {
                   /* handled */
  
  
  
  1.40      +1 -1      apache-2.0/src/modules/mpm/mpmt_beos/mpmt_beos.c
  
  Index: mpmt_beos.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_beos/mpmt_beos.c,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- mpmt_beos.c	2000/07/10 21:37:19	1.39
  +++ mpmt_beos.c	2000/07/11 22:12:17	1.40
  @@ -656,7 +656,7 @@
   		    make_child(ap_server_conf, child_slot, time(NULL));
   		    --remaining_children_to_start;
   		}
  -#ifdef APR_HAS_OTHER_CHILD
  +#if APR_HAS_OTHER_CHILD
   	    }
   	    else if (ap_reap_other_child(&pid, status) == 0) {
   		/* handled */
  
  
  
  1.107     +1 -1      apache-2.0/src/modules/mpm/mpmt_pthread/mpmt_pthread.c
  
  Index: mpmt_pthread.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/mpmt_pthread.c,v
  retrieving revision 1.106
  retrieving revision 1.107
  diff -u -r1.106 -r1.107
  --- mpmt_pthread.c	2000/07/10 22:08:10	1.106
  +++ mpmt_pthread.c	2000/07/11 22:12:17	1.107
  @@ -948,7 +948,7 @@
   		    make_child(ap_server_conf, child_slot, time(NULL));
   		    --remaining_children_to_start;
   		}
  -#ifdef APR_HAS_OTHER_CHILD
  +#if APR_HAS_OTHER_CHILD
   	    }
   	    else if (ap_reap_other_child(&pid, status) == 0) {
   		/* handled */
  
  
  
  1.117     +1 -1      apache-2.0/src/modules/mpm/prefork/prefork.c
  
  Index: prefork.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/prefork/prefork.c,v
  retrieving revision 1.116
  retrieving revision 1.117
  diff -u -r1.116 -r1.117
  --- prefork.c	2000/07/10 22:08:11	1.116
  +++ prefork.c	2000/07/11 22:12:17	1.117
  @@ -1367,7 +1367,7 @@
   		    make_child(ap_server_conf, child_slot, time(0));
   		    --remaining_children_to_start;
   		}
  -#ifdef APR_HAS_OTHER_CHILD
  +#if APR_HAS_OTHER_CHILD
   	    }
   	    else if (ap_reap_other_child(&pid, status) == 0) {
   		/* handled */
  
  
  
  1.54      +2 -2      apache-2.0/src/modules/mpm/spmt_os2/spmt_os2.c
  
  Index: spmt_os2.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/spmt_os2/spmt_os2.c,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- spmt_os2.c	2000/07/10 23:12:10	1.53
  +++ spmt_os2.c	2000/07/11 22:12:18	1.54
  @@ -366,7 +366,7 @@
       ++wait_or_timeout_counter;
       if (wait_or_timeout_counter == INTERVAL_OF_WRITABLE_PROBES) {
   	wait_or_timeout_counter = 0;
  -#ifdef APR_HAS_OTHER_CHILD
  +#if APR_HAS_OTHER_CHILD
   	ap_probe_writable_fds();
   #endif
       }
  @@ -1249,7 +1249,7 @@
   		    make_child(server_conf, child_slot, time(0));
   		    --remaining_children_to_start;
   		}
  -#ifdef APR_HAS_OTHER_CHILD
  +#if APR_HAS_OTHER_CHILD
   /* TODO: this won't work, we waited on a thread not a process
   	    }
   	    else if (reap_other_child(pid, status) == 0) {
  
  
  
  1.27      +2 -2      apache-2.0/src/modules/standard/mod_cgid.c
  
  Index: mod_cgid.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_cgid.c,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- mod_cgid.c	2000/07/07 15:20:35	1.26
  +++ mod_cgid.c	2000/07/11 22:12:18	1.27
  @@ -307,7 +307,7 @@
   
   static void cgid_maint(int reason, void *data, ap_wait_t status)
   {
  -#ifdef APR_HAS_OTHER_CHILD
  +#if APR_HAS_OTHER_CHILD
       int *sd = data;
       switch (reason) {
           case APR_OC_REASON_DEATH:
  @@ -610,7 +610,7 @@
               cgid_server(main_server);
               exit(-1);
           } 
  -#ifdef APR_HAS_OTHER_CHILD
  +#if APR_HAS_OTHER_CHILD
           ap_pid.pid = pid;
           ap_pid.err = ap_pid.in = ap_pid.out = NULL;
           ap_register_other_child(&ap_pid, cgid_maint, NULL, NULL, p);
  
  
  

Mime
View raw message