From: Stefan Eissing <icing@apache.org>
Date: Mon, 6 Jan 2020 09:00:07 +0000 (+0000)
Subject: Merge of r1872368 from trunk:
X-Git-Tag: 2.4.42~161
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58376752315b46fdbc4d8f5f28ac00e7dbc986c2;p=thirdparty%2Fapache%2Fhttpd.git

Merge of r1872368 from trunk:

mod_slotmem_shm: reverting unwanted change bby backport



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1872369 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/slotmem/mod_slotmem_shm.c b/modules/slotmem/mod_slotmem_shm.c
index b86a6e8066e..6dda8f65fec 100644
--- a/modules/slotmem/mod_slotmem_shm.c
+++ b/modules/slotmem/mod_slotmem_shm.c
@@ -21,7 +21,6 @@
  * otherwise.
  */
 
-#include <assert.h>
 #include  "ap_slotmem.h"
 
 #include "httpd.h"
@@ -401,7 +400,6 @@ static apr_status_t slotmem_create(ap_slotmem_instance_t **new,
             else {
                 apr_shm_remove(fname, pool);
                 rv = apr_shm_create(&shm, size, fname, gpool);
-                assert(rv == APR_SUCCESS);
             }
         }
         else {