svn: /pecl/apc/trunk/ apc_bin.c apc_compile.c apc_php.h
| From: | Gopal Vijayaraghavan | Date: | Thu, 28 Jul 2011 06:17:10 +0000 |
| Subject: | svn: /pecl/apc/trunk/ apc_bin.c apc_compile.c apc_php.h | ||
| Groups: | php.pecl.cvs | ||
| Request: | Send a blank email to pecl-cvs+get-16099@lists.php.net to get a copy of this message | ||
gopalv Thu, 28 Jul 2011 06:17:10 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=313808
Log:
Bug #22679: Fix apc_bin_dump for constants. Use IS_CONSTANT_TYPE_MASK to handle all the constants,
including the unqalified ones (instead of ~IS_CONSTANT_INDEX check)
Bug: http://pecl.php.net/bugs/22679 (unknown)
Changed paths:
U pecl/apc/trunk/apc_bin.c
U pecl/apc/trunk/apc_compile.c
U pecl/apc/trunk/apc_php.h
Modified: pecl/apc/trunk/apc_bin.c
===================================================================
--- pecl/apc/trunk/apc_bin.c 2011-07-28 06:14:51 UTC (rev 313807)
+++ pecl/apc/trunk/apc_bin.c 2011-07-28 06:17:10 UTC (rev 313808)
@@ -28,6 +28,7 @@
#include "apc_globals.h"
#include "apc_bin.h"
#include "apc_zend.h"
+#include "apc_php.h"
#include "apc_sma.h"
#include "apc_pool.h"
#include "ext/standard/md5.h"
@@ -446,7 +447,7 @@
zend_hash_index_update(&APCG(copied_zvals), (ulong)zv, (void**)&zv, sizeof(zval*),
NULL);
}
- switch(zv->type & ~IS_CONSTANT_INDEX) {
+ switch(zv->type & IS_CONSTANT_TYPE_MASK) {
case IS_NULL:
case IS_LONG:
case IS_DOUBLE:
Modified: pecl/apc/trunk/apc_compile.c
===================================================================
--- pecl/apc/trunk/apc_compile.c 2011-07-28 06:14:51 UTC (rev 313807)
+++ pecl/apc/trunk/apc_compile.c 2011-07-28 06:17:10 UTC (rev 313808)
@@ -33,14 +33,11 @@
#include "apc_compile.h"
#include "apc_globals.h"
#include "apc_zend.h"
+#include "apc_php.h"
#include "apc_string.h"
#include "ext/standard/php_var.h"
#include "ext/standard/php_smart_str.h"
-#ifndef IS_CONSTANT_TYPE_MASK
-#define IS_CONSTANT_TYPE_MASK (~IS_CONSTANT_INDEX)
-#endif
-
typedef void* (*ht_copy_fun_t)(void*, void*, apc_context_t* TSRMLS_DC);
//typedef void (*ht_free_fun_t)(void*, apc_context_t*);
typedef int (*ht_check_copy_fun_t)(Bucket*, va_list);
Modified: pecl/apc/trunk/apc_php.h
===================================================================
--- pecl/apc/trunk/apc_php.h 2011-07-28 06:14:51 UTC (rev 313807)
+++ pecl/apc/trunk/apc_php.h 2011-07-28 06:17:10 UTC (rev 313808)
@@ -63,6 +63,10 @@
#include "zend_vm.h"
#endif
+#ifndef IS_CONSTANT_TYPE_MASK
+#define IS_CONSTANT_TYPE_MASK (~IS_CONSTANT_INDEX)
+#endif
+
#include "rfc1867.h"
#endif