Changeset 602 for branches/1.3/xcache.c

Timestamp:

2009-07-05T07:49:25+02:00 (4 years ago)

Author:

moo

Message:

merged r363,r366,r376,r381,r382,r383,r384,r385,r386,r387 from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• xcache.c (modified) (5 diffs)

branches/1.3/xcache.c

@@ -392 +392 @@
     xc_mem_t *mem = cache->mem;
     const xc_mem_handlers_t *handlers = mem->handlers;
-    zend_ulong interval = (cachetype == XC_TYPE_PHP) ? xc_php_gc_interval : xc_var_gc_interval;
+    zend_ulong interval;
+    if (cachetype == XC_TYPE_PHP) {
+        interval = xc_php_ttl ? xc_php_gc_interval : 0;
+    }
+    else {
+        interval = xc_var_gc_interval;
+    }
 
     add_assoc_long_ex(return_value, ZEND_STRS("slots"),     cache->hentry->size);
@@ -405 +411 @@
     add_assoc_long_ex(return_value, ZEND_STRS("deleted"),   cache->deletes_count);
     if (interval) {
-        add_assoc_long_ex(return_value, ZEND_STRS("gc"),    (cache->last_gc_expires + interval) - XG(request_time));
+        time_t gc = (cache->last_gc_expires + interval) - XG(request_time);
+        add_assoc_long_ex(return_value, ZEND_STRS("gc"),    gc > 0 ? gc : 0);
     }
     else {
@@ -1624 +1631 @@
     }
 
-#define STR "WWW-authenticate: basic realm='XCache Administration'"
+#define STR "WWW-authenticate: Basic Realm=\"XCache Administration\""
     sapi_add_header_ex(STR, sizeof(STR) - 1, 1, 1 TSRMLS_CC);
 #undef STR
@@ -2453 +2460 @@
 static void xc_zend_extension_register(zend_extension *new_extension, DL_HANDLE handle)
 {
-    zend_extension extension;
-
-    extension = *new_extension;
-    extension.handle = handle;
-
-    zend_extension_dispatch_message(ZEND_EXTMSG_NEW_EXTENSION, &extension);
-
-    zend_llist_prepend_element(&zend_extensions, &extension);
+    zend_extension extension;
+
+    extension = *new_extension;
+    extension.handle = handle;
+
+    zend_extension_dispatch_message(ZEND_EXTMSG_NEW_EXTENSION, &extension);
+
+    zend_llist_prepend_element(&zend_extensions, &extension);
     TRACE("%s", "registered");
 }
@@ -2513 +2520 @@
 static int xc_zend_extension_startup(zend_extension *extension)
 {
-    if (extension->startup) {
-        if (extension->startup(extension) != SUCCESS) {
+    if (extension->startup) {
+        if (extension->startup(extension) != SUCCESS) {
             return FAILURE;
-        }
-    }
+        }
+    }
     return SUCCESS;
 }