From: Jim Jagielski <jim@apache.org>
Date: Fri, 8 Nov 2013 20:51:44 +0000 (+0000)
Subject: If apr_file_read did return APR_EOF, then ensure that,
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9805afd06d1b10e654071356a3f958cb02b6261;p=thirdparty%2Fapache%2Fhttpd.git

If apr_file_read did return APR_EOF, then ensure that,
as long as we read the right number of bytes, we
return APR_SUCCESS

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

diff --git a/modules/slotmem/mod_slotmem_shm.c b/modules/slotmem/mod_slotmem_shm.c
index 8f1fcb29ffd..43c81ef3e30 100644
--- a/modules/slotmem/mod_slotmem_shm.c
+++ b/modules/slotmem/mod_slotmem_shm.c
@@ -235,6 +235,7 @@ static apr_status_t restore_slotmem(void *ptr, const char *name, apr_size_t size
         if (rv == APR_SUCCESS) {
             rv = apr_file_read(fp, ptr, &nbytes);
             if ((rv == APR_SUCCESS || rv == APR_EOF) && nbytes == size) {
+                rv = APR_SUCCESS;   /* for successful return @ EOF */
                 /*
                  * if at EOF, don't bother checking md5
                  *  - backwards compatibility