Commit b273e3c4 authored by Ruediger Pluem's avatar Ruediger Pluem
Browse files

* Do not apply the strict permissions of the temporary file to a possibly 

  existing passwd file.
  This long standing bug was triggered by fixing a bug in APR in r1791029.

PR: 61240


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1800594 13f79535-47bb-0310-9956-ffa450edef68
parent 01887f49

CHANGES

+3 −0
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-

Changes with Apache 2.5.0



  *) htpasswd / htdigest: Do not apply the strict permissions of the temporary

     passwd file to a possibly existing passwd file. PR 61240. [Ruediger Pluem]



  *) mod_proxy_fcgi: Revert to 2.4.20 FCGI behavior for the default

     ProxyFCGIBackendType, fixing a regression with PHP-FPM. PR 61202.

     [Jacob Champion]

support/htdigest.c

+1 −1
Original line number Diff line number Diff line
@@ -282,7 +282,7 @@ int main(int argc, const char * const argv[]) 


    /* The temporary file has all the data, just copy it to the new location.

     */

    if (apr_file_copy(dirname, argv[1], APR_FILE_SOURCE_PERMS, cntxt) !=

    if (apr_file_copy(dirname, argv[1], APR_OS_DEFAULT, cntxt) !=

                APR_SUCCESS) {

        apr_file_printf(errfile, "%s: unable to update file %s\n",

                        argv[0], argv[1]);

support/htpasswd.c

+1 −1
Original line number Diff line number Diff line
@@ -503,7 +503,7 @@ int main(int argc, const char * const argv[]) 


    /* The temporary file has all the data, just copy it to the new location.

     */

    if (apr_file_copy(dirname, pwfilename, APR_FILE_SOURCE_PERMS, pool) !=

    if (apr_file_copy(dirname, pwfilename, APR_OS_DEFAULT, pool) !=

        APR_SUCCESS) {

        apr_file_printf(errfile, "%s: unable to update file %s" NL,

                        argv[0], pwfilename);