Return-Path: 
 <cvs-return-47921-apmail-httpd-cvs-archive=httpd.apache.org@httpd.apache.org>
X-Original-To: apmail-httpd-cvs-archive@www.apache.org
Delivered-To: apmail-httpd-cvs-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 83482C9B5
	for <apmail-httpd-cvs-archive@www.apache.org>;
 Sat,  6 Jul 2013 21:54:41 +0000 (UTC)
Received: (qmail 47694 invoked by uid 500); 6 Jul 2013 21:54:40 -0000
Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org
Received: (qmail 47641 invoked by uid 500); 6 Jul 2013 21:54:40 -0000
Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
list-help: <mailto:cvs-help@httpd.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@httpd.apache.org>
List-Post: <mailto:cvs@httpd.apache.org>
List-Id: <cvs.httpd.apache.org>
Delivered-To: mailing list cvs@httpd.apache.org
Received: (qmail 47634 invoked by uid 99); 6 Jul 2013 21:54:40 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 06 Jul 2013 21:54:40 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 06 Jul 2013 21:54:39 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id C61F12388993;
	Sat,  6 Jul 2013 21:54:19 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1500329 - in /httpd/httpd/branches/2.2.x: ./
 docs/manual/programs/htpasswd.xml
Date: Sat, 06 Jul 2013 21:54:19 -0000
To: cvs@httpd.apache.org
From: sf@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20130706215419.C61F12388993@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: sf
Date: Sat Jul  6 21:54:19 2013
New Revision: 1500329

URL: http://svn.apache.org/r1500329
Log:
Merge r1500323 (add note when default algorithm has been changed) and add
warning about crypt alogrithm from 2.4 man page


Modified:
    httpd/httpd/branches/2.2.x/   (props changed)
    httpd/httpd/branches/2.2.x/docs/manual/programs/htpasswd.xml

Propchange: httpd/httpd/branches/2.2.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1500323

Modified: httpd/httpd/branches/2.2.x/docs/manual/programs/htpasswd.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/programs/htpasswd.xml?rev=1500329&r1=1500328&r2=1500329&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/programs/htpasswd.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/programs/htpasswd.xml Sat Jul  6 21:54:19 2013
@@ -103,12 +103,15 @@ distribution.</seealso>
     one) is omitted. It cannot be combined with the <code>-c</code> option.</dd>
 
     <dt><code>-m</code></dt>
-    <dd>Use MD5 encryption for passwords. This is the default.</dd>
+    <dd>Use MD5 encryption for passwords. This is the default (since version
+    2.2.18).</dd>
 
     <dt><code>-d</code></dt>
     <dd>Use <code>crypt()</code> encryption for passwords. This is not
     supported by the <program>httpd</program> server on Windows and
-    Netware and TPF.</dd>
+    Netware and TPF.  This algorithm limits the password length to 8
+    characters.  This algorithm is <strong>insecure</strong> by today's
+    standards.  It used to be the default algorithm until version 2.2.17.</dd>
 
     <dt><code>-s</code></dt>
     <dd>Use SHA encryption for passwords. Facilitates migration from/to Netscape