}
}
-
-
-PHP_HTTP_API const char *php_http_cookie_list_get_cookie(php_http_cookie_list_t *list, const char *name, size_t name_len)
+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;
+ 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)
+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;
+ 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)
{
zval *cookie_value;
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)
{
zval *cookie_value;
} else if _KEY_IS("httpOnly") {
list->flags |= PHP_HTTP_COOKIE_HTTPONLY;
} else {
- char buf[0x20], *key_str;
- int key_len;
-
- if (key->type == HASH_KEY_IS_LONG) {
- key_len = slprintf(buf, sizeof(buf) - 1, "%ld", key->num) + 1;
- key_str = &buf[0];
- } else {
- key_len = key->len;
- key_str = key->str;
- }
/* check for extra */
if (allowed_extras) {
char **ae = allowed_extras;
+ php_http_array_hashkey_stringify(key);
for (; *ae; ++ae) {
- if (!strncasecmp(key_str, *ae, key_len)) {
+ 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 {
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);
}
/* cookie */
return list;
}
-
PHP_HTTP_API void php_http_cookie_list_to_struct(php_http_cookie_list_t *list, zval *strct)
{
zval array, *cookies, *extras;
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];
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)
{
php_http_buffer_t buf;
FOREACH_HASH_KEYVAL(pos, &list->cookies, key, val) {
zval *tmp = php_http_ztyp(IS_STRING, *val);
- if (key.type == HASH_KEY_IS_STRING && key.len) {
- append_encoded(&buf, key.str, key.len-1, Z_STRVAL_P(tmp), Z_STRLEN_P(tmp));
- } else if (key.type == HASH_KEY_IS_LONG) {
- int enc_len;
- char *enc_str = php_raw_url_encode(Z_STRVAL_P(tmp), Z_STRLEN_P(tmp), &enc_len);
-
- php_http_buffer_appendf(&buf, "%ld=%.*s; ", key.num, enc_len, enc_str);
- efree(enc_str);
- }
+
+ 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);
}
FOREACH_HASH_KEYVAL(pos, &list->extras, key, val) {
zval *tmp = php_http_ztyp(IS_STRING, *val);
- if (key.type == HASH_KEY_IS_STRING && key.len) {
- append_encoded(&buf, key.str, key.len-1, Z_STRVAL_P(tmp), Z_STRLEN_P(tmp));
- } else if (key.type == HASH_KEY_IS_LONG) {
- int enc_len;
- char *enc_str = php_raw_url_encode(Z_STRVAL_P(tmp), Z_STRLEN_P(tmp), &enc_len);
-
- php_http_buffer_appendf(&buf, "%ld=%.*s; ", key.num, enc_len, enc_str);
- efree(enc_str);
- }
+
+ 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);
}
}
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)
return ov;
}
+#define PHP_HTTP_COOKIE_OBJECT_INIT(obj) \
+ do { \
+ if (!obj->list) { \
+ obj->list = php_http_cookie_list_init(NULL TSRMLS_CC); \
+ } \
+ } while(0)
+
zend_object_value php_http_cookie_object_clone(zval *this_ptr TSRMLS_DC)
{
php_http_cookie_object_t *new_obj, *old_obj = zend_object_store_get_object(getThis() TSRMLS_CC);
zend_object_value ov;
- if (!old_obj->list) {
- old_obj->list = php_http_cookie_list_init(NULL TSRMLS_CC);
- }
+ 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);
PHP_METHOD(HttpCookie, __construct)
{
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 (zcookie) {
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);
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);
- if (!obj->list) {
- obj->list = php_http_cookie_list_init(NULL 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);
- if (!obj->list) {
- obj->list = php_http_cookie_list_init(NULL TSRMLS_CC);
- }
+ PHP_HTTP_COOKIE_OBJECT_INIT(obj);
+
zend_hash_clean(&obj->list->cookies);
if (cookies) {
array_copy(cookies, &obj->list->cookies);
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);
- if (!obj->list) {
- obj->list = php_http_cookie_list_init(NULL TSRMLS_CC);
- }
+ PHP_HTTP_COOKIE_OBJECT_INIT(obj);
+
array_join(cookies, &obj->list->cookies, 1, ARRAY_JOIN_STRONLY);
}
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);
- if (!obj->list) {
- obj->list = php_http_cookie_list_init(NULL 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);
- if (!obj->list) {
- obj->list = php_http_cookie_list_init(NULL TSRMLS_CC);
- }
+ PHP_HTTP_COOKIE_OBJECT_INIT(obj);
+
zend_hash_clean(&obj->list->extras);
if (extras) {
array_copy(extras, &obj->list->extras);
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);
- if (!obj->list) {
- obj->list = php_http_cookie_list_init(NULL TSRMLS_CC);
- }
+ PHP_HTTP_COOKIE_OBJECT_INIT(obj);
+
array_join(extras, &obj->list->extras, 1, ARRAY_JOIN_STRONLY);
}
RETVAL_ZVAL(getThis(), 1, 0);
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 (!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);
+ 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;
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);
- if (!obj->list) {
- obj->list = php_http_cookie_list_init(NULL TSRMLS_CC);
- }
+ PHP_HTTP_COOKIE_OBJECT_INIT(obj);
+
if (!value_str) {
- zend_symtable_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);
- zend_symtable_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);
}
}
RETVAL_ZVAL(getThis(), 1, 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);
- zval *zvalue;
- 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);
+ PHP_HTTP_COOKIE_OBJECT_INIT(obj);
+
+ php_http_cookie_list_add_cookie(obj->list, name_str, name_len, value_str, value_len);
}
RETVAL_ZVAL(getThis(), 1, 0);
}
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 (!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);
+ 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;
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);
- if (!obj->list) {
- obj->list = php_http_cookie_list_init(NULL TSRMLS_CC);
- }
+ PHP_HTTP_COOKIE_OBJECT_INIT(obj);
+
if (!value_str) {
- zend_symtable_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);
- zend_symtable_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);
}
}
RETVAL_ZVAL(getThis(), 1, 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);
- zval *zvalue;
- 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);
+ PHP_HTTP_COOKIE_OBJECT_INIT(obj);
+
+ php_http_cookie_list_add_extra(obj->list, name_str, name_len, value_str, value_len);
}
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);
- if (!obj->list) {
- obj->list = php_http_cookie_list_init(NULL 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);
- if (!obj->list) {
- obj->list = php_http_cookie_list_init(NULL TSRMLS_CC);
- }
+ PHP_HTTP_COOKIE_OBJECT_INIT(obj);
+
STR_SET(obj->list->domain, domain_str ? estrndup(domain_str, domain_len) : NULL);
}
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);
- if (!obj->list) {
- obj->list = php_http_cookie_list_init(NULL 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);
- if (!obj->list) {
- obj->list = php_http_cookie_list_init(NULL TSRMLS_CC);
- }
+ PHP_HTTP_COOKIE_OBJECT_INIT(obj);
+
STR_SET(obj->list->path, path_str ? estrndup(path_str, path_len) : NULL);
}
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);
- if (!obj->list) {
- obj->list = php_http_cookie_list_init(NULL TSRMLS_CC);
- }
+ PHP_HTTP_COOKIE_OBJECT_INIT(obj);
+
RETURN_LONG(obj->list->expires);
}
RETURN_FALSE;
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);
- if (!obj->list) {
- obj->list = php_http_cookie_list_init(NULL TSRMLS_CC);
- }
+ PHP_HTTP_COOKIE_OBJECT_INIT(obj);
+
obj->list->expires = ts;
}
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);
- if (!obj->list) {
- obj->list = php_http_cookie_list_init(NULL 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);
- if (!obj->list) {
- obj->list = php_http_cookie_list_init(NULL TSRMLS_CC);
- }
+ PHP_HTTP_COOKIE_OBJECT_INIT(obj);
+
obj->list->flags = flags;
}
RETVAL_ZVAL(getThis(), 1, 0);
char *str;
size_t len;
- if (!obj->list) {
- obj->list = php_http_cookie_list_init(NULL TSRMLS_CC);
- }
+ PHP_HTTP_COOKIE_OBJECT_INIT(obj);
+
php_http_cookie_list_to_string(obj->list, &str, &len);
RETURN_STRINGL(str, len, 0);
}
if (SUCCESS == zend_parse_parameters_none()) {
php_http_cookie_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
- if (!obj->list) {
- obj->list = php_http_cookie_list_init(NULL TSRMLS_CC);
- }
+ PHP_HTTP_COOKIE_OBJECT_INIT(obj);
+
array_init(return_value);
php_http_cookie_list_to_struct(obj->list, return_value);
}