X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=php_http_cookie.c;h=1bfa734fd60ebc8c05bd1830cb086600c97e1c94;hb=9c1afd81b9baaac03a51c12d42028010054735ce;hp=c23b608f8455c14f4acf7a6801f697b971d5dbc2;hpb=b233c50a85448c251d23a1bdce3e9003c4ee03b8;p=m6w6%2Fext-http diff --git a/php_http_cookie.c b/php_http_cookie.c index c23b608..1bfa734 100644 --- a/php_http_cookie.c +++ b/php_http_cookie.c @@ -6,14 +6,14 @@ | modification, are permitted provided that the conditions mentioned | | in the accompanying LICENSE file are met. | +--------------------------------------------------------------------+ - | Copyright (c) 2004-2010, Michael Wallner | + | Copyright (c) 2004-2011, Michael Wallner | +--------------------------------------------------------------------+ */ -/* $Id: http_cookie_api.c 298662 2010-04-27 13:42:32Z mike $ */ - #include "php_http.h" +#include + PHP_HTTP_API php_http_cookie_list_t *php_http_cookie_list_init(php_http_cookie_list_t *list TSRMLS_DC) { if (!list) { @@ -28,11 +28,15 @@ PHP_HTTP_API php_http_cookie_list_t *php_http_cookie_list_init(php_http_cookie_l 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); @@ -46,7 +50,7 @@ PHP_HTTP_API php_http_cookie_list_t *php_http_cookie_list_copy(php_http_cookie_l 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); @@ -59,7 +63,7 @@ PHP_HTTP_API void php_http_cookie_list_dtor(php_http_cookie_list_t *list TSRMLS_ -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); @@ -70,10 +74,10 @@ PHP_HTTP_API void php_http_cookie_list_free(php_http_cookie_list_t **list TSRMLS -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); @@ -81,10 +85,10 @@ PHP_HTTP_API const char *php_http_cookie_list_get_cookie(php_http_cookie_list_t -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); @@ -92,26 +96,24 @@ PHP_HTTP_API const char *php_http_cookie_list_get_extra(php_http_cookie_list_t * -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); } @@ -133,7 +135,7 @@ static void php_http_cookie_parse_callback(void *ptr, const char *key, int keyle 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); + arg->list->expires = php_parse_date(date, NULL); efree(date); } else if _KEY_IS("secure") { arg->list->flags |= PHP_HTTP_COOKIE_SECURE; @@ -147,12 +149,12 @@ static void php_http_cookie_parse_callback(void *ptr, const char *key, int keyle 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); + php_http_cookie_list_add_extra(arg->list, key, keylen, val, vallen); } 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); + php_http_cookie_list_add_extra(arg->list, key, keylen, dec, declen); efree(dec); } return; @@ -161,12 +163,12 @@ static void php_http_cookie_parse_callback(void *ptr, const char *key, int keyle } /* new cookie */ if (arg->flags & PHP_HTTP_COOKIE_PARSE_RAW) { - php_http_cookie_list_add_cookie(arg->list, key, keylen, val, vallen TSRMLS_CC); + php_http_cookie_list_add_cookie(arg->list, key, keylen, val, vallen); } 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); + php_http_cookie_list_add_cookie(arg->list, key, keylen, dec, declen); efree(dec); } } @@ -187,9 +189,9 @@ PHP_HTTP_API php_http_cookie_list_t *php_http_cookie_list_parse(php_http_cookie_ 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); + php_http_cookie_list_free(&list); } else { - php_http_cookie_list_dtor(list TSRMLS_CC); + php_http_cookie_list_dtor(list); } list = NULL; } @@ -199,9 +201,10 @@ PHP_HTTP_API php_http_cookie_list_t *php_http_cookie_list_parse(php_http_cookie_ -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)); @@ -243,7 +246,7 @@ PHP_HTTP_API php_http_cookie_list_t *php_http_cookie_list_from_struct(php_http_c list->flags = (long) Z_DVAL_PP(tmp); break; case IS_STRING: - cpy = php_http_zsep(IS_LONG, *tmp); + cpy = php_http_ztyp(IS_LONG, *tmp); list->flags = Z_LVAL_P(cpy); zval_ptr_dtor(&cpy); break; @@ -260,11 +263,11 @@ PHP_HTTP_API php_http_cookie_list_t *php_http_cookie_list_from_struct(php_http_c list->expires = (long) Z_DVAL_PP(tmp); break; case IS_STRING: - cpy = php_http_zsep(IS_LONG, *tmp); + cpy = php_http_ztyp(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); + time_t expires = php_parse_date(Z_STRVAL_PP(tmp), NULL); if (expires > 0) { list->expires = expires; } @@ -287,7 +290,7 @@ PHP_HTTP_API php_http_cookie_list_t *php_http_cookie_list_from_struct(php_http_c -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]; @@ -306,18 +309,19 @@ static inline void append_encoded(php_http_buffer *buf, const char *key, size_t -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); + zval *tmp = php_http_ztyp(IS_STRING, *val); append_encoded(&buf, key.str, key.len-1, Z_STRVAL_P(tmp), Z_STRLEN_P(tmp)); zval_ptr_dtor(&tmp); } @@ -337,8 +341,9 @@ PHP_HTTP_API void php_http_cookie_list_to_string(php_http_cookie_list_t *list, c 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); + zval *tmp = php_http_ztyp(IS_STRING, *val); append_encoded(&buf, key.str, key.len-1, Z_STRVAL_P(tmp), Z_STRLEN_P(tmp)); + zval_ptr_dtor(&tmp); } } @@ -483,36 +488,39 @@ zend_object_value php_http_cookie_object_new_ex(zend_class_entry *ce, php_http_c 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); } PHP_METHOD(HttpCookie, __construct) { - with_error_handling(EH_THROW, PHP_HTTP_EX_CE(runtime)) { + with_error_handling(EH_THROW, php_http_exception_class_entry) { 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_class_entry) { char **ae = NULL; php_http_cookie_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); @@ -523,7 +531,7 @@ PHP_METHOD(HttpCookie, __construct) 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); @@ -537,7 +545,7 @@ PHP_METHOD(HttpCookie, __construct) 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); zval_ptr_dtor(&cpy); @@ -555,6 +563,9 @@ 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); + } array_init(return_value); array_copy(&obj->list->cookies, Z_ARRVAL_P(return_value)); return; @@ -569,13 +580,15 @@ 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); + } 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) @@ -585,10 +598,12 @@ 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); + } array_join(cookies, &obj->list->cookies, 1, ARRAY_JOIN_STRONLY); - RETURN_TRUE; } - RETURN_FALSE; + RETVAL_ZVAL(getThis(), 1, 0); } @@ -597,6 +612,9 @@ 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); + } array_init(return_value); array_copy(&obj->list->extras, Z_ARRVAL_P(return_value)); return; @@ -611,13 +629,15 @@ 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); + } 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) @@ -627,10 +647,12 @@ 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); + } array_join(extras, &obj->list->extras, 1, ARRAY_JOIN_STRONLY); - RETURN_TRUE; } - RETURN_FALSE; + RETVAL_ZVAL(getThis(), 1, 0); } PHP_METHOD(HttpCookie, getCookie) @@ -642,7 +664,10 @@ PHP_METHOD(HttpCookie, getCookie) php_http_cookie_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); zval **zvalue; - if (SUCCESS == zend_hash_find(&obj->list->cookies, name_str, name_len + 1, (void *) &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); } } @@ -657,17 +682,20 @@ 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); + } if (!value_str) { - RETURN_SUCCESS(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); - RETURN_SUCCESS(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); } } - RETURN_FALSE; + RETVAL_ZVAL(getThis(), 1, 0); } PHP_METHOD(HttpCookie, addCookie) @@ -679,11 +707,14 @@ PHP_METHOD(HttpCookie, addCookie) 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); - RETURN_SUCCESS(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); } - RETURN_FALSE; + RETVAL_ZVAL(getThis(), 1, 0); } PHP_METHOD(HttpCookie, getExtra) @@ -695,7 +726,10 @@ PHP_METHOD(HttpCookie, getExtra) php_http_cookie_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); zval **zvalue; - if (SUCCESS == zend_hash_find(&obj->list->extras, name_str, name_len + 1, (void *) &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); } } @@ -710,17 +744,20 @@ 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); + } if (!value_str) { - RETURN_SUCCESS(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); - RETURN_SUCCESS(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); } } - RETURN_FALSE; + RETVAL_ZVAL(getThis(), 1, 0); } PHP_METHOD(HttpCookie, addExtra) @@ -732,11 +769,14 @@ PHP_METHOD(HttpCookie, addExtra) 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); - RETURN_SUCCESS(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); } - RETURN_FALSE; + RETVAL_ZVAL(getThis(), 1, 0); } PHP_METHOD(HttpCookie, getDomain) @@ -744,6 +784,9 @@ 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); + } if (obj->list->domain) { RETURN_STRING(obj->list->domain, 1); } @@ -760,10 +803,12 @@ 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); + } 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) @@ -771,6 +816,9 @@ 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); + } if (obj->list->path) { RETURN_STRING(obj->list->path, 1); } @@ -787,10 +835,12 @@ 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); + } 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) @@ -798,6 +848,9 @@ 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); + } RETURN_LONG(obj->list->expires); } RETURN_FALSE; @@ -810,10 +863,12 @@ 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); + } obj->list->expires = ts; - RETURN_TRUE; } - RETURN_FALSE; + RETVAL_ZVAL(getThis(), 1, 0); } PHP_METHOD(HttpCookie, getFlags) @@ -821,6 +876,9 @@ 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); + } RETURN_LONG(obj->list->flags); } RETURN_FALSE; @@ -833,10 +891,12 @@ 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); + } obj->list->flags = flags; - RETURN_TRUE; } - RETURN_FALSE; + RETVAL_ZVAL(getThis(), 1, 0); } PHP_METHOD(HttpCookie, toString) @@ -846,7 +906,10 @@ PHP_METHOD(HttpCookie, toString) char *str; size_t len; - php_http_cookie_list_to_string(obj->list, &str, &len TSRMLS_CC); + if (!obj->list) { + obj->list = php_http_cookie_list_init(NULL TSRMLS_CC); + } + php_http_cookie_list_to_string(obj->list, &str, &len); RETURN_STRINGL(str, len, 0); } RETURN_EMPTY_STRING(); @@ -857,8 +920,11 @@ 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); + } 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); } }