jerenkrantz 2003/12/26 23:12:41
Modified: . Tag: APACHE_2_0_BRANCH CHANGES
support Tag: APACHE_2_0_BRANCH htdbm.c
Log:
If we have a comment, place in a ':' not a ';' (has this *ever* worked?)
If -n is specified and we have a comment, print the comment out too.
Backup of support/htdbm.c r1.11 from httpd-2.1
Submitted by: Justin Erenkrantz
Reviewed by: Justin Erenkrantz, Sander Striker, Jeff Trawick, Ian Holsman
Revision Changes Path
No revision
No revision
1.988.2.206 +3 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.988.2.205
retrieving revision 1.988.2.206
diff -u -u -r1.988.2.205 -r1.988.2.206
--- CHANGES 27 Dec 2003 06:53:12 -0000 1.988.2.205
+++ CHANGES 27 Dec 2003 07:12:40 -0000 1.988.2.206
@@ -1,5 +1,8 @@
Changes with Apache 2.0.49
+ *) Fix htdbm to generate comment fields in DBM files correctly.
+ [Justin Erenkrantz]
+
*) mod_dav: Use bucket brigades when reading PUT data. This avoids
problems if the data stream is modified by an input filter. PR 22104.
[Tim Robbins <tim robbins.dropbear.id.au>, André Malo]
No revision
No revision
1.9.2.2 +10 -3 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.1
retrieving revision 1.9.2.2
diff -u -u -r1.9.2.1 -r1.9.2.2
--- htdbm.c 3 Feb 2003 17:32:09 -0000 1.9.2.1
+++ htdbm.c 27 Dec 2003 07:12:41 -0000 1.9.2.2
@@ -229,7 +229,7 @@
if (!htdbm->comment)
val.dptr = htdbm->userpass;
else {
- val.dptr = apr_pstrcat(htdbm->pool, htdbm->userpass, ";",
+ val.dptr = apr_pstrcat(htdbm->pool, htdbm->userpass, ":",
htdbm->comment, NULL);
val.dsize += (strlen(htdbm->comment) + 1);
}
@@ -602,8 +602,15 @@
fprintf(stdout, "Database %s %s.\n", h->filename,
h->create ? "created" : (changed ? "modified" : "updated"));
}
- if (cmd == HTDBM_NOFILE)
- fprintf(stderr, "%s:%s\n", h->username, h->userpass);
+ if (cmd == HTDBM_NOFILE) {
+ if (!need_cmnt) {
+ fprintf(stderr, "%s:%s\n", h->username, h->userpass);
+ }
+ else {
+ fprintf(stderr, "%s:%s:%s\n", h->username, h->userpass,
+ h->comment);
+ }
+ }
htdbm_terminate(h);
apr_terminate();
|