You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by pq...@apache.org on 2006/04/22 03:28:15 UTC
svn commit: r396045 - in /httpd/httpd/branches/2.2.x: CHANGES support/htdbm.c
Author: pquerna
Date: Fri Apr 21 18:28:13 2006
New Revision: 396045
URL: http://svn.apache.org/viewcvs?rev=396045&view=rev
Log:
Backport r393364 from trunk, fixing a bug with crypt in htdbm.
Reviewed By: trawick, colm, jim
Modified:
httpd/httpd/branches/2.2.x/CHANGES
httpd/httpd/branches/2.2.x/support/htdbm.c
Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/CHANGES?rev=396045&r1=396044&r2=396045&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Fri Apr 21 18:28:13 2006
@@ -19,6 +19,9 @@
send to a target site. Reported by Thiago Zaninotti
<thiango nstalker.com>. [Mark Cox]
+ *) htdbm: Fix crash processing -d option in 64-bit mode on HP-UX.
+ [Jeff Trawick]
+
*) htdbm: Warn the user when adding a plaintext password on a platform
where it wouldn't work with the server (i.e., anywhere that has
crypt()). [Jeff Trawick]
Modified: httpd/httpd/branches/2.2.x/support/htdbm.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/support/htdbm.c?rev=396045&r1=396044&r2=396045&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/support/htdbm.c (original)
+++ httpd/httpd/branches/2.2.x/support/htdbm.c Fri Apr 21 18:28:13 2006
@@ -48,6 +48,9 @@
#include "apr_xlate.h"
#endif /*APR_CHARSET_EBCDIC*/
+#if APR_HAVE_UNISTD_H
+#include <unistd.h>
+#endif
#if APR_HAVE_CRYPT_H
#include <crypt.h>
#endif