httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/server/mpm/worker worker.c
Date Mon, 18 Mar 2002 18:12:43 GMT
trawick     02/03/18 10:12:43

  Modified:    server/mpm/prefork prefork.c
               server/mpm/worker worker.c
  Log:
  prefork and worker:
  
  after allocating a new scoreboard, make sure the right generation
  is stored in the global score
  
  Revision  Changes    Path
  1.250     +5 -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.249
  retrieving revision 1.250
  diff -u -r1.249 -r1.250
  --- prefork.c	16 Mar 2002 18:42:46 -0000	1.249
  +++ prefork.c	18 Mar 2002 18:12:43 -0000	1.250
  @@ -972,6 +972,11 @@
           if (ap_run_pre_mpm(pconf, SB_SHARED) != OK) {
               return 1;
           }
  +        /* fix the generation number in the global score; we just got a new,
  +         * cleared scoreboard
  +         */
  +        ap_scoreboard_image->global->running_generation = ap_my_generation;
  +        update_scoreboard_global();
       }
   #ifdef SCOREBOARD_FILE
       else {
  
  
  
  1.88      +5 -0      httpd-2.0/server/mpm/worker/worker.c
  
  Index: worker.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/worker/worker.c,v
  retrieving revision 1.87
  retrieving revision 1.88
  diff -u -r1.87 -r1.88
  --- worker.c	16 Mar 2002 18:42:46 -0000	1.87
  +++ worker.c	18 Mar 2002 18:12:43 -0000	1.88
  @@ -1424,6 +1424,11 @@
           if (ap_run_pre_mpm(pconf, SB_SHARED) != OK) {
               return 1;
           }
  +        /* fix the generation number in the global score; we just got a new,
  +         * cleared scoreboard
  +         */
  +        ap_scoreboard_image->global->running_generation = ap_my_generation;
  +        update_scoreboard_global();
       }
   
       set_signals();
  
  
  

Mime
View raw message