Changeset 350

Timestamp:

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

Author:

bart

Message:

Failed to stage the commit properly

Location:

eaccelerator/trunk

Files:

• cache.c (modified) (1 diff)
• content.c (modified) (3 diffs)
• ea_restore.c (modified) (1 diff)
• eaccelerator.h (modified) (1 diff)
• session.c (modified) (5 diffs)

eaccelerator/trunk/cache.c

@@ -252 +252 @@
         q->create = EAG(req_start);
         /* set the refcount to 1 */
-        q->value.refcount = 1;
+        RESET_PZVAL_REFCOUNT(&q->value);
         store_zval(&EAG(mem), &q->value TSRMLS_CC);
         zend_hash_destroy(&EAG(strings));

eaccelerator/trunk/content.c

@@ -157 +157 @@
   memcpy(cache_content, content, sizeof(zval));
   zval_copy_ctor(cache_content);
-  cache_content->is_ref = 0;
-  cache_content->refcount = 1;
+  INIT_PZVAL(cache_content);
   add_assoc_zval(&cache_array, "content", cache_content);
   eaccelerator_put(key, key_len , &cache_array, ttl, eaccelerator_content_cache_place TSRMLS_CC);
@@ -493 +492 @@
   char* zkey;
   int   zkey_len;
+#ifdef ZEND_ENGINE_2_3
+  ALLOCA_FLAG(use_heap)
+#endif
 
   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
@@ -501 +503 @@
     RETURN_NULL();
   }
+#ifdef ZEND_ENGINE_2_3
+  zkey = do_alloca(key_len+16, use_heap);
+#else
   zkey = do_alloca(key_len+16);
+#endif
   eaccelerator_rm(key, key_len, eaccelerator_content_cache_place TSRMLS_CC);
   zkey_len = sizeof("gzip_") + key_len - 1;

eaccelerator/trunk/ea_restore.c

@@ -48 +48 @@
 #if HARDENING_PATCH_HASH_PROTECT
 extern unsigned int zend_hash_canary;
-#endif
-
-#ifdef ZEND_ENGINE_2_3
-    #define RESET_PZVAL_REFCOUNT(z) Z_SET_REFCOUNT_P(z, 1)
-#else
-    #define RESET_PZVAL_REFCOUNT(z) (z)->refcount = 1;
 #endif
 

eaccelerator/trunk/eaccelerator.h

@@ -186 +186 @@
 #define EA_SIZE_ALIGN(n) (n) = ((((size_t)(n)-1) & ~(EACCELERATOR_PLATFORM_ALIGNMENT-1)) + EACCELERATOR_PLATFORM_ALIGNMENT)
 
+#ifdef ZEND_ENGINE_2_3
+    #define RESET_PZVAL_REFCOUNT(z) Z_SET_REFCOUNT_P(z, 1)
+#else
+    #define RESET_PZVAL_REFCOUNT(z) (z)->refcount = 1;
+#endif
 
 #define MAX_DUP_STR_LEN 256

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;
 }