X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=php_http_cookie.c;h=1bfa734fd60ebc8c05bd1830cb086600c97e1c94;hb=a458b9a25cf0ec9b4d8bde2b22e43c44d71427c8;hp=df7a76ad48f92b7c62c250934119bab55fe42e22;hpb=df06e2dbf48a3b0d96f2c62071c1b5fc907a98d0;p=m6w6%2Fext-http

diff --git a/php_http_cookie.c b/php_http_cookie.c
index df7a76a..1bfa734 100644
--- a/php_http_cookie.c
+++ b/php_http_cookie.c
@@ -6,12 +6,10 @@
     | 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>
@@ -30,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);
@@ -48,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);
@@ -61,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);
@@ -72,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);
@@ -83,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);
@@ -94,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);
 }
 
 
@@ -135,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;
@@ -149,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;
@@ -163,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);
 		}
 	}
@@ -189,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;
 	}
@@ -201,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));
 	
@@ -245,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;
@@ -262,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;
 					}
@@ -308,18 +309,19 @@ static inline void append_encoded(php_http_buffer_t *buf, const char *key, size_
 
 
 
-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);
 	
 	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);
 		}
@@ -339,7 +341,7 @@ 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);
 		}
@@ -486,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);
 
@@ -526,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);
@@ -540,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);
@@ -662,7 +667,7 @@ PHP_METHOD(HttpCookie, getCookie)
 		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);
 		}
 	}
@@ -681,13 +686,13 @@ PHP_METHOD(HttpCookie, setCookie)
 			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);
@@ -707,7 +712,7 @@ PHP_METHOD(HttpCookie, addCookie)
 		}
 		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);
 }
@@ -724,7 +729,7 @@ PHP_METHOD(HttpCookie, getExtra)
 		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);
 		}
 	}
@@ -743,13 +748,13 @@ PHP_METHOD(HttpCookie, setExtra)
 			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);
@@ -769,7 +774,7 @@ PHP_METHOD(HttpCookie, addExtra)
 		}
 		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);
 }
@@ -904,7 +909,7 @@ PHP_METHOD(HttpCookie, toString)
 		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();
@@ -919,14 +924,13 @@ PHP_METHOD(HttpCookie, toArray)
 			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;