| 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 <ext/date/php_date.h>
list->expires = 0;
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);
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 **cookie = NULL;
- if ((SUCCESS != zend_hash_find(&list->cookies, name, name_len + 1, (void *) &cookie)) || (Z_TYPE_PP(cookie) != IS_STRING)) {
+ if ((SUCCESS != zend_symtable_find(&list->cookies, name, name_len + 1, (void *) &cookie)) || (Z_TYPE_PP(cookie) != IS_STRING)) {
return NULL;
}
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 **extra = NULL;
- if ((SUCCESS != zend_hash_find(&list->extras, name, name_len + 1, (void *) &extra)) || (Z_TYPE_PP(extra) != IS_STRING)) {
+ if ((SUCCESS != zend_symtable_find(&list->extras, name, name_len + 1, (void *) &extra)) || (Z_TYPE_PP(extra) != IS_STRING)) {
return NULL;
}
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);
}
+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;
-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;
-
+ 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);
-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));
- } else if _KEY_IS("domain") {
- STR_SET(arg->list->domain, estrndup(val, vallen));
- } else if _KEY_IS("expires") {
- char *date = estrndup(val, vallen);
- arg->list->expires = php_parse_date(date, NULL TSRMLS_CC);
- efree(date);
- } else if _KEY_IS("secure") {
- arg->list->flags |= PHP_HTTP_COOKIE_SECURE;
- } else if _KEY_IS("httpOnly") {
- arg->list->flags |= PHP_HTTP_COOKIE_HTTPONLY;
- } else {
- /* check for extra */
- if (arg->allowed_extras) {
- char **ae = arg->allowed_extras;
-
- 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);
- } 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);
+ 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);
+ }
+ }
+ 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);
}
- return;
}
}
}
- /* new cookie */
- if (arg->flags & PHP_HTTP_COOKIE_PARSE_RAW) {
- php_http_cookie_list_add_cookie(arg->list, key, keylen, val, vallen TSRMLS_CC);
- } 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_destroy(¶ms);
-
-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);
- }
- list = NULL;
- }
-
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));
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);
+ time_t expires = php_parse_date(Z_STRVAL_PP(tmp), NULL);
if (expires > 0) {
list->expires = expires;
}
-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_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);
return ov;
}
-zend_object_value php_http_cookie_object_clone(zval *this_ptr TSRMLS_CC)
+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);
+ 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);
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);
}
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);
+ 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 (!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)) {
+ if (SUCCESS == zend_symtable_find(&obj->list->cookies, name_str, name_len + 1, (void *) &zvalue)) {
RETURN_ZVAL(*zvalue, 1, 0);
}
}
obj->list = php_http_cookie_list_init(NULL TSRMLS_CC);
}
if (!value_str) {
- zend_hash_del(&obj->list->cookies, name_str, name_len + 1);
+ zend_symtable_del(&obj->list->cookies, name_str, name_len + 1);
} else {
zval *zvalue;
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);
+ zend_symtable_update(&obj->list->cookies, name_str, name_len + 1, &zvalue, sizeof(zval *), NULL);
}
}
RETVAL_ZVAL(getThis(), 1, 0);
}
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);
+ zend_symtable_update(&obj->list->cookies, name_str, name_len + 1, &zvalue, sizeof(zval *), NULL);
}
RETVAL_ZVAL(getThis(), 1, 0);
}
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)) {
+ if (SUCCESS == zend_symtable_find(&obj->list->extras, name_str, name_len + 1, (void *) &zvalue)) {
RETURN_ZVAL(*zvalue, 1, 0);
}
}
obj->list = php_http_cookie_list_init(NULL TSRMLS_CC);
}
if (!value_str) {
- zend_hash_del(&obj->list->extras, name_str, name_len + 1);
+ zend_symtable_del(&obj->list->extras, name_str, name_len + 1);
} else {
zval *zvalue;
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);
+ zend_symtable_update(&obj->list->extras, name_str, name_len + 1, &zvalue, sizeof(zval *), NULL);
}
}
RETVAL_ZVAL(getThis(), 1, 0);
}
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);
+ zend_symtable_update(&obj->list->extras, name_str, name_len + 1, &zvalue, sizeof(zval *), NULL);
}
RETVAL_ZVAL(getThis(), 1, 0);
}
if (!obj->list) {
obj->list = php_http_cookie_list_init(NULL TSRMLS_CC);
}
- php_http_cookie_list_to_string(obj->list, &str, &len TSRMLS_CC);
+ php_http_cookie_list_to_string(obj->list, &str, &len);
RETURN_STRINGL(str, len, 0);
}
RETURN_EMPTY_STRING();
obj->list = php_http_cookie_list_init(NULL TSRMLS_CC);
}
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);
- zend_class_implements(php_http_cookie_class_entry TSRMLS_CC, 1, php_http_fluently_callable_class_entry);
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