| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-2010, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-2011, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
-/* $Id: http_cookie_api.c 298662 2010-04-27 13:42:32Z mike $ */
-
-#include "php_http.h"
+#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)
{
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 TSRMLS_DC)
+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)
{
+ TSRMLS_FETCH_FROM_CTX(from->ts);
+
to = php_http_cookie_list_init(to TSRMLS_CC);
array_copy(&from->cookies, &to->cookies);
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 TSRMLS_DC)
+PHP_HTTP_API void php_http_cookie_list_dtor(php_http_cookie_list_t *list)
{
if (list) {
zend_hash_destroy(&list->cookies);
-PHP_HTTP_API void php_http_cookie_list_free(php_http_cookie_list_t **list TSRMLS_DC)
+PHP_HTTP_API 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 TSRMLS_DC)
+PHP_HTTP_API 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 TSRMLS_DC)
+PHP_HTTP_API 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 TSRMLS_DC)
+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)
{
zval *cookie_value;
- char *key = estrndup(name, name_len);
+
MAKE_STD_ZVAL(cookie_value);
ZVAL_STRINGL(cookie_value, estrndup(value, value_len), value_len, 0);
- zend_hash_update(&list->cookies, key, name_len + 1, (void *) &cookie_value, sizeof(zval *), NULL);
- efree(key);
+ 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 TSRMLS_DC)
+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;
- char *key = estrndup(name, name_len);
+
MAKE_STD_ZVAL(cookie_value);
ZVAL_STRINGL(cookie_value, estrndup(value, value_len), value_len, 0);
- zend_hash_update(&list->extras, key, name_len + 1, (void *) &cookie_value, sizeof(zval *), NULL);
- efree(key);
+ 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 TSRMLS_CC);
+ 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 TSRMLS_CC);
+ 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 TSRMLS_CC);
- 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 TSRMLS_CC);
+
+ /* 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 TSRMLS_CC);
- efree(dec);
+ zend_hash_update(&list->cookies, key->str, key->len, (void *) &arg, sizeof(zval *), NULL);
}
+ 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_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 TSRMLS_CC);
- } else {
- php_http_cookie_list_dtor(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)) {
+ 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 TSRMLS_DC)
+PHP_HTTP_API 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));
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)
{
zval **tmp, *cpy;
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_zsep(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_zsep(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 TSRMLS_CC);
- 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) {
return list;
}
-
-
-static inline void append_encoded(php_http_buffer *buf, const char *key, size_t key_len, const char *val, size_t val_len)
+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, "=");
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 TSRMLS_DC)
+PHP_HTTP_API void php_http_cookie_list_to_string(php_http_cookie_list_t *list, char **str, size_t *len)
{
- php_http_buffer buf;
+ 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);
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_zsep(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) {
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_zsep(IS_STRING, *val);
- append_encoded(&buf, key.str, key.len-1, Z_STRVAL_P(tmp), Z_STRLEN_P(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) {
}
php_http_buffer_fix(&buf);
- *str = PHP_HTTP_BUFFER_VAL(&buf);
- *len = PHP_HTTP_BUFFER_LEN(&buf);
+ *str = buf.data;
+ *len = buf.used;
}
#define PHP_HTTP_BEGIN_ARGS(method, req_args) PHP_HTTP_BEGIN_ARGS_EX(HttpCookie, method, 0, req_args)
PHP_HTTP_EMPTY_ARGS(getDomain);
PHP_HTTP_EMPTY_ARGS(getPath);
PHP_HTTP_EMPTY_ARGS(getExpires);
+PHP_HTTP_EMPTY_ARGS(getMaxAge);
PHP_HTTP_EMPTY_ARGS(getFlags);
PHP_HTTP_EMPTY_ARGS(toString);
PHP_HTTP_BEGIN_ARGS(setExpires, 0)
PHP_HTTP_ARG_VAL(value, 0)
PHP_HTTP_END_ARGS;
+PHP_HTTP_BEGIN_ARGS(setMaxAge, 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_ARG_VAL(name, 0)
PHP_HTTP_END_ARGS;
-zend_class_entry *php_http_cookie_class_entry;
-zend_function_entry php_http_cookie_method_entry[] = {
+static zend_class_entry *php_http_cookie_class_entry;
+
+zend_class_entry *php_http_cookie_get_class_entry(void)
+{
+ return php_http_cookie_class_entry;
+}
+
+static 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(setPath, ZEND_ACC_PUBLIC)
PHP_HTTP_COOKIE_ME(getExpires, ZEND_ACC_PUBLIC)
PHP_HTTP_COOKIE_ME(setExpires, ZEND_ACC_PUBLIC)
+ PHP_HTTP_COOKIE_ME(getMaxAge, ZEND_ACC_PUBLIC)
+ PHP_HTTP_COOKIE_ME(setMaxAge, ZEND_ACC_PUBLIC)
PHP_HTTP_COOKIE_ME(getFlags, ZEND_ACC_PUBLIC)
PHP_HTTP_COOKIE_ME(setFlags, ZEND_ACC_PUBLIC)
return ov;
}
-zend_object_value php_http_cookie_object_clone(zval *this_ptr TSRMLS_CC)
+#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;
- ov = php_http_cookie_object_new_ex(old_obj->o.ce, php_http_cookie_list_copy(old_obj->list, NULL TSRMLS_CC), &new_obj TSRMLS_CC);
+ PHP_HTTP_COOKIE_OBJECT_INIT(old_obj);
+
+ 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);
return ov;
}
-void php_http_cookie_object_free(void *object TSRMLS_CC)
+void php_http_cookie_object_free(void *object TSRMLS_DC)
{
php_http_cookie_object_t *obj = object;
- php_http_cookie_list_free(&obj->list TSRMLS_CC);
+ php_http_cookie_list_free(&obj->list);
zend_object_std_dtor((zend_object *) obj TSRMLS_CC);
efree(obj);
}
PHP_METHOD(HttpCookie, __construct)
{
- with_error_handling(EH_THROW, PHP_HTTP_EX_CE(runtime)) {
+ with_error_handling(EH_THROW, php_http_exception_get_class_entry()) {
+ php_http_cookie_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
zval *zcookie = NULL;
long flags = 0;
HashTable *allowed_extras = NULL;
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_EX_CE(cookie)) {
+ with_error_handling(EH_THROW, php_http_exception_get_class_entry()) {
char **ae = NULL;
- php_http_cookie_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
if (allowed_extras && zend_hash_num_elements(allowed_extras)) {
char **ae_ptr = safe_emalloc(zend_hash_num_elements(allowed_extras) + 1, sizeof(char *), 0);
ae = ae_ptr;
FOREACH_HASH_VAL(pos, allowed_extras, val) {
- zval *cpy = php_http_zsep(IS_STRING, *val);
+ zval *cpy = php_http_ztyp(IS_STRING, *val);
*ae_ptr++ = estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy));
zval_ptr_dtor(&cpy);
}
switch (Z_TYPE_P(zcookie)) {
- case IS_ARRAY:
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);
+ }
+ 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_zsep(IS_STRING, zcookie);
+ 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);
+ 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();
}
}
+ PHP_HTTP_COOKIE_OBJECT_INIT(obj);
} end_error_handling();
}
if (SUCCESS == zend_parse_parameters_none()) {
php_http_cookie_object_t *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));
return;
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_COOKIE_OBJECT_INIT(obj);
+
zend_hash_clean(&obj->list->cookies);
if (cookies) {
array_copy(cookies, &obj->list->cookies);
}
- RETURN_TRUE;
}
- RETURN_FALSE;
+ RETVAL_ZVAL(getThis(), 1, 0);
}
PHP_METHOD(HttpCookie, addCookies)
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_COOKIE_OBJECT_INIT(obj);
+
array_join(cookies, &obj->list->cookies, 1, ARRAY_JOIN_STRONLY);
- RETURN_TRUE;
}
- RETURN_FALSE;
+ RETVAL_ZVAL(getThis(), 1, 0);
}
if (SUCCESS == zend_parse_parameters_none()) {
php_http_cookie_object_t *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));
return;
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_COOKIE_OBJECT_INIT(obj);
+
zend_hash_clean(&obj->list->extras);
if (extras) {
array_copy(extras, &obj->list->extras);
}
- RETURN_TRUE;
}
- RETURN_FALSE;
+ RETVAL_ZVAL(getThis(), 1, 0);
}
PHP_METHOD(HttpCookie, addExtras)
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_COOKIE_OBJECT_INIT(obj);
+
array_join(extras, &obj->list->extras, 1, ARRAY_JOIN_STRONLY);
- RETURN_TRUE;
}
- RETURN_FALSE;
+ RETVAL_ZVAL(getThis(), 1, 0);
}
PHP_METHOD(HttpCookie, getCookie)
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;
+ zval *zvalue;
- 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)
{
- char *name_str, *value_str;
- int name_len, value_len;
+ char *name_str, *value_str = NULL;
+ int name_len, value_len = 0;
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_COOKIE_OBJECT_INIT(obj);
+
if (!value_str) {
- RETURN_SUCCESS(zend_hash_del(&obj->list->cookies, name_str, name_len + 1));
+ php_http_cookie_list_del_cookie(obj->list, name_str, name_len);
} else {
- zval *zvalue;
-
- MAKE_STD_ZVAL(zvalue);
- ZVAL_STRINGL(zvalue, value_str, value_len, 1);
- RETURN_SUCCESS(zend_hash_update(&obj->list->cookies, name_str, name_len + 1, &zvalue, sizeof(zval *), NULL));
+ php_http_cookie_list_add_cookie(obj->list, name_str, name_len, value_str, value_len);
}
}
- RETURN_FALSE;
+ RETVAL_ZVAL(getThis(), 1, 0);
}
PHP_METHOD(HttpCookie, addCookie)
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;
- MAKE_STD_ZVAL(zvalue);
- ZVAL_STRINGL(zvalue, value_str, value_len, 1);
- RETURN_SUCCESS(zend_hash_add(&obj->list->cookies, name_str, name_len + 1, &zvalue, sizeof(zval *), NULL));
+ PHP_HTTP_COOKIE_OBJECT_INIT(obj);
+
+ php_http_cookie_list_add_cookie(obj->list, name_str, name_len, value_str, value_len);
}
- RETURN_FALSE;
+ RETVAL_ZVAL(getThis(), 1, 0);
}
PHP_METHOD(HttpCookie, getExtra)
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;
+ zval *zvalue;
- if (SUCCESS == zend_hash_find(&obj->list->extras, name_str, name_len + 1, (void *) &zvalue)) {
- RETURN_ZVAL(*zvalue, 1, 0);
+ 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)
{
- char *name_str, *value_str;
- int name_len, value_len;
+ char *name_str, *value_str = NULL;
+ int name_len, value_len = 0;
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_COOKIE_OBJECT_INIT(obj);
+
if (!value_str) {
- RETURN_SUCCESS(zend_hash_del(&obj->list->extras, name_str, name_len + 1));
+ php_http_cookie_list_del_extra(obj->list, name_str, name_len);
} else {
- zval *zvalue;
-
- MAKE_STD_ZVAL(zvalue);
- ZVAL_STRINGL(zvalue, value_str, value_len, 1);
- RETURN_SUCCESS(zend_hash_update(&obj->list->extras, name_str, name_len + 1, &zvalue, sizeof(zval *), NULL));
+ php_http_cookie_list_add_extra(obj->list, name_str, name_len, value_str, value_len);
}
}
- RETURN_FALSE;
+ RETVAL_ZVAL(getThis(), 1, 0);
}
PHP_METHOD(HttpCookie, addExtra)
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;
- MAKE_STD_ZVAL(zvalue);
- ZVAL_STRINGL(zvalue, value_str, value_len, 1);
- RETURN_SUCCESS(zend_hash_add(&obj->list->extras, name_str, name_len + 1, &zvalue, sizeof(zval *), NULL));
+ PHP_HTTP_COOKIE_OBJECT_INIT(obj);
+
+ php_http_cookie_list_add_extra(obj->list, name_str, name_len, value_str, value_len);
}
- RETURN_FALSE;
+ RETVAL_ZVAL(getThis(), 1, 0);
}
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_INIT(obj);
+
if (obj->list->domain) {
RETURN_STRING(obj->list->domain, 1);
}
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_COOKIE_OBJECT_INIT(obj);
+
STR_SET(obj->list->domain, domain_str ? estrndup(domain_str, domain_len) : NULL);
- RETURN_TRUE;
}
- RETURN_FALSE;
+ RETVAL_ZVAL(getThis(), 1, 0);
}
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_INIT(obj);
+
if (obj->list->path) {
RETURN_STRING(obj->list->path, 1);
}
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_COOKIE_OBJECT_INIT(obj);
+
STR_SET(obj->list->path, path_str ? estrndup(path_str, path_len) : NULL);
- RETURN_TRUE;
}
- RETURN_FALSE;
+ RETVAL_ZVAL(getThis(), 1, 0);
}
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_INIT(obj);
+
RETURN_LONG(obj->list->expires);
}
RETURN_FALSE;
PHP_METHOD(HttpCookie, setExpires)
{
- long ts = 0;
+ long ts = -1;
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_COOKIE_OBJECT_INIT(obj);
+
obj->list->expires = ts;
- RETURN_TRUE;
+ }
+ RETVAL_ZVAL(getThis(), 1, 0);
+}
+
+PHP_METHOD(HttpCookie, getMaxAge)
+{
+ if (SUCCESS == zend_parse_parameters_none()) {
+ php_http_cookie_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+ PHP_HTTP_COOKIE_OBJECT_INIT(obj);
+
+ RETURN_LONG(obj->list->max_age);
}
RETURN_FALSE;
}
+PHP_METHOD(HttpCookie, setMaxAge)
+{
+ long ts = -1;
+
+ 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_COOKIE_OBJECT_INIT(obj);
+
+ obj->list->max_age = ts;
+ }
+ RETVAL_ZVAL(getThis(), 1, 0);
+}
+
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_INIT(obj);
+
RETURN_LONG(obj->list->flags);
}
RETURN_FALSE;
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_COOKIE_OBJECT_INIT(obj);
+
obj->list->flags = flags;
- RETURN_TRUE;
}
- RETURN_FALSE;
+ RETVAL_ZVAL(getThis(), 1, 0);
}
PHP_METHOD(HttpCookie, toString)
char *str;
size_t len;
- php_http_cookie_list_to_string(obj->list, &str, &len TSRMLS_CC);
+ PHP_HTTP_COOKIE_OBJECT_INIT(obj);
+
+ php_http_cookie_list_to_string(obj->list, &str, &len);
RETURN_STRINGL(str, len, 0);
}
RETURN_EMPTY_STRING();
if (SUCCESS == zend_parse_parameters_none()) {
php_http_cookie_object_t *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 TSRMLS_CC);
+ php_http_cookie_list_to_struct(obj->list, return_value);
}
}
PHP_MINIT_FUNCTION(http_cookie)
{
- PHP_HTTP_REGISTER_CLASS(http, Cookie, http_cookie, php_http_object_class_entry, 0);
+ PHP_HTTP_REGISTER_CLASS(http, Cookie, http_cookie, php_http_object_get_class_entry(), 0);
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;
projects / m6w6 / ext-http / blobdiff