X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_cookie.c;h=4bd8d80224606f7464a4470250da56d2eb1c07e1;hp=35b372886de9567bcc6efe68ee26f9325ddfd49f;hb=refs%2Fheads%2Fv2.1.x;hpb=4743c5114bcdcf8d478e140beb63fecfeccd01a4 diff --git a/php_http_cookie.c b/php_http_cookie.c index 35b3728..4bd8d80 100644 --- a/php_http_cookie.c +++ b/php_http_cookie.c @@ -6,17 +6,13 @@ | modification, are permitted provided that the conditions mentioned | | in the accompanying LICENSE file are met. | +--------------------------------------------------------------------+ - | Copyright (c) 2004-2010, Michael Wallner | + | Copyright (c) 2004-2014, Michael Wallner | +--------------------------------------------------------------------+ */ -/* $Id: http_cookie_api.c 298662 2010-04-27 13:42:32Z mike $ */ +#include "php_http_api.h" -#include "php_http.h" - -#include - -PHP_HTTP_API php_http_cookie_list_t *php_http_cookie_list_init(php_http_cookie_list_t *list TSRMLS_DC) +php_http_cookie_list_t *php_http_cookie_list_init(php_http_cookie_list_t *list TSRMLS_DC) { if (!list) { list = emalloc(sizeof(*list)); @@ -27,7 +23,8 @@ PHP_HTTP_API php_http_cookie_list_t *php_http_cookie_list_init(php_http_cookie_l list->path = NULL; list->domain = NULL; - list->expires = 0; + list->expires = -1; + list->max_age = -1; list->flags = 0; TSRMLS_SET_CTX(list->ts); @@ -35,7 +32,7 @@ PHP_HTTP_API php_http_cookie_list_t *php_http_cookie_list_init(php_http_cookie_l return list; } -PHP_HTTP_API php_http_cookie_list_t *php_http_cookie_list_copy(php_http_cookie_list_t *from, php_http_cookie_list_t *to) +php_http_cookie_list_t *php_http_cookie_list_copy(php_http_cookie_list_t *from, php_http_cookie_list_t *to) { TSRMLS_FETCH_FROM_CTX(from->ts); @@ -47,12 +44,13 @@ PHP_HTTP_API php_http_cookie_list_t *php_http_cookie_list_copy(php_http_cookie_l STR_SET(to->path, from->path ? estrdup(from->path) : NULL); STR_SET(to->domain, from->domain ? estrdup(from->domain) : NULL); to->expires = from->expires; + to->max_age = from->max_age; to->flags = from->flags; return to; } -PHP_HTTP_API void php_http_cookie_list_dtor(php_http_cookie_list_t *list) +void php_http_cookie_list_dtor(php_http_cookie_list_t *list) { if (list) { zend_hash_destroy(&list->cookies); @@ -65,7 +63,7 @@ PHP_HTTP_API void php_http_cookie_list_dtor(php_http_cookie_list_t *list) -PHP_HTTP_API void php_http_cookie_list_free(php_http_cookie_list_t **list) +void php_http_cookie_list_free(php_http_cookie_list_t **list) { if (*list) { php_http_cookie_list_dtor(*list); @@ -74,136 +72,138 @@ PHP_HTTP_API void php_http_cookie_list_free(php_http_cookie_list_t **list) } } - - -PHP_HTTP_API const char *php_http_cookie_list_get_cookie(php_http_cookie_list_t *list, const char *name, size_t name_len) +const char *php_http_cookie_list_get_cookie(php_http_cookie_list_t *list, const char *name, size_t name_len, zval **zcookie) { - zval **cookie = NULL; - if ((SUCCESS != zend_hash_find(&list->cookies, name, name_len + 1, (void *) &cookie)) || (Z_TYPE_PP(cookie) != IS_STRING)) { + zval **cookie; + if ((SUCCESS != zend_symtable_find(&list->cookies, name, name_len + 1, (void *) &cookie)) || (Z_TYPE_PP(cookie) != IS_STRING)) { return NULL; } + if (zcookie) { + *zcookie = *cookie; + } return Z_STRVAL_PP(cookie); } - - -PHP_HTTP_API const char *php_http_cookie_list_get_extra(php_http_cookie_list_t *list, const char *name, size_t name_len) +const char *php_http_cookie_list_get_extra(php_http_cookie_list_t *list, const char *name, size_t name_len, zval **zextra) { - zval **extra = NULL; - if ((SUCCESS != zend_hash_find(&list->extras, name, name_len + 1, (void *) &extra)) || (Z_TYPE_PP(extra) != IS_STRING)) { + zval **extra; + + if ((SUCCESS != zend_symtable_find(&list->extras, name, name_len + 1, (void *) &extra)) || (Z_TYPE_PP(extra) != IS_STRING)) { return NULL; } + if (zextra) { + *zextra = *extra; + } return Z_STRVAL_PP(extra); } - - -PHP_HTTP_API void php_http_cookie_list_add_cookie(php_http_cookie_list_t *list, const char *name, size_t name_len, const char *value, size_t value_len) +void php_http_cookie_list_add_cookie(php_http_cookie_list_t *list, const char *name, size_t name_len, const char *value, size_t value_len) { zval *cookie_value; MAKE_STD_ZVAL(cookie_value); ZVAL_STRINGL(cookie_value, estrndup(value, value_len), value_len, 0); - zend_hash_update(&list->cookies, name, name_len + 1, (void *) &cookie_value, sizeof(zval *), NULL); + zend_symtable_update(&list->cookies, name, name_len + 1, (void *) &cookie_value, sizeof(zval *), NULL); } - - -PHP_HTTP_API void php_http_cookie_list_add_extra(php_http_cookie_list_t *list, const char *name, size_t name_len, const char *value, size_t value_len) +void php_http_cookie_list_add_extra(php_http_cookie_list_t *list, const char *name, size_t name_len, const char *value, size_t value_len) { zval *cookie_value; MAKE_STD_ZVAL(cookie_value); ZVAL_STRINGL(cookie_value, estrndup(value, value_len), value_len, 0); - zend_hash_update(&list->extras, name, name_len + 1, (void *) &cookie_value, sizeof(zval *), NULL); + zend_symtable_update(&list->extras, name, name_len + 1, (void *) &cookie_value, sizeof(zval *), NULL); } +#define _KEY_IS(s) (key->len == sizeof(s) && !strncasecmp(key->str, (s), key->len)) +static void add_entry(php_http_cookie_list_t *list, char **allowed_extras, long flags, php_http_array_hashkey_t *key, zval *val) +{ + zval *arg = php_http_zsep(1, IS_STRING, val); -typedef struct php_http_param_parse_cb_arg { - php_http_cookie_list_t *list; - long flags; - char **allowed_extras; -} php_http_parse_param_cb_arg_t; - + if (!(flags & PHP_HTTP_COOKIE_PARSE_RAW)) { + Z_STRLEN_P(arg) = php_raw_url_decode(Z_STRVAL_P(arg), Z_STRLEN_P(arg)); + } -static void php_http_cookie_parse_callback(void *ptr, const char *key, int keylen, const char *val, int vallen TSRMLS_DC) -{ - php_http_parse_param_cb_arg_t *arg = (php_http_parse_param_cb_arg_t *) ptr; - -#define _KEY_IS(s) (keylen == lenof(s) && !strncasecmp(key, (s), keylen)) if _KEY_IS("path") { - STR_SET(arg->list->path, estrndup(val, vallen)); + STR_SET(list->path, estrndup(Z_STRVAL_P(arg), Z_STRLEN_P(arg))); } else if _KEY_IS("domain") { - STR_SET(arg->list->domain, estrndup(val, vallen)); + STR_SET(list->domain, estrndup(Z_STRVAL_P(arg), Z_STRLEN_P(arg))); } else if _KEY_IS("expires") { - char *date = estrndup(val, vallen); - arg->list->expires = php_parse_date(date, NULL); + char *date = estrndup(Z_STRVAL_P(arg), Z_STRLEN_P(arg)); + list->expires = php_parse_date(date, NULL); efree(date); + } else if _KEY_IS("max-age") { + list->max_age = strtol(Z_STRVAL_P(arg), NULL, 10); } else if _KEY_IS("secure") { - arg->list->flags |= PHP_HTTP_COOKIE_SECURE; + list->flags |= PHP_HTTP_COOKIE_SECURE; } else if _KEY_IS("httpOnly") { - arg->list->flags |= PHP_HTTP_COOKIE_HTTPONLY; + list->flags |= PHP_HTTP_COOKIE_HTTPONLY; } else { /* check for extra */ - if (arg->allowed_extras) { - char **ae = arg->allowed_extras; - + if (allowed_extras) { + char **ae = allowed_extras; + + php_http_array_hashkey_stringify(key); for (; *ae; ++ae) { - if ((size_t) keylen == strlen(*ae) && !strncasecmp(key, *ae, keylen)) { - if (arg->flags & PHP_HTTP_COOKIE_PARSE_RAW) { - php_http_cookie_list_add_extra(arg->list, key, keylen, val, vallen); + if (!strncasecmp(key->str, *ae, key->len)) { + if (key->type == HASH_KEY_IS_LONG) { + zend_hash_index_update(&list->extras, key->num, (void *) &arg, sizeof(zval *), NULL); } else { - char *dec = estrndup(val, vallen); - int declen = php_url_decode(dec, vallen); - - php_http_cookie_list_add_extra(arg->list, key, keylen, dec, declen); - efree(dec); + zend_hash_update(&list->extras, key->str, key->len, (void *) &arg, sizeof(zval *), NULL); } + php_http_array_hashkey_stringfree(key); return; } } + php_http_array_hashkey_stringfree(key); } - /* new cookie */ - if (arg->flags & PHP_HTTP_COOKIE_PARSE_RAW) { - php_http_cookie_list_add_cookie(arg->list, key, keylen, val, vallen); + + /* cookie */ + if (key->type == HASH_KEY_IS_LONG) { + zend_hash_index_update(&list->cookies, key->num, (void *) &arg, sizeof(zval *), NULL); } else { - char *dec = estrndup(val, vallen); - int declen = php_url_decode(dec, vallen); - - php_http_cookie_list_add_cookie(arg->list, key, keylen, dec, declen); - efree(dec); + zend_hash_update(&list->cookies, key->str, key->len, (void *) &arg, sizeof(zval *), NULL); } + return; } + zval_ptr_dtor(&arg); } +php_http_cookie_list_t *php_http_cookie_list_parse(php_http_cookie_list_t *list, const char *str, size_t len, long flags, char **allowed_extras TSRMLS_DC) +{ + php_http_params_opts_t opts; + HashTable params; + HashPosition pos1, pos2; + php_http_array_hashkey_t key = php_http_array_hashkey_init(0); + zval **param, **val, **args, **arg; + php_http_params_opts_default_get(&opts); + opts.input.str = estrndup(str, len); + opts.input.len = len; + opts.param = NULL; + zend_hash_init(¶ms, 10, NULL, ZVAL_PTR_DTOR, 0); + php_http_params_parse(¶ms, &opts TSRMLS_CC); + efree(opts.input.str); -PHP_HTTP_API php_http_cookie_list_t *php_http_cookie_list_parse(php_http_cookie_list_t *list, const char *string, long flags, char **allowed_extras TSRMLS_DC) -{ - int free_list = !list; - php_http_parse_param_cb_arg_t arg; - list = php_http_cookie_list_init(list TSRMLS_CC); - - arg.list = list; - arg.flags = flags; - arg.allowed_extras = allowed_extras; - - if (SUCCESS != php_http_params_parse(string, PHP_HTTP_PARAMS_RAISE_ERROR, php_http_cookie_parse_callback, &arg TSRMLS_CC)) { - if (free_list) { - php_http_cookie_list_free(&list); - } else { - php_http_cookie_list_dtor(list); + FOREACH_HASH_KEYVAL(pos1, ¶ms, key, param) { + if (Z_TYPE_PP(param) == IS_ARRAY) { + if (SUCCESS == zend_hash_find(Z_ARRVAL_PP(param), ZEND_STRS("value"), (void *) &val)) { + add_entry(list, NULL, flags, &key, *val); + } + if (SUCCESS == zend_hash_find(Z_ARRVAL_PP(param), ZEND_STRS("arguments"), (void *) &args) && Z_TYPE_PP(args) == IS_ARRAY) { + FOREACH_KEYVAL(pos2, *args, key, arg) { + add_entry(list, allowed_extras, flags, &key, *arg); + } + } } - list = NULL; } - + zend_hash_destroy(¶ms); + return list; } - - -PHP_HTTP_API void php_http_cookie_list_to_struct(php_http_cookie_list_t *list, zval *strct) +void php_http_cookie_list_to_struct(php_http_cookie_list_t *list, zval *strct) { zval array, *cookies, *extras; TSRMLS_FETCH_FROM_CTX(list->ts); @@ -222,11 +222,12 @@ PHP_HTTP_API void php_http_cookie_list_to_struct(php_http_cookie_list_t *list, z add_assoc_long(&array, "flags", list->flags); add_assoc_long(&array, "expires", (long) list->expires); + add_assoc_long(&array, "max-age", (long) list->max_age); add_assoc_string(&array, "path", STR_PTR(list->path), 1); add_assoc_string(&array, "domain", STR_PTR(list->domain), 1); } -PHP_HTTP_API php_http_cookie_list_t *php_http_cookie_list_from_struct(php_http_cookie_list_t *list, zval *strct TSRMLS_DC) +php_http_cookie_list_t *php_http_cookie_list_from_struct(php_http_cookie_list_t *list, zval *strct TSRMLS_DC) { zval **tmp, *cpy; HashTable *ht = HASH_OF(strct); @@ -240,44 +241,38 @@ PHP_HTTP_API php_http_cookie_list_t *php_http_cookie_list_from_struct(php_http_c zend_hash_copy(&list->extras, Z_ARRVAL_PP(tmp), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); } if (SUCCESS == zend_hash_find(ht, "flags", sizeof("flags"), (void *) &tmp)) { - switch (Z_TYPE_PP(tmp)) { - case IS_LONG: - list->flags = Z_LVAL_PP(tmp); - break; - case IS_DOUBLE: - list->flags = (long) Z_DVAL_PP(tmp); - break; - case IS_STRING: - cpy = php_http_ztyp(IS_LONG, *tmp); - list->flags = Z_LVAL_P(cpy); - zval_ptr_dtor(&cpy); - break; - default: - break; - } + cpy = php_http_ztyp(IS_LONG, *tmp); + list->flags = Z_LVAL_P(cpy); + zval_ptr_dtor(&cpy); } if (SUCCESS == zend_hash_find(ht, "expires", sizeof("expires"), (void *) &tmp)) { - switch (Z_TYPE_PP(tmp)) { - case IS_LONG: - list->expires = Z_LVAL_PP(tmp); - break; - case IS_DOUBLE: - list->expires = (long) Z_DVAL_PP(tmp); - break; - case IS_STRING: - cpy = php_http_ztyp(IS_LONG, *tmp); - if (Z_LVAL_P(cpy)) { - list->expires = Z_LVAL_P(cpy); - } else { - time_t expires = php_parse_date(Z_STRVAL_PP(tmp), NULL); - if (expires > 0) { - list->expires = expires; - } - } - zval_ptr_dtor(&cpy); - break; - default: - break; + if (Z_TYPE_PP(tmp) == IS_LONG) { + list->expires = Z_LVAL_PP(tmp); + } else { + long lval; + + cpy = php_http_ztyp(IS_STRING, *tmp); + if (IS_LONG == is_numeric_string(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy), &lval, NULL, 0)) { + list->expires = lval; + } else { + list->expires = php_parse_date(Z_STRVAL_P(cpy), NULL); + } + + zval_ptr_dtor(&cpy); + } + } + if (SUCCESS == zend_hash_find(ht, "max-age", sizeof("max-age"), (void *) &tmp)) { + if (Z_TYPE_PP(tmp) == IS_LONG) { + list->max_age = Z_LVAL_PP(tmp); + } else { + long lval; + + cpy = php_http_ztyp(IS_STRING, *tmp); + if (IS_LONG == is_numeric_string(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy), &lval, NULL, 0)) { + list->max_age = lval; + } + + zval_ptr_dtor(&cpy); } } if (SUCCESS == zend_hash_find(ht, "path", sizeof("path"), (void *) &tmp) && Z_TYPE_PP(tmp) == IS_STRING) { @@ -290,15 +285,13 @@ PHP_HTTP_API php_http_cookie_list_t *php_http_cookie_list_from_struct(php_http_c return list; } - - static inline void append_encoded(php_http_buffer_t *buf, const char *key, size_t key_len, const char *val, size_t val_len) { char *enc_str[2]; int enc_len[2]; - enc_str[0] = php_url_encode(key, key_len, &enc_len[0]); - enc_str[1] = php_url_encode(val, val_len, &enc_len[1]); + enc_str[0] = php_raw_url_encode(key, key_len, &enc_len[0]); + enc_str[1] = php_raw_url_encode(val, val_len, &enc_len[1]); php_http_buffer_append(buf, enc_str[0], enc_len[0]); php_http_buffer_appends(buf, "="); @@ -309,9 +302,7 @@ static inline void append_encoded(php_http_buffer_t *buf, const char *key, size_ efree(enc_str[1]); } - - -PHP_HTTP_API void php_http_cookie_list_to_string(php_http_cookie_list_t *list, char **str, size_t *len) +void php_http_cookie_list_to_string(php_http_cookie_list_t *list, char **str, size_t *len) { php_http_buffer_t buf; zval **val; @@ -322,11 +313,13 @@ PHP_HTTP_API void php_http_cookie_list_to_string(php_http_cookie_list_t *list, c php_http_buffer_init(&buf); FOREACH_HASH_KEYVAL(pos, &list->cookies, key, val) { - if (key.type == HASH_KEY_IS_STRING && key.len) { - zval *tmp = php_http_ztyp(IS_STRING, *val); - append_encoded(&buf, key.str, key.len-1, Z_STRVAL_P(tmp), Z_STRLEN_P(tmp)); - zval_ptr_dtor(&tmp); - } + zval *tmp = php_http_ztyp(IS_STRING, *val); + + php_http_array_hashkey_stringify(&key); + append_encoded(&buf, key.str, key.len-1, Z_STRVAL_P(tmp), Z_STRLEN_P(tmp)); + php_http_array_hashkey_stringfree(&key); + + zval_ptr_dtor(&tmp); } if (list->domain && *list->domain) { @@ -335,18 +328,23 @@ PHP_HTTP_API void php_http_cookie_list_to_string(php_http_cookie_list_t *list, c if (list->path && *list->path) { php_http_buffer_appendf(&buf, "path=%s; ", list->path); } - if (list->expires) { + if (list->expires >= 0) { char *date = php_format_date(ZEND_STRL(PHP_HTTP_DATE_FORMAT), list->expires, 0 TSRMLS_CC); php_http_buffer_appendf(&buf, "expires=%s; ", date); efree(date); } + if (list->max_age >= 0) { + php_http_buffer_appendf(&buf, "max-age=%ld; ", list->max_age); + } FOREACH_HASH_KEYVAL(pos, &list->extras, key, val) { - if (key.type == HASH_KEY_IS_STRING && key.len) { - zval *tmp = php_http_ztyp(IS_STRING, *val); - append_encoded(&buf, key.str, key.len-1, Z_STRVAL_P(tmp), Z_STRLEN_P(tmp)); - zval_ptr_dtor(&tmp); - } + zval *tmp = php_http_ztyp(IS_STRING, *val); + + php_http_array_hashkey_stringify(&key); + append_encoded(&buf, key.str, key.len-1, Z_STRVAL_P(tmp), Z_STRLEN_P(tmp)); + php_http_array_hashkey_stringfree(&key); + + zval_ptr_dtor(&tmp); } if (list->flags & PHP_HTTP_COOKIE_SECURE) { @@ -357,109 +355,12 @@ PHP_HTTP_API void php_http_cookie_list_to_string(php_http_cookie_list_t *list, c } php_http_buffer_fix(&buf); - *str = PHP_HTTP_BUFFER_VAL(&buf); - *len = PHP_HTTP_BUFFER_LEN(&buf); -} - -#define PHP_HTTP_BEGIN_ARGS(method, req_args) PHP_HTTP_BEGIN_ARGS_EX(HttpCookie, method, 0, req_args) -#define PHP_HTTP_EMPTY_ARGS(method) PHP_HTTP_EMPTY_ARGS_EX(HttpCookie, method, 0) -#define PHP_HTTP_COOKIE_ME(method, visibility) PHP_ME(HttpCookie, method, PHP_HTTP_ARGS(HttpCookie, method), visibility) - -PHP_HTTP_BEGIN_ARGS(__construct, 0) - PHP_HTTP_ARG_VAL(cookie_string, 0) - PHP_HTTP_ARG_VAL(parser_flags, 0) - PHP_HTTP_ARG_VAL(allowed_extras, 0) -PHP_HTTP_END_ARGS; - -PHP_HTTP_EMPTY_ARGS(toArray); -PHP_HTTP_EMPTY_ARGS(getCookies); -PHP_HTTP_EMPTY_ARGS(getExtras); -PHP_HTTP_EMPTY_ARGS(getDomain); -PHP_HTTP_EMPTY_ARGS(getPath); -PHP_HTTP_EMPTY_ARGS(getExpires); -PHP_HTTP_EMPTY_ARGS(getFlags); -PHP_HTTP_EMPTY_ARGS(toString); - -PHP_HTTP_BEGIN_ARGS(setDomain, 0) - PHP_HTTP_ARG_VAL(value, 0) -PHP_HTTP_END_ARGS; -PHP_HTTP_BEGIN_ARGS(setPath, 0) - PHP_HTTP_ARG_VAL(value, 0) -PHP_HTTP_END_ARGS; -PHP_HTTP_BEGIN_ARGS(setExpires, 0) - PHP_HTTP_ARG_VAL(value, 0) -PHP_HTTP_END_ARGS; -PHP_HTTP_BEGIN_ARGS(setFlags, 0) - PHP_HTTP_ARG_VAL(value, 0) -PHP_HTTP_END_ARGS; - -PHP_HTTP_BEGIN_ARGS(setCookies, 0) - PHP_HTTP_ARG_VAL(cookies, 0) -PHP_HTTP_END_ARGS; -PHP_HTTP_BEGIN_ARGS(addCookies, 1) - PHP_HTTP_ARG_VAL(cookies, 0) -PHP_HTTP_END_ARGS; -PHP_HTTP_BEGIN_ARGS(setExtras, 0) - PHP_HTTP_ARG_VAL(extras, 0) -PHP_HTTP_END_ARGS; -PHP_HTTP_BEGIN_ARGS(addExtras, 1) - PHP_HTTP_ARG_VAL(extras, 0) -PHP_HTTP_END_ARGS; -PHP_HTTP_BEGIN_ARGS(setCookie, 1) - PHP_HTTP_ARG_VAL(cookie_name, 0) - PHP_HTTP_ARG_VAL(cookie_value, 0) -PHP_HTTP_END_ARGS; -PHP_HTTP_BEGIN_ARGS(addCookie, 1) - PHP_HTTP_ARG_VAL(cookie_name, 0) - PHP_HTTP_ARG_VAL(cookie_value, 0) -PHP_HTTP_END_ARGS; -PHP_HTTP_BEGIN_ARGS(getCookie, 1) - PHP_HTTP_ARG_VAL(name, 0) -PHP_HTTP_END_ARGS; -PHP_HTTP_BEGIN_ARGS(setExtra, 1) - PHP_HTTP_ARG_VAL(extra_name, 0) - PHP_HTTP_ARG_VAL(extra_value, 0) -PHP_HTTP_END_ARGS; -PHP_HTTP_BEGIN_ARGS(addExtra, 1) - PHP_HTTP_ARG_VAL(extra_name, 0) - PHP_HTTP_ARG_VAL(extra_value, 0) -PHP_HTTP_END_ARGS; -PHP_HTTP_BEGIN_ARGS(getExtra, 1) - PHP_HTTP_ARG_VAL(name, 0) -PHP_HTTP_END_ARGS; + *str = buf.data; + *len = buf.used; +} + -zend_class_entry *php_http_cookie_class_entry; -zend_function_entry php_http_cookie_method_entry[] = { - PHP_HTTP_COOKIE_ME(__construct, ZEND_ACC_PUBLIC) - PHP_HTTP_COOKIE_ME(getCookies, ZEND_ACC_PUBLIC) - PHP_HTTP_COOKIE_ME(setCookies, ZEND_ACC_PUBLIC) - PHP_HTTP_COOKIE_ME(addCookies, ZEND_ACC_PUBLIC) - PHP_HTTP_COOKIE_ME(getCookie, ZEND_ACC_PUBLIC) - PHP_HTTP_COOKIE_ME(setCookie, ZEND_ACC_PUBLIC) - PHP_HTTP_COOKIE_ME(addCookie, ZEND_ACC_PUBLIC) - - PHP_HTTP_COOKIE_ME(getExtras, ZEND_ACC_PUBLIC) - PHP_HTTP_COOKIE_ME(setExtras, ZEND_ACC_PUBLIC) - PHP_HTTP_COOKIE_ME(addExtras, ZEND_ACC_PUBLIC) - PHP_HTTP_COOKIE_ME(getExtra, ZEND_ACC_PUBLIC) - PHP_HTTP_COOKIE_ME(setExtra, ZEND_ACC_PUBLIC) - PHP_HTTP_COOKIE_ME(addExtra, ZEND_ACC_PUBLIC) - - PHP_HTTP_COOKIE_ME(getDomain, ZEND_ACC_PUBLIC) - PHP_HTTP_COOKIE_ME(setDomain, ZEND_ACC_PUBLIC) - PHP_HTTP_COOKIE_ME(getPath, ZEND_ACC_PUBLIC) - PHP_HTTP_COOKIE_ME(setPath, ZEND_ACC_PUBLIC) - PHP_HTTP_COOKIE_ME(getExpires, ZEND_ACC_PUBLIC) - PHP_HTTP_COOKIE_ME(setExpires, ZEND_ACC_PUBLIC) - PHP_HTTP_COOKIE_ME(getFlags, ZEND_ACC_PUBLIC) - PHP_HTTP_COOKIE_ME(setFlags, ZEND_ACC_PUBLIC) - - PHP_HTTP_COOKIE_ME(toArray, ZEND_ACC_PUBLIC) - PHP_HTTP_COOKIE_ME(toString, ZEND_ACC_PUBLIC) - ZEND_MALIAS(HttpCookie, __toString, toString, PHP_HTTP_ARGS(HttpCookie, toString), ZEND_ACC_PUBLIC) - EMPTY_FUNCTION_ENTRY -}; static zend_object_handlers php_http_cookie_object_handlers; zend_object_value php_http_cookie_object_new(zend_class_entry *ce TSRMLS_DC) @@ -469,7 +370,6 @@ zend_object_value php_http_cookie_object_new(zend_class_entry *ce TSRMLS_DC) zend_object_value php_http_cookie_object_new_ex(zend_class_entry *ce, php_http_cookie_list_t *list, php_http_cookie_object_t **ptr TSRMLS_DC) { - zend_object_value ov; php_http_cookie_object_t *o; o = ecalloc(sizeof(*o), 1); @@ -484,21 +384,27 @@ zend_object_value php_http_cookie_object_new_ex(zend_class_entry *ce, php_http_c *ptr = o; } - ov.handle = zend_objects_store_put(o, NULL, php_http_cookie_object_free, NULL TSRMLS_CC); - ov.handlers = &php_http_cookie_object_handlers; + o->zv.handle = zend_objects_store_put(o, NULL, php_http_cookie_object_free, NULL TSRMLS_CC); + o->zv.handlers = &php_http_cookie_object_handlers; - return ov; + return o->zv; } +#define PHP_HTTP_COOKIE_OBJECT_INIT(obj) \ + do { \ + if (!obj->list) { \ + obj->list = php_http_cookie_list_init(NULL TSRMLS_CC); \ + } \ + } while(0) + zend_object_value php_http_cookie_object_clone(zval *this_ptr TSRMLS_DC) { php_http_cookie_object_t *new_obj, *old_obj = zend_object_store_get_object(getThis() TSRMLS_CC); zend_object_value ov; - if (!old_obj->list) { - old_obj->list = php_http_cookie_list_init(NULL TSRMLS_CC); - } - ov = php_http_cookie_object_new_ex(old_obj->o.ce, php_http_cookie_list_copy(old_obj->list, NULL), &new_obj TSRMLS_CC); + PHP_HTTP_COOKIE_OBJECT_INIT(old_obj); + + ov = php_http_cookie_object_new_ex(old_obj->zo.ce, php_http_cookie_list_copy(old_obj->list, NULL), &new_obj TSRMLS_CC); zend_objects_clone_members((zend_object *) new_obj, ov, (zend_object *) old_obj, Z_OBJ_HANDLE_P(getThis()) TSRMLS_CC); return ov; @@ -513,426 +419,602 @@ void php_http_cookie_object_free(void *object TSRMLS_DC) efree(obj); } -PHP_METHOD(HttpCookie, __construct) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpCookie___construct, 0, 0, 0) + ZEND_ARG_INFO(0, cookie_string) + ZEND_ARG_INFO(0, parser_flags) + ZEND_ARG_INFO(0, allowed_extras) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpCookie, __construct) { - with_error_handling(EH_THROW, php_http_exception_class_entry) { - zval *zcookie = NULL; - long flags = 0; - HashTable *allowed_extras = NULL; + php_http_cookie_object_t *obj; + zval *zcookie = NULL; + long flags = 0; + char **ae = NULL; + HashTable *allowed_extras = NULL; + zend_error_handling zeh; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|z!lH", &zcookie, &flags, &allowed_extras)) { - if (zcookie) { - with_error_handling(EH_THROW, php_http_exception_class_entry) { - char **ae = NULL; - php_http_cookie_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|z!lH", &zcookie, &flags, &allowed_extras), invalid_arg, return); - if (allowed_extras && zend_hash_num_elements(allowed_extras)) { - char **ae_ptr = safe_emalloc(zend_hash_num_elements(allowed_extras) + 1, sizeof(char *), 0); - HashPosition pos; - zval **val; + obj = zend_object_store_get_object(getThis() TSRMLS_CC); - ae = ae_ptr; - FOREACH_HASH_VAL(pos, allowed_extras, val) { - zval *cpy = php_http_ztyp(IS_STRING, *val); + zend_replace_error_handling(EH_THROW, php_http_exception_runtime_class_entry, &zeh TSRMLS_CC); + if (zcookie) { - *ae_ptr++ = estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy)); - zval_ptr_dtor(&cpy); - } - *ae_ptr = NULL; - } + if (allowed_extras && zend_hash_num_elements(allowed_extras)) { + char **ae_ptr = safe_emalloc(zend_hash_num_elements(allowed_extras) + 1, sizeof(char *), 0); + HashPosition pos; + zval **val; + + ae = ae_ptr; + FOREACH_HASH_VAL(pos, allowed_extras, val) { + zval *cpy = php_http_ztyp(IS_STRING, *val); - switch (Z_TYPE_P(zcookie)) { - case IS_ARRAY: - case IS_OBJECT: - obj->list = php_http_cookie_list_from_struct(obj->list, zcookie TSRMLS_CC); - break; - default: { - zval *cpy = php_http_ztyp(IS_STRING, zcookie); - - obj->list = php_http_cookie_list_parse(obj->list, Z_STRVAL_P(cpy), flags, ae TSRMLS_CC); - zval_ptr_dtor(&cpy); - break; - } + *ae_ptr++ = estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy)); + zval_ptr_dtor(&cpy); + } + *ae_ptr = NULL; + } + + switch (Z_TYPE_P(zcookie)) { + case IS_OBJECT: + if (instanceof_function(Z_OBJCE_P(zcookie), php_http_cookie_class_entry TSRMLS_CC)) { + php_http_cookie_object_t *zco = zend_object_store_get_object(zcookie TSRMLS_CC); + + if (zco->list) { + obj->list = php_http_cookie_list_copy(zco->list, NULL); } - } end_error_handling(); + break; + } + /* no break */ + case IS_ARRAY: + obj->list = php_http_cookie_list_from_struct(obj->list, zcookie TSRMLS_CC); + break; + default: { + zval *cpy = php_http_ztyp(IS_STRING, zcookie); + + obj->list = php_http_cookie_list_parse(obj->list, Z_STRVAL_P(cpy), Z_STRLEN_P(cpy), flags, ae TSRMLS_CC); + zval_ptr_dtor(&cpy); + break; + } + } + + if (ae) { + char **ae_ptr; + + for (ae_ptr = ae; *ae_ptr; ++ae_ptr) { + efree(*ae_ptr); } + efree(ae); } - } end_error_handling(); + } + zend_restore_error_handling(&zeh TSRMLS_CC); + + PHP_HTTP_COOKIE_OBJECT_INIT(obj); } -PHP_METHOD(HttpCookie, getCookies) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpCookie_getCookies, 0, 0, 0) +ZEND_END_ARG_INFO();; +static PHP_METHOD(HttpCookie, getCookies) { - if (SUCCESS == zend_parse_parameters_none()) { - php_http_cookie_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_cookie_object_t *obj; - if (!obj->list) { - obj->list = php_http_cookie_list_init(NULL TSRMLS_CC); - } - array_init(return_value); - array_copy(&obj->list->cookies, Z_ARRVAL_P(return_value)); + if (SUCCESS != zend_parse_parameters_none()) { return; } - RETURN_FALSE; + + obj = zend_object_store_get_object(getThis() TSRMLS_CC); + + PHP_HTTP_COOKIE_OBJECT_INIT(obj); + + array_init(return_value); + array_copy(&obj->list->cookies, Z_ARRVAL_P(return_value)); } -PHP_METHOD(HttpCookie, setCookies) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpCookie_setCookies, 0, 0, 0) + ZEND_ARG_INFO(0, cookies) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpCookie, setCookies) { HashTable *cookies = NULL; + php_http_cookie_object_t *obj; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|H", &cookies)) { - php_http_cookie_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|H", &cookies), invalid_arg, return); - if (!obj->list) { - obj->list = php_http_cookie_list_init(NULL TSRMLS_CC); - } - zend_hash_clean(&obj->list->cookies); - if (cookies) { - array_copy(cookies, &obj->list->cookies); - } + obj = zend_object_store_get_object(getThis() TSRMLS_CC); + + PHP_HTTP_COOKIE_OBJECT_INIT(obj); + + zend_hash_clean(&obj->list->cookies); + if (cookies) { + array_copy_strings(cookies, &obj->list->cookies); } + RETVAL_ZVAL(getThis(), 1, 0); } -PHP_METHOD(HttpCookie, addCookies) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpCookie_addCookies, 0, 0, 1) + ZEND_ARG_INFO(0, cookies) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpCookie, addCookies) { HashTable *cookies = NULL; + php_http_cookie_object_t *obj; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "H", &cookies)) { - php_http_cookie_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "H", &cookies), invalid_arg, return); + + obj = zend_object_store_get_object(getThis() TSRMLS_CC); + + PHP_HTTP_COOKIE_OBJECT_INIT(obj); + + array_join(cookies, &obj->list->cookies, 1, ARRAY_JOIN_STRONLY|ARRAY_JOIN_STRINGIFY); - if (!obj->list) { - obj->list = php_http_cookie_list_init(NULL TSRMLS_CC); - } - array_join(cookies, &obj->list->cookies, 1, ARRAY_JOIN_STRONLY); - } RETVAL_ZVAL(getThis(), 1, 0); } - -PHP_METHOD(HttpCookie, getExtras) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpCookie_getExtras, 0, 0, 0) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpCookie, getExtras) { - if (SUCCESS == zend_parse_parameters_none()) { - php_http_cookie_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_cookie_object_t *obj; - if (!obj->list) { - obj->list = php_http_cookie_list_init(NULL TSRMLS_CC); - } - array_init(return_value); - array_copy(&obj->list->extras, Z_ARRVAL_P(return_value)); + if (SUCCESS != zend_parse_parameters_none()) { return; } - RETURN_FALSE; + + obj = zend_object_store_get_object(getThis() TSRMLS_CC); + + PHP_HTTP_COOKIE_OBJECT_INIT(obj); + + array_init(return_value); + array_copy(&obj->list->extras, Z_ARRVAL_P(return_value)); } -PHP_METHOD(HttpCookie, setExtras) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpCookie_setExtras, 0, 0, 0) + ZEND_ARG_INFO(0, extras) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpCookie, setExtras) { HashTable *extras = NULL; + php_http_cookie_object_t *obj; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|H", &extras)) { - php_http_cookie_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|H", &extras), invalid_arg, return); - if (!obj->list) { - obj->list = php_http_cookie_list_init(NULL TSRMLS_CC); - } - zend_hash_clean(&obj->list->extras); - if (extras) { - array_copy(extras, &obj->list->extras); - } + obj = zend_object_store_get_object(getThis() TSRMLS_CC); + + PHP_HTTP_COOKIE_OBJECT_INIT(obj); + + zend_hash_clean(&obj->list->extras); + if (extras) { + array_copy_strings(extras, &obj->list->extras); } + RETVAL_ZVAL(getThis(), 1, 0); } -PHP_METHOD(HttpCookie, addExtras) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpCookie_addExtras, 0, 0, 1) + ZEND_ARG_INFO(0, extras) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpCookie, addExtras) { HashTable *extras = NULL; + php_http_cookie_object_t *obj; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "H", &extras)) { - php_http_cookie_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "H", &extras), invalid_arg, return); + + obj = zend_object_store_get_object(getThis() TSRMLS_CC); + + PHP_HTTP_COOKIE_OBJECT_INIT(obj); + + array_join(extras, &obj->list->extras, 1, ARRAY_JOIN_STRONLY|ARRAY_JOIN_STRINGIFY); - if (!obj->list) { - obj->list = php_http_cookie_list_init(NULL TSRMLS_CC); - } - array_join(extras, &obj->list->extras, 1, ARRAY_JOIN_STRONLY); - } RETVAL_ZVAL(getThis(), 1, 0); } -PHP_METHOD(HttpCookie, getCookie) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpCookie_getCookie, 0, 0, 1) + ZEND_ARG_INFO(0, name) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpCookie, getCookie) { char *name_str; int name_len; + zval *zvalue; + php_http_cookie_object_t *obj; + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &name_str, &name_len)) { + return; + } - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &name_str, &name_len)) { - php_http_cookie_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); - zval **zvalue; + obj = zend_object_store_get_object(getThis() TSRMLS_CC); - if (!obj->list) { - obj->list = php_http_cookie_list_init(NULL TSRMLS_CC); - } - if (SUCCESS == zend_hash_find(&obj->list->cookies, name_str, name_len + 1, (void *) &zvalue)) { - RETURN_ZVAL(*zvalue, 1, 0); - } + PHP_HTTP_COOKIE_OBJECT_INIT(obj); + + if (php_http_cookie_list_get_cookie(obj->list, name_str, name_len, &zvalue)) { + RETURN_ZVAL(zvalue, 1, 0); } - RETURN_FALSE; } -PHP_METHOD(HttpCookie, setCookie) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpCookie_setCookie, 0, 0, 1) + ZEND_ARG_INFO(0, cookie_name) + ZEND_ARG_INFO(0, cookie_value) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpCookie, setCookie) { - char *name_str, *value_str; - int name_len, value_len; + char *name_str, *value_str = NULL; + int name_len, value_len = 0; + php_http_cookie_object_t *obj; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|s!", &name_str, &name_len, &value_str, &value_len)) { - php_http_cookie_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|s!", &name_str, &name_len, &value_str, &value_len), invalid_arg, return); - if (!obj->list) { - obj->list = php_http_cookie_list_init(NULL TSRMLS_CC); - } - if (!value_str) { - zend_hash_del(&obj->list->cookies, name_str, name_len + 1); - } else { - zval *zvalue; + obj = zend_object_store_get_object(getThis() TSRMLS_CC); - MAKE_STD_ZVAL(zvalue); - ZVAL_STRINGL(zvalue, value_str, value_len, 1); - zend_hash_update(&obj->list->cookies, name_str, name_len + 1, &zvalue, sizeof(zval *), NULL); - } + PHP_HTTP_COOKIE_OBJECT_INIT(obj); + + if (!value_str) { + php_http_cookie_list_del_cookie(obj->list, name_str, name_len); + } else { + php_http_cookie_list_add_cookie(obj->list, name_str, name_len, value_str, value_len); } + RETVAL_ZVAL(getThis(), 1, 0); } -PHP_METHOD(HttpCookie, addCookie) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpCookie_addCookie, 0, 0, 2) + ZEND_ARG_INFO(0, cookie_name) + ZEND_ARG_INFO(0, cookie_value) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpCookie, addCookie) { char *name_str, *value_str; int name_len, value_len; + php_http_cookie_object_t *obj; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|s", &name_str, &name_len, &value_str, &value_len)) { - php_http_cookie_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); - zval *zvalue; + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &name_str, &name_len, &value_str, &value_len), invalid_arg, return); + + obj = zend_object_store_get_object(getThis() TSRMLS_CC); + + PHP_HTTP_COOKIE_OBJECT_INIT(obj); + + php_http_cookie_list_add_cookie(obj->list, name_str, name_len, value_str, value_len); - if (!obj->list) { - obj->list = php_http_cookie_list_init(NULL TSRMLS_CC); - } - MAKE_STD_ZVAL(zvalue); - ZVAL_STRINGL(zvalue, value_str, value_len, 1); - zend_hash_add(&obj->list->cookies, name_str, name_len + 1, &zvalue, sizeof(zval *), NULL); - } RETVAL_ZVAL(getThis(), 1, 0); } -PHP_METHOD(HttpCookie, getExtra) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpCookie_getExtra, 0, 0, 1) + ZEND_ARG_INFO(0, name) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpCookie, getExtra) { char *name_str; int name_len; + zval *zvalue; + php_http_cookie_object_t *obj; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &name_str, &name_len)) { - php_http_cookie_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); - zval **zvalue; + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &name_str, &name_len)) { + return; + } - if (!obj->list) { - obj->list = php_http_cookie_list_init(NULL TSRMLS_CC); - } - if (SUCCESS == zend_hash_find(&obj->list->extras, name_str, name_len + 1, (void *) &zvalue)) { - RETURN_ZVAL(*zvalue, 1, 0); - } + obj = zend_object_store_get_object(getThis() TSRMLS_CC); + + PHP_HTTP_COOKIE_OBJECT_INIT(obj); + + if (php_http_cookie_list_get_extra(obj->list, name_str, name_len, &zvalue)) { + RETURN_ZVAL(zvalue, 1, 0); } - RETURN_FALSE; } -PHP_METHOD(HttpCookie, setExtra) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpCookie_setExtra, 0, 0, 1) + ZEND_ARG_INFO(0, extra_name) + ZEND_ARG_INFO(0, extra_value) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpCookie, setExtra) { - char *name_str, *value_str; - int name_len, value_len; + char *name_str, *value_str = NULL; + int name_len, value_len = 0; + php_http_cookie_object_t *obj; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|s!", &name_str, &name_len, &value_str, &value_len)) { - php_http_cookie_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|s!", &name_str, &name_len, &value_str, &value_len), invalid_arg, return); - if (!obj->list) { - obj->list = php_http_cookie_list_init(NULL TSRMLS_CC); - } - if (!value_str) { - zend_hash_del(&obj->list->extras, name_str, name_len + 1); - } else { - zval *zvalue; + obj = zend_object_store_get_object(getThis() TSRMLS_CC); - MAKE_STD_ZVAL(zvalue); - ZVAL_STRINGL(zvalue, value_str, value_len, 1); - zend_hash_update(&obj->list->extras, name_str, name_len + 1, &zvalue, sizeof(zval *), NULL); - } + PHP_HTTP_COOKIE_OBJECT_INIT(obj); + + if (!value_str) { + php_http_cookie_list_del_extra(obj->list, name_str, name_len); + } else { + php_http_cookie_list_add_extra(obj->list, name_str, name_len, value_str, value_len); } + RETVAL_ZVAL(getThis(), 1, 0); } -PHP_METHOD(HttpCookie, addExtra) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpCookie_addExtra, 0, 0, 2) + ZEND_ARG_INFO(0, extra_name) + ZEND_ARG_INFO(0, extra_value) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpCookie, addExtra) { char *name_str, *value_str; int name_len, value_len; + php_http_cookie_object_t *obj; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|s", &name_str, &name_len, &value_str, &value_len)) { - php_http_cookie_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); - zval *zvalue; + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &name_str, &name_len, &value_str, &value_len), invalid_arg, return); + + obj = zend_object_store_get_object(getThis() TSRMLS_CC); + + PHP_HTTP_COOKIE_OBJECT_INIT(obj); + + php_http_cookie_list_add_extra(obj->list, name_str, name_len, value_str, value_len); - if (!obj->list) { - obj->list = php_http_cookie_list_init(NULL TSRMLS_CC); - } - MAKE_STD_ZVAL(zvalue); - ZVAL_STRINGL(zvalue, value_str, value_len, 1); - zend_hash_add(&obj->list->extras, name_str, name_len + 1, &zvalue, sizeof(zval *), NULL); - } RETVAL_ZVAL(getThis(), 1, 0); } -PHP_METHOD(HttpCookie, getDomain) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpCookie_getDomain, 0, 0, 0) +ZEND_END_ARG_INFO();; +static PHP_METHOD(HttpCookie, getDomain) { - if (SUCCESS == zend_parse_parameters_none()) { - php_http_cookie_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_cookie_object_t *obj; - if (!obj->list) { - obj->list = php_http_cookie_list_init(NULL TSRMLS_CC); - } - if (obj->list->domain) { - RETURN_STRING(obj->list->domain, 1); - } - RETURN_NULL(); + if (SUCCESS != zend_parse_parameters_none()) { + return; + } + + obj = zend_object_store_get_object(getThis() TSRMLS_CC); + + PHP_HTTP_COOKIE_OBJECT_INIT(obj); + + if (obj->list->domain) { + RETURN_STRING(obj->list->domain, 1); } - RETURN_FALSE; } -PHP_METHOD(HttpCookie, setDomain) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpCookie_setDomain, 0, 0, 0) + ZEND_ARG_INFO(0, value) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpCookie, setDomain) { char *domain_str = NULL; int domain_len = 0; + php_http_cookie_object_t *obj; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!", &domain_str, &domain_len)) { - php_http_cookie_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!", &domain_str, &domain_len), invalid_arg, return); + + obj = zend_object_store_get_object(getThis() TSRMLS_CC); + + PHP_HTTP_COOKIE_OBJECT_INIT(obj); + + STR_SET(obj->list->domain, domain_str ? estrndup(domain_str, domain_len) : NULL); - if (!obj->list) { - obj->list = php_http_cookie_list_init(NULL TSRMLS_CC); - } - STR_SET(obj->list->domain, domain_str ? estrndup(domain_str, domain_len) : NULL); - } RETVAL_ZVAL(getThis(), 1, 0); } -PHP_METHOD(HttpCookie, getPath) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpCookie_getPath, 0, 0, 0) +ZEND_END_ARG_INFO();; +static PHP_METHOD(HttpCookie, getPath) { - if (SUCCESS == zend_parse_parameters_none()) { - php_http_cookie_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_cookie_object_t *obj; - if (!obj->list) { - obj->list = php_http_cookie_list_init(NULL TSRMLS_CC); - } - if (obj->list->path) { - RETURN_STRING(obj->list->path, 1); - } - RETURN_NULL(); + if (SUCCESS != zend_parse_parameters_none()) { + return; + } + + obj = zend_object_store_get_object(getThis() TSRMLS_CC); + + PHP_HTTP_COOKIE_OBJECT_INIT(obj); + + if (obj->list->path) { + RETURN_STRING(obj->list->path, 1); } - RETURN_FALSE; } -PHP_METHOD(HttpCookie, setPath) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpCookie_setPath, 0, 0, 0) + ZEND_ARG_INFO(0, value) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpCookie, setPath) { char *path_str = NULL; int path_len = 0; + php_http_cookie_object_t *obj; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!", &path_str, &path_len)) { - php_http_cookie_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!", &path_str, &path_len), invalid_arg, return); + + obj = zend_object_store_get_object(getThis() TSRMLS_CC); + + PHP_HTTP_COOKIE_OBJECT_INIT(obj); + + STR_SET(obj->list->path, path_str ? estrndup(path_str, path_len) : NULL); - if (!obj->list) { - obj->list = php_http_cookie_list_init(NULL TSRMLS_CC); - } - STR_SET(obj->list->path, path_str ? estrndup(path_str, path_len) : NULL); - } RETVAL_ZVAL(getThis(), 1, 0); } -PHP_METHOD(HttpCookie, getExpires) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpCookie_getExpires, 0, 0, 0) +ZEND_END_ARG_INFO();; +static PHP_METHOD(HttpCookie, getExpires) { - if (SUCCESS == zend_parse_parameters_none()) { - php_http_cookie_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_cookie_object_t *obj; - if (!obj->list) { - obj->list = php_http_cookie_list_init(NULL TSRMLS_CC); - } - RETURN_LONG(obj->list->expires); + if (SUCCESS != zend_parse_parameters_none()) { + return; } - RETURN_FALSE; + + obj = zend_object_store_get_object(getThis() TSRMLS_CC); + + PHP_HTTP_COOKIE_OBJECT_INIT(obj); + + RETURN_LONG(obj->list->expires); } -PHP_METHOD(HttpCookie, setExpires) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpCookie_setExpires, 0, 0, 0) + ZEND_ARG_INFO(0, value) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpCookie, setExpires) { - long ts = 0; + long ts = -1; + php_http_cookie_object_t *obj; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &ts)) { - php_http_cookie_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &ts), invalid_arg, return); - if (!obj->list) { - obj->list = php_http_cookie_list_init(NULL TSRMLS_CC); - } - obj->list->expires = ts; + obj = zend_object_store_get_object(getThis() TSRMLS_CC); + + PHP_HTTP_COOKIE_OBJECT_INIT(obj); + + obj->list->expires = ts; + + RETVAL_ZVAL(getThis(), 1, 0); +} + +ZEND_BEGIN_ARG_INFO_EX(ai_HttpCookie_getMaxAge, 0, 0, 0) +ZEND_END_ARG_INFO();; +static PHP_METHOD(HttpCookie, getMaxAge) +{ + php_http_cookie_object_t *obj; + + if (SUCCESS != zend_parse_parameters_none()) { + return; } + + obj = zend_object_store_get_object(getThis() TSRMLS_CC); + + PHP_HTTP_COOKIE_OBJECT_INIT(obj); + + RETURN_LONG(obj->list->max_age); +} + +ZEND_BEGIN_ARG_INFO_EX(ai_HttpCookie_setMaxAge, 0, 0, 0) + ZEND_ARG_INFO(0, value) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpCookie, setMaxAge) +{ + long ts = -1; + php_http_cookie_object_t *obj; + + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &ts), invalid_arg, return); + + obj = zend_object_store_get_object(getThis() TSRMLS_CC); + + PHP_HTTP_COOKIE_OBJECT_INIT(obj); + + obj->list->max_age = ts; + RETVAL_ZVAL(getThis(), 1, 0); } -PHP_METHOD(HttpCookie, getFlags) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpCookie_getFlags, 0, 0, 0) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpCookie, getFlags) { - if (SUCCESS == zend_parse_parameters_none()) { - php_http_cookie_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_cookie_object_t *obj; - if (!obj->list) { - obj->list = php_http_cookie_list_init(NULL TSRMLS_CC); - } - RETURN_LONG(obj->list->flags); + if (SUCCESS != zend_parse_parameters_none()) { + return; } - RETURN_FALSE; + + obj = zend_object_store_get_object(getThis() TSRMLS_CC); + + PHP_HTTP_COOKIE_OBJECT_INIT(obj); + + RETURN_LONG(obj->list->flags); } -PHP_METHOD(HttpCookie, setFlags) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpCookie_setFlags, 0, 0, 0) + ZEND_ARG_INFO(0, value) +ZEND_END_ARG_INFO(); +static PHP_METHOD(HttpCookie, setFlags) { long flags = 0; + php_http_cookie_object_t *obj; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &flags)) { - php_http_cookie_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &flags), invalid_arg, return); + + obj = zend_object_store_get_object(getThis() TSRMLS_CC); + + PHP_HTTP_COOKIE_OBJECT_INIT(obj); + + obj->list->flags = flags; - if (!obj->list) { - obj->list = php_http_cookie_list_init(NULL TSRMLS_CC); - } - obj->list->flags = flags; - } RETVAL_ZVAL(getThis(), 1, 0); } -PHP_METHOD(HttpCookie, toString) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpCookie_toString, 0, 0, 0) +ZEND_END_ARG_INFO();; +static PHP_METHOD(HttpCookie, toString) { - if (SUCCESS == zend_parse_parameters_none()) { - php_http_cookie_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); - char *str; - size_t len; + php_http_cookie_object_t *obj; + char *str; + size_t len; - if (!obj->list) { - obj->list = php_http_cookie_list_init(NULL TSRMLS_CC); - } - php_http_cookie_list_to_string(obj->list, &str, &len); - RETURN_STRINGL(str, len, 0); + if (SUCCESS != zend_parse_parameters_none()) { + RETURN_EMPTY_STRING(); } - RETURN_EMPTY_STRING(); + + obj = zend_object_store_get_object(getThis() TSRMLS_CC); + + PHP_HTTP_COOKIE_OBJECT_INIT(obj); + + php_http_cookie_list_to_string(obj->list, &str, &len); + + RETURN_STRINGL(str, len, 0); } -PHP_METHOD(HttpCookie, toArray) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpCookie_toArray, 0, 0, 0) +ZEND_END_ARG_INFO();; +static PHP_METHOD(HttpCookie, toArray) { - if (SUCCESS == zend_parse_parameters_none()) { - php_http_cookie_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_cookie_object_t *obj; - if (!obj->list) { - obj->list = php_http_cookie_list_init(NULL TSRMLS_CC); - } - array_init(return_value); - php_http_cookie_list_to_struct(obj->list, return_value); + if (SUCCESS != zend_parse_parameters_none()) { + return; } + + obj = zend_object_store_get_object(getThis() TSRMLS_CC); + + PHP_HTTP_COOKIE_OBJECT_INIT(obj); + + array_init(return_value); + php_http_cookie_list_to_struct(obj->list, return_value); } +static zend_function_entry php_http_cookie_methods[] = { + PHP_ME(HttpCookie, __construct, ai_HttpCookie___construct, ZEND_ACC_PUBLIC) + PHP_ME(HttpCookie, getCookies, ai_HttpCookie_getCookies, ZEND_ACC_PUBLIC) + PHP_ME(HttpCookie, setCookies, ai_HttpCookie_setCookies, ZEND_ACC_PUBLIC) + PHP_ME(HttpCookie, addCookies, ai_HttpCookie_addCookies, ZEND_ACC_PUBLIC) + PHP_ME(HttpCookie, getCookie, ai_HttpCookie_getCookie, ZEND_ACC_PUBLIC) + PHP_ME(HttpCookie, setCookie, ai_HttpCookie_setCookie, ZEND_ACC_PUBLIC) + PHP_ME(HttpCookie, addCookie, ai_HttpCookie_addCookie, ZEND_ACC_PUBLIC) + + PHP_ME(HttpCookie, getExtras, ai_HttpCookie_getExtras, ZEND_ACC_PUBLIC) + PHP_ME(HttpCookie, setExtras, ai_HttpCookie_setExtras, ZEND_ACC_PUBLIC) + PHP_ME(HttpCookie, addExtras, ai_HttpCookie_addExtras, ZEND_ACC_PUBLIC) + PHP_ME(HttpCookie, getExtra, ai_HttpCookie_getExtra, ZEND_ACC_PUBLIC) + PHP_ME(HttpCookie, setExtra, ai_HttpCookie_setExtra, ZEND_ACC_PUBLIC) + PHP_ME(HttpCookie, addExtra, ai_HttpCookie_addExtra, ZEND_ACC_PUBLIC) + + PHP_ME(HttpCookie, getDomain, ai_HttpCookie_getDomain, ZEND_ACC_PUBLIC) + PHP_ME(HttpCookie, setDomain, ai_HttpCookie_setDomain, ZEND_ACC_PUBLIC) + PHP_ME(HttpCookie, getPath, ai_HttpCookie_getPath, ZEND_ACC_PUBLIC) + PHP_ME(HttpCookie, setPath, ai_HttpCookie_setPath, ZEND_ACC_PUBLIC) + PHP_ME(HttpCookie, getExpires, ai_HttpCookie_getExpires, ZEND_ACC_PUBLIC) + PHP_ME(HttpCookie, setExpires, ai_HttpCookie_setExpires, ZEND_ACC_PUBLIC) + PHP_ME(HttpCookie, getMaxAge, ai_HttpCookie_getMaxAge, ZEND_ACC_PUBLIC) + PHP_ME(HttpCookie, setMaxAge, ai_HttpCookie_setMaxAge, ZEND_ACC_PUBLIC) + PHP_ME(HttpCookie, getFlags, ai_HttpCookie_getFlags, ZEND_ACC_PUBLIC) + PHP_ME(HttpCookie, setFlags, ai_HttpCookie_setFlags, ZEND_ACC_PUBLIC) + + PHP_ME(HttpCookie, toArray, ai_HttpCookie_toArray, ZEND_ACC_PUBLIC) + PHP_ME(HttpCookie, toString, ai_HttpCookie_toString, ZEND_ACC_PUBLIC) + ZEND_MALIAS(HttpCookie, __toString, toString, ai_HttpCookie_toString, ZEND_ACC_PUBLIC) + + EMPTY_FUNCTION_ENTRY +}; + +zend_class_entry *php_http_cookie_class_entry; + PHP_MINIT_FUNCTION(http_cookie) { - PHP_HTTP_REGISTER_CLASS(http, Cookie, http_cookie, php_http_object_class_entry, 0); + zend_class_entry ce = {0}; + + INIT_NS_CLASS_ENTRY(ce, "http", "Cookie", php_http_cookie_methods); + php_http_cookie_class_entry = zend_register_internal_class(&ce TSRMLS_CC); php_http_cookie_class_entry->create_object = php_http_cookie_object_new; memcpy(&php_http_cookie_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); php_http_cookie_object_handlers.clone_obj = php_http_cookie_object_clone;