diff options
author | Hye-Shik Chang <perky@FreeBSD.org> | 2002-06-27 00:22:40 +0000 |
---|---|---|
committer | Hye-Shik Chang <perky@FreeBSD.org> | 2002-06-27 00:22:40 +0000 |
commit | d1eb2ba3f9e53a854a88133003458e10460b19aa (patch) | |
tree | 23feb61a278fef459d15654c19fe517241f3f232 /www/apache22/files | |
parent | Fixed bad patch. Missed it when we moved to the rerolled tarball apparently. (diff) |
o Fix the htpasswd logic bug around -c and -n options
o Take away WITH_BUNDLED_EXPAT option (use textproc/expat2)
o Bump PORTREVISION
Prompted by: Jon Noack <noackjr@rice.edu> (htpasswd)
Obtained from: Apache Project's CVS (htpasswd)
Notes
Notes:
svn path=/head/; revision=62064
Diffstat (limited to 'www/apache22/files')
-rw-r--r-- | www/apache22/files/patch-support:htpasswd.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/www/apache22/files/patch-support:htpasswd.c b/www/apache22/files/patch-support:htpasswd.c new file mode 100644 index 000000000000..3267c08e9c31 --- /dev/null +++ b/www/apache22/files/patch-support:htpasswd.c @@ -0,0 +1,11 @@ +--- support/htpasswd.c 2002/06/18 02:58:36 1.48 ++++ support/htpasswd.c 2002/06/19 17:31:19 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); + } |