Commit efe6f3ff authored by Jeff Trawick's avatar Jeff Trawick
Browse files

+1 to htpasswd sync


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1094003 13f79535-47bb-0310-9956-ffa450edef68
parent 15537afd
Loading
Loading
Loading
Loading
+9 −8
Original line number Diff line number Diff line
@@ -103,6 +103,15 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
     wrowe notes: CHANGES needs to be clearer than the text above.
     Trunk/CHANGES and 2.2.x/CHANGES need an update.

  * htpasswd.c: Syncronize with trunk version. This includes a couple of fixes:
     r826805, r826822, r829162, r829355, r829431. The patch below covers only
     the C code - we also need to apply the docs and CHANGES parts of r826805.
     2.2.x patch: http://people.apache.org/~fuankg/diffs/htpasswd.c.diff
     sf: this will change the default algorithm from crypt to md5 (I am not
         against it)
     FWIW, htdbm in 2.2.x already defaults to MD5
     +1 fuankg, wrowe, trawick

PATCHES PROPOSED TO BACKPORT FROM TRUNK:
  [ New proposals should be added at the end of the list ]

@@ -118,14 +127,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
    2.2.x: Trunk works with offset
    +1: niq, wrowe

  * htpasswd.c: Syncronize with trunk version. This includes a couple of fixes:
     r826805, r826822, r829162, r829355, r829431. The patch below covers only
     the C code - we also need to apply the docs and CHANGES parts of r826805.
     2.2.x patch: http://people.apache.org/~fuankg/diffs/htpasswd.c.diff
     sf: this will change the default algorithm from crypt to md5 (I am not
         against it)
     +1 fuankg, wrowe

  * Fixes for gcc -Wall warnings in Windows code
    Trunk patch: revisions/descriptions at
                 http://people.apache.org/~trawick/mingw_patch_revisions.txt