prepare v4.2.5

[m6w6/ext-http] / src / php_http_options.c

diff --git a/src/php_http_options.c b/src/php_http_options.c
index 4cb6ed37b648cabf62d305024427ece77796f9ba..94d703e07be583af3aae4bb19d592fca2ec0a08b 100644 (file)
--- a/src/php_http_options.c
+++ b/src/php_http_options.c
@@ -16,7 +16,7 @@ static void php_http_options_hash_dtor(zval *pData)
 {
        php_http_option_t *opt = Z_PTR_P(pData);
 
-       zval_internal_dtor(&opt->defval);
+       zval_internal_ptr_dtor(&opt->defval);
        zend_hash_destroy(&opt->suboptions.options);
        zend_string_release(opt->name);
        pefree(opt, opt->persistent);
@@ -74,7 +74,7 @@ void php_http_options_free(php_http_options_t **registry)
        }
 }
 
-php_http_option_t *php_http_option_register(php_http_options_t *registry, const char *name_str, size_t name_len, ulong option, zend_uchar type)
+php_http_option_t *php_http_option_register(php_http_options_t *registry, const char *name_str, size_t name_len, unsigned long option, zend_uchar type)
 {
        php_http_option_t opt;