Merging upstream version 2.4.59.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 3 insertions, 50 deletions

diff --git a/os/unix/unixd.c b/os/unix/unixd.c
index 0245720..a304f2d 100644
--- a/os/unix/unixd.c
+++ b/os/unix/unixd.c
@@ -446,7 +446,7 @@ static apr_status_t retained_data_cleanup(void *unused)
     return APR_SUCCESS;
 }
 
-AP_DECLARE(ap_unixd_mpm_retained_data *) ap_unixd_mpm_get_retained_data()
+AP_DECLARE(ap_unixd_mpm_retained_data *) ap_unixd_mpm_get_retained_data(void)
 {
     if (!retained_data) {
         retained_data = ap_retained_data_create("ap_unixd_mpm_retained_data",
diff --git a/os/win32/BaseAddr.ref b/os/win32/BaseAddr.ref
index 7a9678a..569552a 100644
--- a/os/win32/BaseAddr.ref
+++ b/os/win32/BaseAddr.ref
@@ -131,4 +131,5 @@ mod_proxy_http2.so          0x70C30000    0x00020000
 mod_http2.so                0x70C50000    0x00040000
 mod_brotli.so               0x70C90000    0x000C0000
 mod_md.so                   0x70D50000    0x00030000
-mod_proxy_uwsgi.so          0x70D80000    0x00020000
\ No newline at end of file
+mod_proxy_uwsgi.so          0x70D80000    0x00020000
+mod_socache_redis.so        0x70DA0000    0x00010000
\ No newline at end of file
diff --git a/os/win32/os.h b/os/win32/os.h
index 407c144..3a32af5 100644
--- a/os/win32/os.h
+++ b/os/win32/os.h
@@ -94,9 +94,6 @@ typedef enum {
 
 FARPROC ap_load_dll_func(ap_dlltoken_e fnLib, char* fnName, int ordinal);
 
-PSECURITY_ATTRIBUTES GetNullACL(void);
-void CleanNullACL(void *sa);
-
 #define AP_DECLARE_LATE_DLL_FUNC(lib, rettype, calltype, fn, ord, args, names) \
     typedef rettype (calltype *ap_winapi_fpt_##fn) args; \
     static ap_winapi_fpt_##fn ap_winapi_pfn_##fn = NULL; \
diff --git a/os/win32/util_win32.c b/os/win32/util_win32.c
index 86bd419..728e4b5 100644
--- a/os/win32/util_win32.c
+++ b/os/win32/util_win32.c
@@ -101,48 +101,3 @@ FARPROC ap_load_dll_func(ap_dlltoken_e fnLib, char* fnName, int ordinal)
     else
         return GetProcAddress(lateDllHandle[fnLib], fnName);
 }
-
-
-/* To share the semaphores with other processes, we need a NULL ACL
- * Code from MS KB Q106387
- */
-PSECURITY_ATTRIBUTES GetNullACL(void)
-{
-    PSECURITY_DESCRIPTOR pSD;
-    PSECURITY_ATTRIBUTES sa;
-
-    sa  = (PSECURITY_ATTRIBUTES) LocalAlloc(LPTR, sizeof(SECURITY_ATTRIBUTES));
-    sa->nLength = sizeof(SECURITY_ATTRIBUTES);
-
-    pSD = (PSECURITY_DESCRIPTOR) LocalAlloc(LPTR, SECURITY_DESCRIPTOR_MIN_LENGTH);
-    sa->lpSecurityDescriptor = pSD;
-
-    if (pSD == NULL || sa == NULL) {
-        return NULL;
-    }
-    apr_set_os_error(0);
-    if (!InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION)
-        || apr_get_os_error()) {
-        LocalFree( pSD );
-        LocalFree( sa );
-        return NULL;
-    }
-    if (!SetSecurityDescriptorDacl(pSD, TRUE, (PACL) NULL, FALSE)
-        || apr_get_os_error()) {
-        LocalFree( pSD );
-        LocalFree( sa );
-        return NULL;
-    }
-
-    sa->bInheritHandle = FALSE;
-    return sa;
-}
-
-
-void CleanNullACL(void *sa)
-{
-    if (sa) {
-        LocalFree(((PSECURITY_ATTRIBUTES)sa)->lpSecurityDescriptor);
-        LocalFree(sa);
-    }
-}