Changeset 350 for eaccelerator/trunk/session.c

Timestamp:

06/20/08 11:20:20 (2 years ago)

Author:

bart

Message:

Failed to stage the commit properly

File:

• eaccelerator/trunk/session.c (modified) (5 diffs)

eaccelerator/trunk/session.c

@@ -116 +116 @@
         int len;
         zval ret;
+#ifdef ZEND_ENGINE_2_3
+    ALLOCA_FLAG(use_heap);
+#endif
 
         len = sizeof("sess_") + strlen(key);
+#ifdef ZEND_ENGINE_2_3
+        skey = do_alloca(len + 1, use_heap);
+#else
         skey = do_alloca(len + 1);
+#endif
         strcpy(skey, "sess_");
         strcat(skey, key);
@@ -132 +139 @@
                 *vallen = 0;
         }
+#ifdef ZEND_ENGINE_2_3
+    free_alloca(skey, use_heap);
+#else
         free_alloca(skey);
+#endif
         return SUCCESS;
 }
@@ -140 +151 @@
         char *skey;
         int len;
+    int result;
         time_t ttl = INI_INT("session.gc_maxlifetime");
         zval sval;
+#ifdef ZEND_ENGINE_2_3
+    ALLOCA_FLAG(use_heap);
+#endif
 
         len = sizeof("sess_") + strlen(key);
+#ifdef ZEND_ENGINE_2_3
+        skey = do_alloca(len + 1, use_heap);
+#else
         skey = do_alloca(len + 1);
+#endif
         strcpy(skey, "sess_");
         strcat(skey, key);
@@ -156 +175 @@
         do_session_lock(skey TSRMLS_CC);
         if (eaccelerator_put(skey, len, &sval, ttl, eaccelerator_sessions_cache_place TSRMLS_CC)) {
-                free_alloca(skey);
-                return SUCCESS;
+                result = SUCCESS;
         } else {
-                free_alloca(skey);
-                return FAILURE;
-        }
+                result = FAILURE;
+        }
+
+#ifdef ZEND_ENGINE_2_3
+    free_alloca(skey, use_heap);
+#else
+        free_alloca(skey);
+#endif
+
+    return result;
 }
 
@@ -168 +193 @@
         char *skey;
         int len;
+    int result;
+#ifdef ZEND_ENGINE_2_3
+    ALLOCA_FLAG(use_heap);
+#endif
 
         len = sizeof("sess_") + strlen(key);
+#ifdef ZEND_ENGINE_2_3
+        skey = do_alloca(len + 1, use_heap);
+#else
         skey = do_alloca(len + 1);
+#endif
         strcpy(skey, "sess_");
         strcat(skey, key);
         if (eaccelerator_rm(skey, len, eaccelerator_sessions_cache_place TSRMLS_CC)) {
-                free_alloca(skey);
-                return SUCCESS;
+                result = SUCCESS;
         } else {
-                free_alloca(skey);
-                return FAILURE;
-        }
+                result = FAILURE;
+        }
+
+#ifdef ZEND_ENGINE_2_3
+    free_alloca(skey, use_heap);
+#else
+        free_alloca(skey);
+#endif
+
+    return result;
 }