httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bnicho...@apache.org
Subject cvs commit: httpd-2.0/support htdbm.c
Date Mon, 29 Mar 2004 23:07:46 GMT
bnicholes    2004/03/29 15:07:46

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES STATUS
               support  Tag: APACHE_2_0_BRANCH htdbm.c
  Log:
  Fix the comment delimiter in htdbm
  
  Submitted by:Guenter Knauf <eflash gmx.net>
  Reviewed by: bnicholes, trawick, jjclar
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.988.2.263 +5 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.262
  retrieving revision 1.988.2.263
  diff -u -r1.988.2.262 -r1.988.2.263
  --- CHANGES	25 Mar 2004 02:32:53 -0000	1.988.2.262
  +++ CHANGES	29 Mar 2004 23:07:45 -0000	1.988.2.263
  @@ -1,5 +1,10 @@
   Changes with Apache 2.0.50
   
  +  *) Fix the comment delimiter in htdbm so that it correctly parses the 
  +     username comment.  Also add a terminate function to allow NetWare 
  +     to pause the output before the screen is destroyed.
  +     [Guenter Knauf <eflash gmx.net>, Brad Nicholes] 
  +  
     *) Fix crash when Apache was started with no Listen directives.
        [Michael Corcoran <mcorcoran warpsolutions.com>]
   
  
  
  
  1.751.2.783 +1 -7      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.782
  retrieving revision 1.751.2.783
  diff -u -r1.751.2.782 -r1.751.2.783
  --- STATUS	29 Mar 2004 21:41:13 -0000	1.751.2.782
  +++ STATUS	29 Mar 2004 23:07:46 -0000	1.751.2.783
  @@ -110,12 +110,6 @@
              modules/dav/fs/lock.c: r1.31
          +1: trawick
   
  -    *) Fix the comment delimiter so that it correctly parses the username
  -        comment.  Also add a terminate function to allow NetWare to pause
  -	the output before the screen is destroyed.
  -       support/htdbm.c: r1.15
  -       +1: bnicholes, trawick, jjclar
  -
       *) Use apr_temp_dir_get for htdigest and remove the dependancy on
           the external cp/copy command. Remove the OMIT_DELONCLOSE #ifdef
   	because removing the temp file happens automatically through
  
  
  
  No                   revision
  No                   revision
  1.9.2.6   +10 -4     httpd-2.0/support/htdbm.c
  
  Index: htdbm.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/htdbm.c,v
  retrieving revision 1.9.2.5
  retrieving revision 1.9.2.6
  diff -u -r1.9.2.5 -r1.9.2.6
  --- htdbm.c	9 Feb 2004 20:59:49 -0000	1.9.2.5
  +++ htdbm.c	29 Mar 2004 23:07:46 -0000	1.9.2.6
  @@ -105,9 +105,16 @@
   #define HTDBM_NOFILE 4
   #define HTDBM_STDIN  5
   
  +static void terminate(void)
  +{
  +    apr_terminate();
  +#ifdef NETWARE
  +    pressanykey();
  +#endif
  +}
  +
   static void htdbm_terminate(htdbm_t *htdbm) 
   {
  -    
       if (htdbm->dbm)
           apr_dbm_close(htdbm->dbm);
       htdbm->dbm = NULL;
  @@ -254,7 +261,7 @@
           fprintf(stderr, "    %-32s", kb);
           strncpy(rec, val.dptr, val.dsize);
           rec[val.dsize] = '\0';
  -        cmnt = strchr(rec, ';');
  +        cmnt = strchr(rec, ':');
           if (cmnt)
               fprintf(stderr, cmnt + 1);
           fprintf(stderr, "\n");
  @@ -387,7 +394,7 @@
       int args_left = 2;
   
       apr_app_initialize(&argc, &argv, NULL);
  -    atexit(apr_terminate);
  +    atexit(terminate);
   
       if ((rv = htdbm_init(&pool, &h)) != APR_SUCCESS) {
           fprintf(stderr, "Unable to initialize htdbm terminating!\n");
  @@ -569,7 +576,6 @@
           }
       }
       htdbm_terminate(h);
  -    apr_terminate();
       
       return 0; /* Suppress compiler warning. */
   }
  
  
  

Mime
View raw message