You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by ji...@apache.org on 2014/01/25 18:57:43 UTC
svn commit: r1561348 - in /apr/apr/branches/1.5.x: ./ shmem/unix/shm.c
Author: jim
Date: Sat Jan 25 17:57:43 2014
New Revision: 1561348
URL: http://svn.apache.org/r1561348
Log:
Merge r1561347 from trunk:
Revert mistaken c/p
Reviewed/backported by: jim
Modified:
apr/apr/branches/1.5.x/ (props changed)
apr/apr/branches/1.5.x/shmem/unix/shm.c
Propchange: apr/apr/branches/1.5.x/
------------------------------------------------------------------------------
Merged /apr/apr/trunk:r1561347
Modified: apr/apr/branches/1.5.x/shmem/unix/shm.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/shmem/unix/shm.c?rev=1561348&r1=1561347&r2=1561348&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/shmem/unix/shm.c (original)
+++ apr/apr/branches/1.5.x/shmem/unix/shm.c Sat Jan 25 17:57:43 2014
@@ -325,7 +325,7 @@ APR_DECLARE(apr_status_t) apr_shm_create
shm_unlink(shm_name); /* we're failing, remove the object */
return status;
}
- new_m->base = mmap(NULL, new_m->realsize, PROT_READ | PROT_WRITE,
+ new_m->base = mmap(NULL, reqsize, PROT_READ | PROT_WRITE,
MAP_SHARED, tmpfd, 0);
/* FIXME: check for errors */