- APR_FILE_NOCLEANUP chunk from apr trunk

Changed files:
    apr-bug-46425.patch -> 1.8

diff --git a/apr-bug-46425.patch b/apr-bug-46425.patch
index d35f72a5c3a19360eb3dc5bd99c1243e2df9132e..bf2c187b776336228e23e305761093c08f66794d 100644 (file)
--- a/apr-bug-46425.patch
+++ b/apr-bug-46425.patch
@@ -14,7 +14,7 @@ diff -urN apr-1.3.3.org/file_io/unix/filedup.c apr-1.3.3/file_io/unix/filedup.c
              return APR_EINVAL;
          }
          rv = dup2(old_file->filedes, (*new_file)->filedes);
-+        if (!(old_file->flags & APR_INHERIT)) {
++        if (!(old_file->flags & (APR_FILE_NOCLEANUP|APR_INHERIT))) {
 +            fdflags = fcntl((*new_file)->filedes, F_GETFD);
 +            if (fdflags == -1)
 +                return errno;