| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-2011, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-2014, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
#include "php_http_api.h"
-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)
{
if (!list) {
list = emalloc(sizeof(*list));
list->path = NULL;
list->domain = NULL;
- list->expires = 0;
+ list->expires = -1;
+ list->max_age = -1;
list->flags = 0;
- TSRMLS_SET_CTX(list->ts);
-
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);
-
- to = php_http_cookie_list_init(to TSRMLS_CC);
+ to = php_http_cookie_list_init(to);
array_copy(&from->cookies, &to->cookies);
array_copy(&from->extras, &to->extras);
- STR_SET(to->path, from->path ? estrdup(from->path) : NULL);
- STR_SET(to->domain, from->domain ? estrdup(from->domain) : NULL);
+ PTR_SET(to->path, from->path ? estrdup(from->path) : NULL);
+ PTR_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);
zend_hash_destroy(&list->extras);
- STR_SET(list->path, NULL);
- STR_SET(list->domain, NULL);
+ PTR_SET(list->path, NULL);
+ PTR_SET(list->domain, NULL);
}
}
-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);
}
}
-
-
-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_symtable_find(&list->cookies, name, name_len + 1, (void *) &cookie)) || (Z_TYPE_PP(cookie) != IS_STRING)) {
+ zval *cookie = zend_symtable_str_find(&list->cookies, name, name_len);
+
+ if (!cookie || (Z_TYPE_P(cookie) != IS_STRING)) {
return NULL;
}
- return Z_STRVAL_PP(cookie);
+ if (zcookie) {
+ *zcookie = *cookie;
+ }
+ return Z_STRVAL_P(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_symtable_find(&list->extras, name, name_len + 1, (void *) &extra)) || (Z_TYPE_PP(extra) != IS_STRING)) {
+ zval *extra = zend_symtable_str_find(&list->extras, name, name_len);
+
+ if (!extra || (Z_TYPE_P(extra) != IS_STRING)) {
return NULL;
}
- return Z_STRVAL_PP(extra);
+ if (zextra) {
+ *zextra = *extra;
+ }
+ return Z_STRVAL_P(extra);
}
+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;
+ ZVAL_STRINGL(&cookie_value, value, value_len);
+ zend_symtable_str_update(&list->cookies, name, name_len, &cookie_value);
+}
-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_extra(php_http_cookie_list_t *list, const char *name, size_t name_len, const char *value, size_t value_len)
{
- zval *cookie_value;
+ zval extra_value;
- MAKE_STD_ZVAL(cookie_value);
- ZVAL_STRINGL(cookie_value, estrndup(value, value_len), value_len, 0);
- zend_symtable_update(&list->cookies, name, name_len + 1, (void *) &cookie_value, sizeof(zval *), NULL);
+ ZVAL_STRINGL(&extra_value, value, value_len);
+ zend_symtable_str_update(&list->extras, name, name_len, &extra_value);
}
+#define _KEY_IS(s) (key->key && key->key->len == sizeof(s)-1 && !strncasecmp(key->key->val, (s), key->key->len))
+static void add_entry(php_http_cookie_list_t *list, char **allowed_extras, long flags, zend_hash_key *key, zval *val)
+{
+ zval arg;
+ ZVAL_DUP(&arg, val);
+ convert_to_string(&arg);
-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)
-{
- zval *cookie_value;
+ if (!(flags & PHP_HTTP_COOKIE_PARSE_RAW)) {
+ Z_STRLEN(arg) = php_raw_url_decode(Z_STRVAL(arg), Z_STRLEN(arg));
+ zend_string_forget_hash_val(Z_STR(arg));
+ }
- MAKE_STD_ZVAL(cookie_value);
- ZVAL_STRINGL(cookie_value, estrndup(value, value_len), value_len, 0);
- zend_symtable_update(&list->extras, name, name_len + 1, (void *) &cookie_value, sizeof(zval *), NULL);
+ if _KEY_IS("path") {
+ PTR_SET(list->path, estrndup(Z_STRVAL(arg), Z_STRLEN(arg)));
+ } else if _KEY_IS("domain") {
+ PTR_SET(list->domain, estrndup(Z_STRVAL(arg), Z_STRLEN(arg)));
+ } else if _KEY_IS("expires") {
+ char *date = estrndup(Z_STRVAL(arg), Z_STRLEN(arg));
+ list->expires = php_parse_date(date, NULL);
+ efree(date);
+ } else if _KEY_IS("max-age") {
+ list->max_age = zval_get_long(val);
+ } else if _KEY_IS("secure") {
+ list->flags |= PHP_HTTP_COOKIE_SECURE;
+ } else if _KEY_IS("httpOnly") {
+ list->flags |= PHP_HTTP_COOKIE_HTTPONLY;
+ } else {
+ php_http_arrkey_t tmp = {0};
+
+ php_http_arrkey_stringify(&tmp, key);
+
+ /* check for extra */
+ if (allowed_extras) {
+ char **ae = allowed_extras;
+ for (; *ae; ++ae) {
+ if (!strncasecmp(*ae, tmp.key->val, tmp.key->len)) {
+ zend_symtable_update(&list->extras, tmp.key, &arg);
+ php_http_arrkey_dtor(&tmp);
+ return;
+ }
+ }
+ }
+
+ /* cookie */
+ zend_symtable_update(&list->cookies, tmp.key, &arg);
+
+ php_http_arrkey_dtor(&tmp);
+ return;
+ }
+
+ zval_ptr_dtor(&arg);
}
-PHP_HTTP_API 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_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)
{
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;
+ zend_hash_key k, arg_k;
+ 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);
+ php_http_params_parse(¶ms, &opts);
efree(opts.input.str);
- list = php_http_cookie_list_init(list TSRMLS_CC);
- 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)) {
- Z_ADDREF_PP(val);
- if (key.type == HASH_KEY_IS_STRING) {
- zend_hash_update(&list->cookies, key.str, key.len, (void *) val, sizeof(zval *), NULL);
- } else {
- zend_hash_index_update(&list->cookies, key.num, (void *) val, sizeof(zval *), NULL);
- }
+ list = php_http_cookie_list_init(list);
+ ZEND_HASH_FOREACH_KEY_VAL(¶ms, k.h, k.key, param)
+ {
+ if (Z_TYPE_P(param) == IS_ARRAY) {
+ if ((val = zend_hash_str_find(Z_ARRVAL_P(param), ZEND_STRL("value")))) {
+ add_entry(list, NULL, flags, &k, 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) {
- if (key.type == HASH_KEY_IS_STRING) {
- zval *tmp = php_http_ztyp(IS_STRING, *arg);
- char *arg_str = Z_STRVAL_P(tmp);
- size_t arg_len = Z_STRLEN_P(tmp);
-#define _KEY_IS(s) (key.len == sizeof(s) && !strncasecmp(key.str, (s), key.len))
- if _KEY_IS("path") {
- STR_SET(list->path, estrndup(arg_str, arg_len));
- } else if _KEY_IS("domain") {
- STR_SET(list->domain, estrndup(arg_str, arg_len));
- } else if _KEY_IS("expires") {
- char *date = estrndup(arg_str, arg_len);
- list->expires = php_parse_date(date, NULL);
- efree(date);
- } else if _KEY_IS("secure") {
- list->flags |= PHP_HTTP_COOKIE_SECURE;
- } else if _KEY_IS("httpOnly") {
- list->flags |= PHP_HTTP_COOKIE_HTTPONLY;
- } else {
- /* check for extra */
- if (allowed_extras) {
- char **ae = allowed_extras;
-
- for (; *ae; ++ae) {
- if (!strncasecmp(key.str, *ae, key.len)) {
- if (flags & PHP_HTTP_COOKIE_PARSE_RAW) {
- php_http_cookie_list_add_extra(list, key.str, key.len, arg_str, arg_len);
- } else {
- char *dec = estrndup(arg_str, arg_len);
- int declen = php_url_decode(dec, arg_len);
-
- php_http_cookie_list_add_extra(list, key.str, key.len, dec, declen);
- efree(dec);
- }
- continue;
- }
- }
- }
- /* new cookie */
- if (flags & PHP_HTTP_COOKIE_PARSE_RAW) {
- php_http_cookie_list_add_cookie(list, key.str, key.len, arg_str, arg_len);
- } else {
- char *dec = estrndup(arg_str, arg_len);
- int declen = php_url_decode(dec, arg_len);
-
- php_http_cookie_list_add_cookie(list, key.str, key.len, dec, declen);
- efree(dec);
- }
- }
- zval_ptr_dtor(&tmp);
- }
+ if ((args = zend_hash_str_find(Z_ARRVAL_P(param), ZEND_STRL("arguments"))) && Z_TYPE_P(args) == IS_ARRAY) {
+ ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(args), arg_k.h, arg_k.key, arg)
+ {
+ add_entry(list, allowed_extras, flags, &arg_k, arg);
}
+ ZEND_HASH_FOREACH_END();
}
}
}
+ ZEND_HASH_FOREACH_END();
+
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);
-
- INIT_PZVAL_ARRAY(&array, HASH_OF(strct));
+ zval cookies, extras, tmp;
+ HashTable *ht = HASH_OF(strct);
- MAKE_STD_ZVAL(cookies);
- array_init(cookies);
- zend_hash_copy(Z_ARRVAL_P(cookies), &list->cookies, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
- add_assoc_zval(&array, "cookies", cookies);
+ array_init_size(&cookies, zend_hash_num_elements(&list->cookies));
+ array_copy(&list->cookies, Z_ARRVAL(cookies));
+ zend_symtable_str_update(ht, ZEND_STRL("cookies"), &cookies);
- MAKE_STD_ZVAL(extras);
- array_init(extras);
- zend_hash_copy(Z_ARRVAL_P(extras), &list->extras, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
- add_assoc_zval(&array, "extras", extras);
+ array_init_size(&extras, zend_hash_num_elements(&list->extras));
+ array_copy(&list->extras, Z_ARRVAL(extras));
+ zend_symtable_str_update(ht, ZEND_STRL("extras"), &extras);
- add_assoc_long(&array, "flags", list->flags);
- add_assoc_long(&array, "expires", (long) list->expires);
- add_assoc_string(&array, "path", STR_PTR(list->path), 1);
- add_assoc_string(&array, "domain", STR_PTR(list->domain), 1);
+ ZVAL_LONG(&tmp, list->flags);
+ zend_symtable_str_update(ht, ZEND_STRL("flags"), &tmp);
+ ZVAL_LONG(&tmp, list->expires);
+ zend_symtable_str_update(ht, ZEND_STRL("expires"), &tmp);
+ ZVAL_LONG(&tmp, list->max_age);
+ zend_symtable_str_update(ht, ZEND_STRL("max-age"), &tmp);
+ ZVAL_STRING(&tmp, STR_PTR(list->path));
+ zend_symtable_str_update(ht, ZEND_STRL("path"), &tmp);
+ ZVAL_STRING(&tmp, STR_PTR(list->domain));
+ zend_symtable_str_update(ht, ZEND_STRL("domain"), &tmp);
}
-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)
{
- zval **tmp, *cpy;
- HashTable *ht = HASH_OF(strct);
-
- list = php_http_cookie_list_init(list TSRMLS_CC);
-
- if (SUCCESS == zend_hash_find(ht, "cookies", sizeof("cookies"), (void *) &tmp) && Z_TYPE_PP(tmp) == IS_ARRAY) {
- zend_hash_copy(&list->cookies, Z_ARRVAL_PP(tmp), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
+ zval *tmp;
+ HashTable *ht;
+
+ ht = HASH_OF(strct);
+ list = php_http_cookie_list_init(list);
+
+ if ((tmp = zend_hash_str_find_ind(ht, ZEND_STRL("cookies"))) && Z_TYPE_P(tmp) == IS_ARRAY){
+ array_copy(Z_ARRVAL_P(tmp), &list->cookies);
}
- if (SUCCESS == zend_hash_find(ht, "extras", sizeof("extras"), (void *) &tmp) && Z_TYPE_PP(tmp) == IS_ARRAY) {
- zend_hash_copy(&list->extras, Z_ARRVAL_PP(tmp), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
+ if ((tmp = zend_hash_str_find_ind(ht, ZEND_STRL("extras"))) && Z_TYPE_P(tmp) == IS_ARRAY){
+ array_copy(Z_ARRVAL_P(tmp), &list->extras);
}
- 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;
+ if ((tmp = zend_hash_str_find_ind(ht, ZEND_STRL("flags")))) {
+ list->flags = zval_get_long(tmp);
+ }
+ if ((tmp = zend_hash_str_find_ind(ht, ZEND_STRL("expires")))) {
+ if (Z_TYPE_P(tmp) == IS_LONG) {
+ list->expires = Z_LVAL_P(tmp);
+ } else {
+ zend_long lval;
+ zend_string *lstr = zval_get_string(tmp);
+
+ if (IS_LONG == is_numeric_string(lstr->val, lstr->len, &lval, NULL, 0)) {
+ list->expires = lval;
+ } else {
+ list->expires = php_parse_date(lstr->val, NULL);
+ }
+
+ zend_string_release(lstr);
}
}
- 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 ((tmp = zend_hash_str_find_ind(ht, ZEND_STRL("max-age")))) {
+ if (Z_TYPE_P(tmp) == IS_LONG) {
+ list->max_age = Z_LVAL_P(tmp);
+ } else {
+ zend_long lval;
+ zend_string *lstr = zval_get_string(tmp);
+
+ if (IS_LONG == is_numeric_string(lstr->val, lstr->len, &lval, NULL, 0)) {
+ list->max_age = lval;
+ }
+
+ zend_string_release(lstr);
}
}
- if (SUCCESS == zend_hash_find(ht, "path", sizeof("path"), (void *) &tmp) && Z_TYPE_PP(tmp) == IS_STRING) {
- list->path = estrndup(Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp));
+ if ((tmp = zend_hash_str_find_ind(ht, ZEND_STRL("path")))) {
+ zend_string *str = zval_get_string(tmp);
+
+ list->path = estrndup(str->val, str->len);
+ zend_string_release(str);
}
- if (SUCCESS == zend_hash_find(ht, "domain", sizeof("domain"), (void *) &tmp) && Z_TYPE_PP(tmp) == IS_STRING) {
- list->domain = estrndup(Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp));
+ if ((tmp = zend_hash_str_find_ind(ht, ZEND_STRL("domain")))) {
+ zend_string *str = zval_get_string(tmp);
+
+ list->domain = estrndup(str->val, str->len);
+ zend_string_release(str);
}
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];
+ zend_string *enc_str[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_str[1] = php_raw_url_encode(val, val_len);
- php_http_buffer_append(buf, enc_str[0], enc_len[0]);
+ php_http_buffer_append(buf, enc_str[0]->val, enc_str[0]->len);
php_http_buffer_appends(buf, "=");
- php_http_buffer_append(buf, enc_str[1], enc_len[1]);
+ php_http_buffer_append(buf, enc_str[1]->val, enc_str[1]->len);
php_http_buffer_appends(buf, "; ");
- efree(enc_str[0]);
- efree(enc_str[1]);
+ zend_string_release(enc_str[0]);
+ zend_string_release(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;
- php_http_array_hashkey_t key = php_http_array_hashkey_init(0);
- HashPosition pos;
- TSRMLS_FETCH_FROM_CTX(list->ts);
+ zend_hash_key key;
+ zval *val;
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);
- }
+
+ ZEND_HASH_FOREACH_KEY_VAL(&list->cookies, key.h, key.key, val)
+ {
+ zend_string *str = zval_get_string(val);
+ php_http_arrkey_t arrkey = {0};
+
+ php_http_arrkey_stringify(&arrkey, &key);
+ append_encoded(&buf, arrkey.key->val, arrkey.key->len, str->val, str->len);
+ php_http_arrkey_dtor(&arrkey);
+ zend_string_release(str);
}
+ ZEND_HASH_FOREACH_END();
if (list->domain && *list->domain) {
php_http_buffer_appendf(&buf, "domain=%s; ", list->domain);
if (list->path && *list->path) {
php_http_buffer_appendf(&buf, "path=%s; ", list->path);
}
- if (list->expires) {
- 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->expires >= 0) {
+ zend_string *date = php_format_date(ZEND_STRL(PHP_HTTP_DATE_FORMAT), list->expires, 0);
+ php_http_buffer_appendf(&buf, "expires=%s; ", date->val);
+ zend_string_release(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);
- }
+ ZEND_HASH_FOREACH_KEY_VAL(&list->extras, key.h, key.key, val)
+ {
+ zend_string *str = zval_get_string(val);
+ php_http_arrkey_t arrkey;
+
+ php_http_arrkey_stringify(&arrkey, &key);
+ append_encoded(&buf, arrkey.key->val, arrkey.key->len, str->val, str->len);
+ php_http_arrkey_dtor(&arrkey);
+ zend_string_release(str);
}
+ ZEND_HASH_FOREACH_END();
if (list->flags & PHP_HTTP_COOKIE_SECURE) {
php_http_buffer_appends(&buf, "secure; ");
}
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)
+zend_object *php_http_cookie_object_new(zend_class_entry *ce)
{
- return php_http_cookie_object_new_ex(ce, NULL, NULL TSRMLS_CC);
+ return &php_http_cookie_object_new_ex(ce, NULL)->zo;
}
-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)
+php_http_cookie_object_t *php_http_cookie_object_new_ex(zend_class_entry *ce, php_http_cookie_list_t *list)
{
- zend_object_value ov;
php_http_cookie_object_t *o;
- o = ecalloc(sizeof(*o), 1);
- zend_object_std_init((zend_object *) o, ce TSRMLS_CC);
- object_properties_init((zend_object *) o, ce);
+ if (!ce) {
+ ce = php_http_cookie_class_entry;
+ }
+
+ o = ecalloc(1, sizeof(*o) + zend_object_properties_size(ce));
+ zend_object_std_init(&o->zo, ce);
+ object_properties_init(&o->zo, ce);
+ o->zo.handlers = &php_http_cookie_object_handlers;
if (list) {
o->list = list;
}
- if (ptr) {
- *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;
-
- return ov;
+ return o;
}
-zend_object_value php_http_cookie_object_clone(zval *this_ptr TSRMLS_DC)
+#define PHP_HTTP_COOKIE_OBJECT_INIT(obj) \
+ do { \
+ if (!obj->list) { \
+ obj->list = php_http_cookie_list_init(NULL); \
+ } \
+ } while(0)
+
+zend_object *php_http_cookie_object_clone(zval *obj)
{
- php_http_cookie_object_t *new_obj, *old_obj = zend_object_store_get_object(getThis() TSRMLS_CC);
- zend_object_value ov;
+ php_http_cookie_object_t *new_obj, *old_obj = PHP_HTTP_OBJ(NULL, obj);
- 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);
- zend_objects_clone_members((zend_object *) new_obj, ov, (zend_object *) old_obj, Z_OBJ_HANDLE_P(getThis()) TSRMLS_CC);
+ PHP_HTTP_COOKIE_OBJECT_INIT(old_obj);
+
+ new_obj = php_http_cookie_object_new_ex(old_obj->zo.ce, php_http_cookie_list_copy(old_obj->list, NULL));
+ zend_objects_clone_members(&new_obj->zo, &old_obj->zo);
- return ov;
+ return &new_obj->zo;
}
-void php_http_cookie_object_free(void *object TSRMLS_DC)
+void php_http_cookie_object_free(zend_object *object TSRMLS_DC)
{
- php_http_cookie_object_t *obj = object;
+ php_http_cookie_object_t *obj = PHP_HTTP_OBJ(object, NULL);
php_http_cookie_list_free(&obj->list);
- zend_object_std_dtor((zend_object *) obj TSRMLS_CC);
- efree(obj);
+ zend_object_std_dtor(object);
}
-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(), "|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 = PHP_HTTP_OBJ(NULL, getThis());
- 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);
+ 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);
+ zval *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), Z_STRLEN_P(cpy), flags, ae TSRMLS_CC);
- zval_ptr_dtor(&cpy);
- break;
- }
+ ae = ae_ptr;
+ ZEND_HASH_FOREACH_VAL(allowed_extras, val)
+ {
+ zend_string *str = zval_get_string(val);
+
+ *ae_ptr++ = estrndup(str->val, str->len);
+ zend_string_release(str);
+ }
+ ZEND_HASH_FOREACH_END();
+ *ae_ptr = NULL;
+ }
+
+ switch (Z_TYPE_P(zcookie)) {
+ case IS_OBJECT:
+ if (instanceof_function(Z_OBJCE_P(zcookie), php_http_cookie_class_entry)) {
+ php_http_cookie_object_t *zco = PHP_HTTP_OBJ(NULL, zcookie);
+
+ 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);
+ break;
+ default: {
+ zend_string *str = zval_get_string(zcookie);
+
+ obj->list = php_http_cookie_list_parse(obj->list, str->val, str->len, flags, ae);
+ zend_string_release(str);
+ 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);
+
+ 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 = PHP_HTTP_OBJ(NULL, getThis());
+
+ PHP_HTTP_COOKIE_OBJECT_INIT(obj);
+
+ array_init_size(return_value, zend_hash_num_elements(&obj->list->cookies));
+ 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(), "|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 = PHP_HTTP_OBJ(NULL, getThis());
+
+ 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);
+
+ RETURN_ZVAL_FAST(getThis());
}
-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(), "H", &cookies), invalid_arg, return);
- 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);
-}
+ obj = PHP_HTTP_OBJ(NULL, getThis());
+
+ PHP_HTTP_COOKIE_OBJECT_INIT(obj);
+
+ array_join(cookies, &obj->list->cookies, 1, ARRAY_JOIN_STRONLY|ARRAY_JOIN_STRINGIFY);
+ RETVAL_ZVAL_FAST(getThis());
+}
-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 = PHP_HTTP_OBJ(NULL, getThis());
+
+ PHP_HTTP_COOKIE_OBJECT_INIT(obj);
+
+ array_init_size(return_value, zend_hash_num_elements(&obj->list->extras));
+ 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(), "|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 = PHP_HTTP_OBJ(NULL, getThis());
+
+ 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);
+
+ RETVAL_ZVAL_FAST(getThis());
}
-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(), "H", &extras), invalid_arg, return);
- 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);
+ obj = PHP_HTTP_OBJ(NULL, getThis());
+
+ PHP_HTTP_COOKIE_OBJECT_INIT(obj);
+
+ array_join(extras, &obj->list->extras, 1, ARRAY_JOIN_STRONLY|ARRAY_JOIN_STRINGIFY);
+
+ RETVAL_ZVAL_FAST(getThis());
}
-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;
+ size_t 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(), "s", &name_str, &name_len)) {
+ return;
+ }
- if (!obj->list) {
- obj->list = php_http_cookie_list_init(NULL TSRMLS_CC);
- }
- if (SUCCESS == zend_symtable_find(&obj->list->cookies, name_str, name_len + 1, (void *) &zvalue)) {
- RETURN_ZVAL(*zvalue, 1, 0);
- }
+ obj = PHP_HTTP_OBJ(NULL, getThis());
+
+ PHP_HTTP_COOKIE_OBJECT_INIT(obj);
+
+ if (php_http_cookie_list_get_cookie(obj->list, name_str, name_len, &zvalue)) {
+ RETURN_ZVAL_FAST(&zvalue);
}
- 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;
+ size_t 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(), "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_symtable_del(&obj->list->cookies, name_str, name_len + 1);
- } else {
- zval *zvalue;
+ obj = PHP_HTTP_OBJ(NULL, getThis());
- MAKE_STD_ZVAL(zvalue);
- ZVAL_STRINGL(zvalue, value_str, value_len, 1);
- zend_symtable_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);
+
+ RETVAL_ZVAL_FAST(getThis());
}
-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;
+ size_t 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(), "ss", &name_str, &name_len, &value_str, &value_len), invalid_arg, return);
- 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_symtable_update(&obj->list->cookies, name_str, name_len + 1, &zvalue, sizeof(zval *), NULL);
- }
- RETVAL_ZVAL(getThis(), 1, 0);
+ obj = PHP_HTTP_OBJ(NULL, getThis());
+
+ PHP_HTTP_COOKIE_OBJECT_INIT(obj);
+
+ php_http_cookie_list_add_cookie(obj->list, name_str, name_len, value_str, value_len);
+
+ RETVAL_ZVAL_FAST(getThis());
}
-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;
+ size_t 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(), "s", &name_str, &name_len)) {
+ return;
+ }
- if (!obj->list) {
- obj->list = php_http_cookie_list_init(NULL TSRMLS_CC);
- }
- if (SUCCESS == zend_symtable_find(&obj->list->extras, name_str, name_len + 1, (void *) &zvalue)) {
- RETURN_ZVAL(*zvalue, 1, 0);
- }
+ obj = PHP_HTTP_OBJ(NULL, getThis());
+
+ PHP_HTTP_COOKIE_OBJECT_INIT(obj);
+
+ if (php_http_cookie_list_get_extra(obj->list, name_str, name_len, &zvalue)) {
+ RETURN_ZVAL_FAST(&zvalue);
}
- 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;
+ size_t 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(), "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_symtable_del(&obj->list->extras, name_str, name_len + 1);
- } else {
- zval *zvalue;
+ obj = PHP_HTTP_OBJ(NULL, getThis());
- MAKE_STD_ZVAL(zvalue);
- ZVAL_STRINGL(zvalue, value_str, value_len, 1);
- zend_symtable_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);
+
+ RETVAL_ZVAL_FAST(getThis());
}
-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;
+ size_t 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(), "ss", &name_str, &name_len, &value_str, &value_len), invalid_arg, return);
- 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_symtable_update(&obj->list->extras, name_str, name_len + 1, &zvalue, sizeof(zval *), NULL);
- }
- RETVAL_ZVAL(getThis(), 1, 0);
+ obj = PHP_HTTP_OBJ(NULL, getThis());
+
+ PHP_HTTP_COOKIE_OBJECT_INIT(obj);
+
+ php_http_cookie_list_add_extra(obj->list, name_str, name_len, value_str, value_len);
+
+ RETVAL_ZVAL_FAST(getThis());
}
-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 = PHP_HTTP_OBJ(NULL, getThis());
+
+ PHP_HTTP_COOKIE_OBJECT_INIT(obj);
+
+ if (obj->list->domain) {
+ RETURN_STRING(obj->list->domain);
}
- 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;
+ size_t 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(), "|s!", &domain_str, &domain_len), invalid_arg, return);
- 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);
+ obj = PHP_HTTP_OBJ(NULL, getThis());
+
+ PHP_HTTP_COOKIE_OBJECT_INIT(obj);
+
+ PTR_SET(obj->list->domain, domain_str ? estrndup(domain_str, domain_len) : NULL);
+
+ RETVAL_ZVAL_FAST(getThis());
}
-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 = PHP_HTTP_OBJ(NULL, getThis());
+
+ PHP_HTTP_COOKIE_OBJECT_INIT(obj);
+
+ if (obj->list->path) {
+ RETURN_STRING(obj->list->path);
}
- 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;
+ size_t 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(), "|s!", &path_str, &path_len), invalid_arg, return);
- 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);
+ obj = PHP_HTTP_OBJ(NULL, getThis());
+
+ PHP_HTTP_COOKIE_OBJECT_INIT(obj);
+
+ PTR_SET(obj->list->path, path_str ? estrndup(path_str, path_len) : NULL);
+
+ RETVAL_ZVAL_FAST(getThis());
}
-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 = PHP_HTTP_OBJ(NULL, getThis());
+
+ 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(), "|l", &ts), invalid_arg, return);
- if (!obj->list) {
- obj->list = php_http_cookie_list_init(NULL TSRMLS_CC);
- }
- obj->list->expires = ts;
+ obj = PHP_HTTP_OBJ(NULL, getThis());
+
+ PHP_HTTP_COOKIE_OBJECT_INIT(obj);
+
+ obj->list->expires = ts;
+
+ RETVAL_ZVAL_FAST(getThis());
+}
+
+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;
}
- RETVAL_ZVAL(getThis(), 1, 0);
+
+ obj = PHP_HTTP_OBJ(NULL, getThis());
+
+ PHP_HTTP_COOKIE_OBJECT_INIT(obj);
+
+ RETURN_LONG(obj->list->max_age);
}
-PHP_METHOD(HttpCookie, getFlags)
+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)
{
- if (SUCCESS == zend_parse_parameters_none()) {
- php_http_cookie_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+ long ma = -1;
+ php_http_cookie_object_t *obj;
- if (!obj->list) {
- obj->list = php_http_cookie_list_init(NULL TSRMLS_CC);
- }
- RETURN_LONG(obj->list->flags);
+ php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &ma), invalid_arg, return);
+
+ obj = PHP_HTTP_OBJ(NULL, getThis());
+
+ PHP_HTTP_COOKIE_OBJECT_INIT(obj);
+
+ obj->list->max_age = ma;
+
+ RETVAL_ZVAL_FAST(getThis());
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpCookie_getFlags, 0, 0, 0)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(HttpCookie, getFlags)
+{
+ php_http_cookie_object_t *obj;
+
+ if (SUCCESS != zend_parse_parameters_none()) {
+ return;
}
- RETURN_FALSE;
+
+ obj = PHP_HTTP_OBJ(NULL, getThis());
+
+ 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);
- if (!obj->list) {
- obj->list = php_http_cookie_list_init(NULL TSRMLS_CC);
- }
- obj->list->flags = flags;
- }
- RETVAL_ZVAL(getThis(), 1, 0);
+ obj = PHP_HTTP_OBJ(NULL, getThis());
+
+ PHP_HTTP_COOKIE_OBJECT_INIT(obj);
+
+ obj->list->flags = flags;
+
+ RETVAL_ZVAL_FAST(getThis());
}
-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 = PHP_HTTP_OBJ(NULL, getThis());
+
+ PHP_HTTP_COOKIE_OBJECT_INIT(obj);
+
+ php_http_cookie_list_to_string(obj->list, &str, &len);
+
+ RETURN_NEW_STR(php_http_cs2zs(str, len));
}
-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 = PHP_HTTP_OBJ(NULL, getThis());
+
+ PHP_HTTP_COOKIE_OBJECT_INIT(obj);
+
+ array_init_size(return_value, 8);
+ 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);
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.offset = XtOffsetOf(php_http_cookie_object_t, zo);
php_http_cookie_object_handlers.clone_obj = php_http_cookie_object_clone;
+ php_http_cookie_object_handlers.free_obj = php_http_cookie_object_free;
zend_declare_class_constant_long(php_http_cookie_class_entry, ZEND_STRL("PARSE_RAW"), PHP_HTTP_COOKIE_PARSE_RAW TSRMLS_CC);
zend_declare_class_constant_long(php_http_cookie_class_entry, ZEND_STRL("SECURE"), PHP_HTTP_COOKIE_SECURE TSRMLS_CC);
projects / m6w6 / ext-http / blobdiff