diff options
| author | Dmitry Stogov <dmitry@php.net> | 2010-04-20 11:05:54 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2010-04-20 11:05:54 +0000 |
| commit | dd5c478be61a0ef94b54837cfa875c964356e14f (patch) | |
| tree | afdce3c072b3c27f7721c6f24895a147a9f825b4 /Zend/zend_variables.c | |
| parent | 94dd83722b57c4613ccf8371a3c4f50ffc274584 (diff) | |
| download | php-git-dd5c478be61a0ef94b54837cfa875c964356e14f.tar.gz | |
Added concept of interned strings. All strings constants known at compile time are allocated in a single copy and never changed.
Diffstat (limited to 'Zend/zend_variables.c')
| -rw-r--r-- | Zend/zend_variables.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Zend/zend_variables.c b/Zend/zend_variables.c index dce98ba22c..47f2462761 100644 --- a/Zend/zend_variables.c +++ b/Zend/zend_variables.c @@ -77,7 +77,7 @@ ZEND_API void _zval_internal_dtor(zval *zvalue ZEND_FILE_LINE_DC) case IS_STRING: case IS_CONSTANT: CHECK_ZVAL_STRING_REL(zvalue); - free(zvalue->value.str.val); + str_free(zvalue->value.str.val); break; case IS_ARRAY: case IS_CONSTANT_ARRAY: @@ -117,7 +117,9 @@ ZEND_API void _zval_copy_ctor_func(zval *zvalue ZEND_FILE_LINE_DC) case IS_CONSTANT: case IS_STRING: CHECK_ZVAL_STRING_REL(zvalue); - zvalue->value.str.val = (char *) estrndup_rel(zvalue->value.str.val, zvalue->value.str.len); + if (!IS_INTERNED(zvalue->value.str.val)) { + zvalue->value.str.val = (char *) estrndup_rel(zvalue->value.str.val, zvalue->value.str.len); + } break; case IS_ARRAY: case IS_CONSTANT_ARRAY: { |