httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jwool...@apache.org
Subject cvs commit: httpd-2.0/support htpasswd.c
Date Wed, 19 Jun 2002 17:31:19 GMT
jwoolley    2002/06/19 10:31:19

  Modified:    .        CHANGES
               support  htpasswd.c
  Log:
  Grrrr.  Fix the htpasswd -c -n logic bug *the right way* this time.  :(
  
  PR: 9989
  
  Revision  Changes    Path
  1.842     +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.841
  retrieving revision 1.842
  diff -u -d -u -r1.841 -r1.842
  --- CHANGES	19 Jun 2002 07:21:45 -0000	1.841
  +++ CHANGES	19 Jun 2002 17:31:19 -0000	1.842
  @@ -1,6 +1,9 @@
   
   Changes with Apache 2.0.40
   
  +  *) Fix a silly htpasswd.c logic error that incorrectly reported that
  +     both -c and -n had been used.  PR 9989  [Cliff Woolley]
  +
     *) Fixed a mod_include error case in which no HTTP response was sent
        to the client if an shtml document contained an unterminated SSI
        directive [Brian Pane]
  
  
  
  1.49      +1 -1      httpd-2.0/support/htpasswd.c
  
  Index: htpasswd.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/htpasswd.c,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -d -u -r1.48 -r1.49
  --- htpasswd.c	18 Jun 2002 02:58:36 -0000	1.48
  +++ htpasswd.c	19 Jun 2002 17:31:19 -0000	1.49
  @@ -375,7 +375,7 @@
           }
       }
   
  -    if (*mask & (APHTP_NEWFILE | APHTP_NOFILE)) {
  +    if ((*mask & APHTP_NEWFILE) && (*mask & APHTP_NOFILE)) {
           apr_file_printf(errfile, "%s: -c and -n options conflict\n", argv[0]);
           exit(ERR_SYNTAX);
       }
  
  
  

Mime
View raw message