Index: /trunk/mod_coverager/xc_coverager.c
===================================================================
--- /trunk/mod_coverager/xc_coverager.c	(revision 1117)
+++ /trunk/mod_coverager/xc_coverager.c	(revision 1118)
@@ -243,12 +243,12 @@
 /* }}} */
 
-static void xc_coverager_enable(TSRMLS_D) /* {{{ */
-{
-	XG(coverager_enabled) = 1;
-}
-/* }}} */
-static void xc_coverager_disable(TSRMLS_D) /* {{{ */
-{
-	XG(coverager_enabled) = 0;
+static void xc_coverager_start(TSRMLS_D) /* {{{ */
+{
+	XG(coverager_started) = 1;
+}
+/* }}} */
+static void xc_coverager_stop(TSRMLS_D) /* {{{ */
+{
+	XG(coverager_started) = 0;
 }
 /* }}} */
@@ -258,5 +258,5 @@
 	if (XG(coverager)) {
 		if (XG(coverager_autostart)) {
-			xc_coverager_enable(TSRMLS_C);
+			xc_coverager_start(TSRMLS_C);
 		}
 #ifdef ZEND_COMPILE_EXTENDED_INFO
@@ -267,5 +267,5 @@
 	}
 	else {
-		XG(coverager_enabled) = 0;
+		XG(coverager_started) = 0;
 	}
 	return SUCCESS;
@@ -471,5 +471,5 @@
 	TSRMLS_FETCH();
 
-	if (XG(coverages) && XG(coverager_enabled)) {
+	if (XG(coverages) && XG(coverager_started)) {
 		int size = xc_coverager_get_op_array_size_no_tail(op_array);
 		int oplineno = (*EG(opline_ptr)) - op_array->opcodes;
@@ -528,5 +528,5 @@
 
 	if (XG(coverager)) {
-		xc_coverager_enable(TSRMLS_C);
+		xc_coverager_start(TSRMLS_C);
 	}
 	else {
@@ -546,5 +546,5 @@
 	}
 
-	xc_coverager_disable(TSRMLS_C);
+	xc_coverager_stop(TSRMLS_C);
 	if (clean) {
 		xc_coverager_clean(TSRMLS_C);
Index: /trunk/xcache_globals.h
===================================================================
--- /trunk/xcache_globals.h	(revision 1117)
+++ /trunk/xcache_globals.h	(revision 1118)
@@ -12,5 +12,5 @@
 	zend_bool coverager;
 	zend_bool coverager_autostart;
-	zend_bool coverager_enabled;
+	zend_bool coverager_started;
 	HashTable *coverages;  /* coverages[file][line] = times */
 #endif
Index: /trunk/mod_cacher/xc_cacher.c
===================================================================
--- /trunk/mod_cacher/xc_cacher.c	(revision 1113)
+++ /trunk/mod_cacher/xc_cacher.c	(revision 1118)
@@ -3163,4 +3163,5 @@
 #endif
 PHP_INI_BEGIN()
+	PHP_INI_ENTRY1     ("xcache.shm_scheme",          "mmap", PHP_INI_SYSTEM, xcache_OnUpdateString,   &xc_shm_scheme)
 	PHP_INI_ENTRY1     ("xcache.mmap_path",     DEFAULT_PATH, PHP_INI_SYSTEM, xcache_OnUpdateString,   &xc_mmap_path)
 	PHP_INI_ENTRY1_EX  ("xcache.readonly_protection",    "0", PHP_INI_SYSTEM, xcache_OnUpdateBool,     &xc_readonly_protection, zend_ini_boolean_displayer_cb)
@@ -3170,5 +3171,4 @@
 	PHP_INI_ENTRY1     ("xcache.count",                  "1", PHP_INI_SYSTEM, xcache_OnUpdateDummy,    NULL)
 	PHP_INI_ENTRY1     ("xcache.slots",                 "8K", PHP_INI_SYSTEM, xcache_OnUpdateDummy,    NULL)
-	PHP_INI_ENTRY1     ("xcache.shm_scheme",          "mmap", PHP_INI_SYSTEM, xcache_OnUpdateString,   &xc_shm_scheme)
 	PHP_INI_ENTRY1     ("xcache.ttl",                    "0", PHP_INI_SYSTEM, xcache_OnUpdateULong,    &xc_php_ttl)
 	PHP_INI_ENTRY1     ("xcache.gc_interval",            "0", PHP_INI_SYSTEM, xcache_OnUpdateULong,    &xc_php_gc_interval)