summaryrefslogtreecommitdiffstats
path: root/modules/slotmem/mod_slotmem_shm.c
diff options
context:
space:
mode:
authorYann Ylavic <ylavic@apache.org>2018-05-29 22:22:44 +0200
committerYann Ylavic <ylavic@apache.org>2018-05-29 22:22:44 +0200
commitad2008443c22be8df994f8cfb0b9509cb7626aa4 (patch)
tree7666c1403e12c9f135d7ca5f347dc2eb11d3ec60 /modules/slotmem/mod_slotmem_shm.c
parentRpm: fix the location of the PID file so as to avoid timeout (diff)
downloadapache2-ad2008443c22be8df994f8cfb0b9509cb7626aa4.tar.xz
apache2-ad2008443c22be8df994f8cfb0b9509cb7626aa4.zip
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
Diffstat (limited to '')
-rw-r--r--modules/slotmem/mod_slotmem_shm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/slotmem/mod_slotmem_shm.c b/modules/slotmem/mod_slotmem_shm.c
index 8979a9d6d1..7dffef19fc 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) {