From: Yann Ylavic <ylavic@apache.org>
Date: Tue, 29 May 2018 20:22:44 +0000 (+0000)
Subject: mod_slotmem_shm: follow up to r1831869: fix dead else if condition.
X-Git-Tag: 2.5.0-alpha2-ci-test-only~2580
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad2008443c22be8df994f8cfb0b9509cb7626aa4;p=thirdparty%2Fapache%2Fhttpd.git

mod_slotmem_shm: follow up to r1831869: fix dead else if condition.



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

diff --git a/modules/slotmem/mod_slotmem_shm.c b/modules/slotmem/mod_slotmem_shm.c
index 8979a9d6d1c..7dffef19fce 100644
--- a/modules/slotmem/mod_slotmem_shm.c
+++ b/modules/slotmem/mod_slotmem_shm.c
@@ -240,7 +240,7 @@ static apr_status_t restore_slotmem(sharedslotdesc_t *desc,
                                     rv = APR_SUCCESS;
                                 }
                             }
-                            else if (rv == APR_SUCCESS || rv == APR_EOF) {
+                            else {
                                 rv = APR_INCOMPLETE;
                             }
                         }
@@ -248,7 +248,7 @@ static apr_status_t restore_slotmem(sharedslotdesc_t *desc,
                             rv = APR_EOF;
                         }
                     }
-                    else if (rv == APR_SUCCESS || rv == APR_EOF) {
+                    else {
                         rv = APR_INCOMPLETE;
                     }
                 }
@@ -266,7 +266,7 @@ static apr_status_t restore_slotmem(sharedslotdesc_t *desc,
                     rv = APR_SUCCESS;
                 }
             }
-            else if (rv == APR_SUCCESS || rv == APR_EOF) {
+            else {
                 rv = APR_INCOMPLETE;
             }
             if (rv == APR_INCOMPLETE) {