httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@hyperreal.org
Subject cvs commit: apache-1.3/src/main http_main.c
Date Sat, 05 Feb 2000 12:01:56 GMT
rse         00/02/05 04:01:55

  Modified:    src      CHANGES
               src/main http_main.c
  Log:
  Cast integer ap_wait_t values in http_main.c to get rid of compile time
  errors on platforms where "ap_wait_t" is not defined as "int" (currently
  only the NEXT and UTS21 platforms). If you've a better non-evil-cast
  solution, feel free to adjust this again.
  
  Submitted by: Gary Bickford <garyb@fxt.com>, Ralf S. Engelschall
  Reviewed by: Ralf S. Engelschall
  PR: 5053
  
  Revision  Changes    Path
  1.1508    +5 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1507
  retrieving revision 1.1508
  diff -u -r1.1507 -r1.1508
  --- CHANGES	2000/02/05 01:32:32	1.1507
  +++ CHANGES	2000/02/05 12:01:48	1.1508
  @@ -1,5 +1,10 @@
   Changes with Apache 1.3.12
   
  +  *) Cast integer ap_wait_t values in http_main.c to get rid of compile
  +     time errors on platforms where "ap_wait_t" is not defined as "int"
  +     (currently only the NEXT and UTS21 platforms).
  +     [Gary Bickford <garyb@fxt.com>, Ralf S. Engelschall] PR#5053
  +
     *) The default suexec path was HTTPD_ROOT/sbin/suexec if not
        configured via APACI. Changed to HTTPD_ROOT/bin/suexec.
        [Lars Eilebrecht]
  
  
  
  1.491     +5 -5      apache-1.3/src/main/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v
  retrieving revision 1.490
  retrieving revision 1.491
  diff -u -r1.490 -r1.491
  --- http_main.c	2000/01/26 20:10:38	1.490
  +++ http_main.c	2000/02/05 12:01:52	1.491
  @@ -1585,7 +1585,7 @@
       for (pocr = &other_children; *pocr; pocr = &(*pocr)->next) {
   	if ((*pocr)->data == data) {
   	    nocr = (*pocr)->next;
  -	    (*(*pocr)->maintenance) (OC_REASON_UNREGISTER, (*pocr)->data, -1);
  +	    (*(*pocr)->maintenance) (OC_REASON_UNREGISTER, (*pocr)->data, (ap_wait_t)-1);
   	    *pocr = nocr;
   	    /* XXX: um, well we've just wasted some space in pconf ? */
   	    return;
  @@ -1641,7 +1641,7 @@
   	    continue;
   	if (FD_ISSET(ocr->write_fd, &writable_fds))
   	    continue;
  -	(*ocr->maintenance) (OC_REASON_UNWRITABLE, ocr->data, -1);
  +	(*ocr->maintenance) (OC_REASON_UNWRITABLE, ocr->data, (ap_wait_t)-1);
       }
   }
   
  @@ -2460,16 +2460,16 @@
   	    waitret = waitpid(ocr->pid, &status, WNOHANG);
   	    if (waitret == ocr->pid) {
   		ocr->pid = -1;
  -		(*ocr->maintenance) (OC_REASON_DEATH, ocr->data, status);
  +		(*ocr->maintenance) (OC_REASON_DEATH, ocr->data, (ap_wait_t)status);
   	    }
   	    else if (waitret == 0) {
  -		(*ocr->maintenance) (OC_REASON_RESTART, ocr->data, -1);
  +		(*ocr->maintenance) (OC_REASON_RESTART, ocr->data, (ap_wait_t)-1);
   		++not_dead_yet;
   	    }
   	    else if (waitret == -1) {
   		/* uh what the heck? they didn't call unregister? */
   		ocr->pid = -1;
  -		(*ocr->maintenance) (OC_REASON_LOST, ocr->data, -1);
  +		(*ocr->maintenance) (OC_REASON_LOST, ocr->data, (ap_wait_t)-1);
   	    }
   	}
   #endif
  
  
  

Mime
View raw message