diff options
| author | Jim Jagielski <jim@apache.org> | 2013-11-08 20:51:44 +0000 |
|---|---|---|
| committer | Jim Jagielski <jim@apache.org> | 2013-11-08 20:51:44 +0000 |
| commit | 51875adb6daccaac29ed67dd03667336005f3106 (patch) | |
| tree | 94fcc74ff6cf479d7e25c8450728c478ef8e59bf /modules/slotmem | |
| parent | 33ea79e4d78789868c6b1053574e1ed420e904cb (diff) | |
| download | httpd-51875adb6daccaac29ed67dd03667336005f3106.tar.gz | |
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
Diffstat (limited to 'modules/slotmem')
| -rw-r--r-- | modules/slotmem/mod_slotmem_shm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/modules/slotmem/mod_slotmem_shm.c b/modules/slotmem/mod_slotmem_shm.c index 8f1fcb29ff..43c81ef3e3 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 |