list->path = NULL;
list->domain = NULL;
list->expires = -1;
+ list->max_age = -1;
list->flags = 0;
TSRMLS_SET_CTX(list->ts);
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 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;
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") {
list->flags |= PHP_HTTP_COOKIE_SECURE;
} else if _KEY_IS("httpOnly") {
return list;
}
-
PHP_HTTP_API void php_http_cookie_list_to_struct(php_http_cookie_list_t *list, zval *strct)
{
zval array, *cookies, *extras;
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);
}
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) {
list->path = estrndup(Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp));
}
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;
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) {
zval *tmp = php_http_ztyp(IS_STRING, *val);
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_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;
}
+#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);
} 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);
}
+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);
- 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);
}
projects / m6w6 / ext-http / blobdiff