Author: mturk
Date: Fri Mar 16 00:14:23 2007
New Revision: 518877
URL: http://svn.apache.org/viewvc?view=rev&rev=518877
Log:
Delete shared memory file on httpd exit. No need to keep it because it now
contains pid as part of the name.
In any case, on each invocation it was overwritten.
Modified:
tomcat/connectors/trunk/jk/native/common/jk_shm.c
Modified: tomcat/connectors/trunk/jk/native/common/jk_shm.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_shm.c?view=diff&rev=518877&r1=518876&r2=518877
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_shm.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_shm.c Fri Mar 16 00:14:23 2007
@@ -369,6 +369,7 @@
if (ftruncate(fd, jk_shmem.size)) {
rc = errno;
close(fd);
+ unlink(jk_shmem.filename);
jk_shmem.size = 0;
JK_TRACE_EXIT(l);
return rc;
@@ -380,6 +381,7 @@
if (lseek(fd, 0, SEEK_SET) != 0) {
rc = errno;
close(fd);
+ unlink(jk_shmem.filename);
jk_shmem.size = 0;
JK_TRACE_EXIT(l);
return rc;
@@ -392,6 +394,7 @@
if (base == (caddr_t)MAP_FAILED || base == (caddr_t)0) {
rc = errno;
close(fd);
+ unlink(jk_shmem.filename);
jk_shmem.size = 0;
JK_TRACE_EXIT(l);
return rc;
@@ -440,6 +443,7 @@
if (!attached) {
munmap((void *)jk_shmem.hdr, jk_shmem.size);
close(jk_shmem.fd);
+ unlink(jk_shmem.filename);
}
jk_shmem.hdr = NULL;
jk_shmem.fd = -1;
@@ -498,6 +502,7 @@
jk_shmem.lockname = NULL;
}
if (jk_shmem.filename) {
+ unlink(jk_shmem.filename);
free(jk_shmem.filename);
jk_shmem.filename = NULL;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
