X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_cookie_api.c;h=fb3a9505c438634d03b94082867835f5eaa971d0;hb=bb35d0782f0a00906a3cfac4c8e4e3223bb1cffe;hp=bc02315e6f9098880f3a6f416d0d4c0487c66222;hpb=e6b35fbe072a13b0e792952852fcd1499bd8e610;p=m6w6%2Fext-http diff --git a/http_cookie_api.c b/http_cookie_api.c index bc02315..fb3a950 100644 --- a/http_cookie_api.c +++ b/http_cookie_api.c @@ -26,10 +26,10 @@ PHP_MINIT_FUNCTION(http_cookie) return SUCCESS; } -PHP_HTTP_API http_cookie_list *_http_cookie_list_init(http_cookie_list *list TSRMLS_DC) +PHP_HTTP_API http_cookie_list *_http_cookie_list_init(http_cookie_list *list ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC) { if (!list) { - list = emalloc(sizeof(http_cookie_list)); + list = emalloc_rel(sizeof(http_cookie_list)); } zend_hash_init(&list->cookies, 0, NULL, ZVAL_PTR_DTOR, 0); @@ -107,7 +107,7 @@ static inline void _http_cookie_list_set_item_ex(http_cookie_list *list, const c } else if (!strcasecmp(key, "domain")) { STR_SET(list->domain, estrndup(value, value_len)); } else if (!strcasecmp(key, "expires")) { - const char *date = estrndup(value, value_len); + char *date = estrndup(value, value_len); list->expires = http_parse_date(date); efree(date); } else if (!strcasecmp(key, "secure")) { @@ -321,7 +321,7 @@ failure: http_cookie_list_dtor(list); } efree(s); - return FAILURE; + return NULL; } /* }}} */