summaryrefslogtreecommitdiff
path: root/Zend/zend_string.h
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@php.net>2011-07-28 12:01:42 +0000
committerDmitry Stogov <dmitry@php.net>2011-07-28 12:01:42 +0000
commitb32445d4f3ad5954db43761312be7a8f3fc58ca3 (patch)
treef5e1a0517f1a4639dc14576018a68f89e5ec8bc8 /Zend/zend_string.h
parent7cf389ad2c7a7300ab7b582341f56bf496c1a8fe (diff)
downloadphp-git-b32445d4f3ad5954db43761312be7a8f3fc58ca3.tar.gz
Reverted Gopal's patch that allowed plugable interned string check
1. It introduced a significant slowdown 2. It didn't fix the real problem in APC (I'm goint to commit the fix)
Diffstat (limited to 'Zend/zend_string.h')
-rw-r--r--Zend/zend_string.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/Zend/zend_string.h b/Zend/zend_string.h
index 5dcc950faf..a130fbcc38 100644
--- a/Zend/zend_string.h
+++ b/Zend/zend_string.h
@@ -24,7 +24,6 @@
#include "zend.h"
ZEND_API extern const char *(*zend_new_interned_string)(const char *str, int len, int free_src TSRMLS_DC);
-ZEND_API extern zend_bool (*zend_is_interned_string)(const char *str TSRMLS_DC);
ZEND_API extern void (*zend_interned_strings_snapshot)(TSRMLS_D);
ZEND_API extern void (*zend_interned_strings_restore)(TSRMLS_D);
@@ -34,7 +33,7 @@ void zend_interned_strings_dtor(TSRMLS_D);
#ifndef ZTS
#define IS_INTERNED(s) \
- (zend_is_interned_string ? zend_is_interned_string((s) TSRMLS_CC) : 0)
+ (((s) >= CG(interned_strings_start)) && ((s) < CG(interned_strings_end)))
#else