cvs commit: apache-1.3/src/main http_main.c

[jim]

jim         98/08/11 11:08:29

  Modified:    src      CHANGES
               src/main http_main.c
  Log:
  Per Brian's request, when processes are in
  BUSY_READ mode, mod_status no longer shows the old, previous request
  info
  
  Revision  Changes    Path
  1.1019    +4 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1018
  retrieving revision 1.1019
  diff -u -r1.1018 -r1.1019
  --- CHANGES   1998/08/11 09:26:20     1.1018
  +++ CHANGES   1998/08/11 18:08:25     1.1019
  @@ -1,5 +1,9 @@
   Changes with Apache 1.3.2
   
  +  *) When READing a request in ExtendedStatus mode, the "old"
  +     vhost, request and client information is cleared out.
  +     [Jim Jagielski]
  +
     *) STATUS is no longer available. Full status information now
        run-time configurable using the ExtendedStatus directive.
        [Jim Jagielski]
  
  
  
  1.383     +7 -0      apache-1.3/src/main/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/main/http_main.c,v
  retrieving revision 1.382
  retrieving revision 1.383
  diff -u -r1.382 -r1.383
  --- http_main.c       1998/08/11 17:40:46     1.382
  +++ http_main.c       1998/08/11 18:08:27     1.383
  @@ -1993,6 +1993,13 @@
                                       sizeof(ss->request));
            }
            ap_cpystrn(ss->vhost, r->server->server_hostname, 
sizeof(ss->vhost));
  +     } else if (status == SERVER_BUSY_READ) {
  +         /*
  +          * When reading a "new" request, we don't want to show the old 
  +          * info since that's confusing... so NULL it out quickly since
  +          * we want to hurry up and read the request.
  +          */
  +         *ss->vhost = *ss->request = *ss->client = '\0';
        }
       }
       put_scoreboard_info(child_num, ss);