You are viewing a plain text version of this content. The canonical link for it is here.

Posted to cvs@httpd.apache.org by ji...@apache.org on 2013/11/08 21:51:45 UTC

svn commit: r1540179 - /httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c

Author: jim
Date: Fri Nov  8 20:51:44 2013
New Revision: 1540179

URL: http://svn.apache.org/r1540179
Log:
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

Modified:
    httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c

Modified: httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c?rev=1540179&r1=1540178&r2=1540179&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c (original)
+++ httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c Fri Nov  8 20:51:44 2013
@@ -235,6 +235,7 @@ static apr_status_t restore_slotmem(void
         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