]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Merge r1862611, r1877693, r1878703, r1884207 from trunk:
authorJoe Orton <jorton@apache.org>
Tue, 5 Mar 2024 13:10:50 +0000 (13:10 +0000)
committerJoe Orton <jorton@apache.org>
Tue, 5 Mar 2024 13:10:50 +0000 (13:10 +0000)
commit72bef51a8d10804411259488f96013fd6bdb0d7d
treed59f36930fae96d5061e5bfe85665e7b90d5596d
parentcf612a94d1bef40924451948360487e78efb0fa0
Merge r1862611, r1877693, r1878703, r1884207 from trunk:

* support/htpasswd.c (usage): Document SHA-256/512 support.

Windows : do not include ap_config_auto.h

* support/htpasswd.c (usage): Fix typo.

Fix misleading crypt vs hash terminology in ht* and dbmmanage tools.

What the htpasswd, htdbm and dbmmanage tools do is hashing passwords, not
encrypting them, so fix the terminology in manpages, docs, --help, comments
and function names.

Submitted by: Michele Preziuso <mpreziuso kaosdynamics.com>, jorton, steffenal, ylavic
Github: closes #408
Reviewed by: jorton, ylavic, jfclere

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1916129 13f79535-47bb-0310-9956-ffa450edef68
CHANGES
docs/man/dbmmanage.1
docs/man/htdbm.1
docs/man/htpasswd.1
docs/manual/programs/dbmmanage.xml
docs/manual/programs/htdbm.xml
docs/manual/programs/htpasswd.xml
support/dbmmanage.in
support/htdbm.c
support/htpasswd.c
support/passwd_common.h