httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s.@apache.org
Subject svn commit: r1500327 - in /httpd/httpd/branches/2.4.x: ./ docs/manual/programs/htpasswd.xml
Date Sat, 06 Jul 2013 21:49:35 GMT
Author: sf
Date: Sat Jul  6 21:49:34 2013
New Revision: 1500327

URL: http://svn.apache.org/r1500327
Log:
Merge r1500323:
add note when default algorithm has been changed

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

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1480627,1482859,1483190,1484343,1499742,1500323

Modified: httpd/httpd/branches/2.4.x/docs/manual/programs/htpasswd.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/programs/htpasswd.xml?rev=1500327&r1=1500326&r2=1500327&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/programs/htpasswd.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/programs/htpasswd.xml Sat Jul  6 21:49:34 2013
@@ -126,7 +126,8 @@ 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>-B</code></dt>
     <dd>Use bcrypt encryption for passwords. This is currently considered to
@@ -141,7 +142,8 @@ distribution.</seealso>
     <dd>Use <code>crypt()</code> encryption for passwords. This is not
     supported by the <program>httpd</program> server on Windows and
     Netware. This algorithm limits the password length to 8 characters.
-    This algorithm is <strong>insecure</strong> by today's standards.</dd>
+    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



Mime
View raw message