X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_cookie.c;h=008c76d05293cef905b1a2bf5c878d3346857637;hp=d46f4146e9f8782ddecfdd6ed14b6bfb8702d00c;hb=8df0e5b02cd04b43f19045c0f4f69c4076840d27;hpb=5d94cd9e46b7eb30149b4aebde1aa14fce2ced43 diff --git a/php_http_cookie.c b/php_http_cookie.c index d46f414..008c76d 100644 --- a/php_http_cookie.c +++ b/php_http_cookie.c @@ -24,6 +24,7 @@ PHP_HTTP_API php_http_cookie_list_t *php_http_cookie_list_init(php_http_cookie_l list->path = NULL; list->domain = NULL; list->expires = -1; + list->max_age = -1; list->flags = 0; TSRMLS_SET_CTX(list->ts); @@ -43,6 +44,7 @@ PHP_HTTP_API php_http_cookie_list_t *php_http_cookie_list_copy(php_http_cookie_l 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; @@ -70,30 +72,31 @@ PHP_HTTP_API void php_http_cookie_list_free(php_http_cookie_list_t **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) +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; @@ -103,8 +106,6 @@ PHP_HTTP_API void php_http_cookie_list_add_cookie(php_http_cookie_list_t *list, 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; @@ -131,35 +132,30 @@ static void add_entry(php_http_cookie_list_t *list, char **allowed_extras, long 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") { 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 */ @@ -207,7 +203,6 @@ PHP_HTTP_API php_http_cookie_list_t *php_http_cookie_list_parse(php_http_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; @@ -227,6 +222,7 @@ PHP_HTTP_API void php_http_cookie_list_to_struct(php_http_cookie_list_t *list, z 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); } @@ -265,6 +261,20 @@ PHP_HTTP_API php_http_cookie_list_t *php_http_cookie_list_from_struct(php_http_c 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)); } @@ -275,8 +285,6 @@ PHP_HTTP_API php_http_cookie_list_t *php_http_cookie_list_from_struct(php_http_c 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]; @@ -294,8 +302,6 @@ static inline void append_encoded(php_http_buffer_t *buf, const char *key, size_ 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; @@ -308,15 +314,11 @@ PHP_HTTP_API void php_http_cookie_list_to_string(php_http_cookie_list_t *list, c 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); } @@ -331,18 +333,17 @@ PHP_HTTP_API void php_http_cookie_list_to_string(php_http_cookie_list_t *list, c 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); - 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); } @@ -354,8 +355,8 @@ PHP_HTTP_API void php_http_cookie_list_to_string(php_http_cookie_list_t *list, c } 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) @@ -374,6 +375,7 @@ PHP_HTTP_EMPTY_ARGS(getExtras); 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); @@ -386,6 +388,9 @@ PHP_HTTP_END_ARGS; 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; @@ -425,8 +430,14 @@ PHP_HTTP_BEGIN_ARGS(getExtra, 1) 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) @@ -448,6 +459,8 @@ zend_function_entry php_http_cookie_method_entry[] = { 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) @@ -487,14 +500,20 @@ zend_object_value php_http_cookie_object_new_ex(zend_class_entry *ce, php_http_c 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); @@ -512,16 +531,17 @@ void php_http_cookie_object_free(void *object TSRMLS_DC) PHP_METHOD(HttpCookie, __construct) { - with_error_handling(EH_THROW, php_http_exception_class_entry) { + 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_exception_class_entry) { + 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); @@ -560,9 +580,19 @@ PHP_METHOD(HttpCookie, __construct) 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(); } @@ -571,9 +601,8 @@ PHP_METHOD(HttpCookie, getCookies) 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; @@ -588,9 +617,8 @@ PHP_METHOD(HttpCookie, setCookies) 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); @@ -606,9 +634,8 @@ 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); - 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); @@ -620,9 +647,8 @@ PHP_METHOD(HttpCookie, getExtras) 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; @@ -637,9 +663,8 @@ PHP_METHOD(HttpCookie, setExtras) 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); @@ -655,9 +680,8 @@ 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); - 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); @@ -670,13 +694,12 @@ 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 (!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; @@ -690,17 +713,12 @@ PHP_METHOD(HttpCookie, setCookie) 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); @@ -713,14 +731,10 @@ 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; - 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); } @@ -732,13 +746,12 @@ 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 (!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; @@ -752,17 +765,12 @@ PHP_METHOD(HttpCookie, setExtra) 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); @@ -775,14 +783,10 @@ 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; - 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); } @@ -792,9 +796,8 @@ PHP_METHOD(HttpCookie, getDomain) 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); } @@ -811,9 +814,8 @@ PHP_METHOD(HttpCookie, setDomain) 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); @@ -824,9 +826,8 @@ PHP_METHOD(HttpCookie, getPath) 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); } @@ -843,9 +844,8 @@ PHP_METHOD(HttpCookie, setPath) 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); @@ -856,9 +856,8 @@ PHP_METHOD(HttpCookie, getExpires) 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; @@ -871,22 +870,46 @@ PHP_METHOD(HttpCookie, setExpires) 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; @@ -899,9 +922,8 @@ PHP_METHOD(HttpCookie, setFlags) 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); @@ -914,9 +936,8 @@ PHP_METHOD(HttpCookie, toString) 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); } @@ -928,9 +949,8 @@ PHP_METHOD(HttpCookie, toArray) 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); } @@ -938,7 +958,7 @@ PHP_METHOD(HttpCookie, toArray) 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;