projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
fix retval
[m6w6/ext-http]
/
php_http_options.c
diff --git
a/php_http_options.c
b/php_http_options.c
index 7a01b9cc385586fe5d7570af136db402d12be796..d4be512a7e1e9584cdace1a12429054fee90e471 100644
(file)
--- a/
php_http_options.c
+++ b/
php_http_options.c
@@
-19,7
+19,7
@@
static void php_http_options_hash_dtor(zval *pData)
zval_ptr_dtor(&opt->defval);
zend_hash_destroy(&opt->suboptions.options);
zend_string_release(opt->name);
zval_ptr_dtor(&opt->defval);
zend_hash_destroy(&opt->suboptions.options);
zend_string_release(opt->name);
-
efree(op
t);
+
pefree(opt, opt->persisten
t);
}
php_http_options_t *php_http_options_init(php_http_options_t *registry, zend_bool persistent)
}
php_http_options_t *php_http_options_init(php_http_options_t *registry, zend_bool persistent)
@@
-84,6
+84,7
@@
php_http_option_t *php_http_option_register(php_http_options_t *registry, const
opt.suboptions.getter = registry->getter;
opt.suboptions.setter = registry->setter;
opt.suboptions.getter = registry->getter;
opt.suboptions.setter = registry->setter;
+ opt.persistent = registry->persistent;
opt.name = zend_string_init(name_str, name_len, registry->persistent);
opt.type = type;
opt.option = option;
opt.name = zend_string_init(name_str, name_len, registry->persistent);
opt.type = type;
opt.option = option;
@@
-101,10
+102,6
@@
php_http_option_t *php_http_option_register(php_http_options_t *registry, const
ZVAL_LONG(&opt.defval, 0);
break;
ZVAL_LONG(&opt.defval, 0);
break;
- case IS_STRING:
- ZVAL_EMPTY_STRING(&opt.defval);
- break;
-
case IS_DOUBLE:
ZVAL_DOUBLE(&opt.defval, 0);
break;
case IS_DOUBLE:
ZVAL_DOUBLE(&opt.defval, 0);
break;