2.4.x patch: Trunk patch works (skip docs/log-message-tags/next-number)
+1: sf, covener, druggeri
- * mod_slotmem_shm: Support DEFAULT_REL_RUNTIMEDIR for file-based shm.
- Trunk patch: http://svn.apache.org/viewvc?rev=1297560&view=rev
- 2.4.x patch: Trunk patch works
- +1: jim, jorton, minfrin
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[ New proposals should be added at the end of the list ]
* /abs_name : $abs_name
*
*/
-static const char *store_filename(apr_pool_t *pool, const char *slotmemname)
+
+#define DEFAULT_SLOTMEM_PREFIX DEFAULT_REL_RUNTIMEDIR "/slotmem-shm-"
+
+#define DEFAULT_SLOTMEM_SUFFIX ".shm"
+
+static const char *slotmem_filename(apr_pool_t *pool, const char *slotmemname)
{
const char *fname;
- if (strcasecmp(slotmemname, "none") == 0) {
+ if (!slotmemname || strcasecmp(slotmemname, "none") == 0) {
return NULL;
}
else if (slotmemname[0] != '/') {
- fname = ap_server_root_relative(pool, slotmemname);
+ const char *path = apr_pstrcat(pool, DEFAULT_SLOTMEM_PREFIX, slotmemname,
+ DEFAULT_SLOTMEM_SUFFIX, NULL);
+ fname = ap_server_root_relative(pool, path);
}
else {
fname = slotmemname;
apr_size_t nbytes;
const char *storename;
- storename = store_filename(slotmem->gpool, slotmem->name);
+ storename = slotmem_filename(slotmem->gpool, slotmem->name);
if (storename) {
rv = apr_file_open(&fp, storename, APR_CREATE | APR_READ | APR_WRITE,
apr_size_t nbytes = size;
apr_status_t rv;
- storename = store_filename(pool, name);
+ storename = slotmem_filename(pool, name);
if (storename) {
rv = apr_file_open(&fp, storename, APR_READ | APR_WRITE, APR_OS_DEFAULT,
ap_slotmem_type_t type, apr_pool_t *pool)
{
/* void *slotmem = NULL; */
- int fbased;
+ int fbased = 1;
char *ptr;
sharedslotdesc_t desc;
ap_slotmem_instance_t *res;
if (gpool == NULL) {
return APR_ENOSHMAVAIL;
}
- if (name) {
- if (name[0] != '/') {
- fname = ap_server_root_relative(pool, name);
- }
- else {
- fname = name;
- }
-
+ fname = slotmem_filename(pool, name);
+ if (fname) {
/* first try to attach to existing slotmem */
if (next) {
for (;;) {
}
}
else {
+ fbased = 0;
fname = "none";
}
/* first try to attach to existing shared memory */
- fbased = (name != NULL);
if (fbased) {
rv = apr_shm_attach(&shm, fname, gpool);
}
if (gpool == NULL) {
return APR_ENOSHMAVAIL;
}
- if (name) {
- if (name[0] == ':') {
- fname = name;
- }
- else {
- fname = ap_server_root_relative(pool, name);
- }
- }
- else {
+ fname = slotmem_filename(pool, name);
+ if (!fname) {
return APR_ENOSHMAVAIL;
}