X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=src%2Fphp_http_cookie.c;h=1186ca0535aa37394e90da8b9742e3a6d09d1bb7;hp=9625401aecdec149fdcaff522bd9e5f1269054ca;hb=c17987e25b6558974e60d20c4c10be9fd5221094;hpb=a5e66b221dbf5a52cc770f4d7f46f05fe88784ba

diff --git a/src/php_http_cookie.c b/src/php_http_cookie.c
index 9625401..1186ca0 100644
--- a/src/php_http_cookie.c
+++ b/src/php_http_cookie.c
@@ -366,6 +366,11 @@ void php_http_cookie_list_to_string(php_http_cookie_list_t *list, char **str, si
 }
 
 
+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_object_handlers php_http_cookie_object_handlers;
 
@@ -430,16 +435,16 @@ static PHP_METHOD(HttpCookie, __construct)
 {
 	php_http_cookie_object_t *obj;
 	zval *zcookie = NULL;
-	long flags = 0;
+	zend_long flags = 0;
 	char **ae = NULL;
 	HashTable *allowed_extras = NULL;
 	zend_error_handling zeh;
 
-	php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|z!lH", &zcookie, &flags, &allowed_extras), invalid_arg, return);
+	php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|z!lH/", &zcookie, &flags, &allowed_extras), invalid_arg, return);
 
 	obj = PHP_HTTP_OBJ(NULL, getThis());
 
-	zend_replace_error_handling(EH_THROW, php_http_exception_runtime_class_entry, &zeh);
+	zend_replace_error_handling(EH_THROW, php_http_get_exception_runtime_class_entry(), &zeh);
 	if (zcookie) {
 
 		if (allowed_extras && zend_hash_num_elements(allowed_extras)) {
@@ -521,7 +526,7 @@ static PHP_METHOD(HttpCookie, setCookies)
 	HashTable *cookies = NULL;
 	php_http_cookie_object_t *obj;
 
-	php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|H", &cookies), invalid_arg, return);
+	php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|H/", &cookies), invalid_arg, return);
 
 	obj = PHP_HTTP_OBJ(NULL, getThis());
 
@@ -543,7 +548,7 @@ static PHP_METHOD(HttpCookie, addCookies)
 	HashTable *cookies = NULL;
 	php_http_cookie_object_t *obj;
 
-	php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "H", &cookies), invalid_arg, return);
+	php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "H/", &cookies), invalid_arg, return);
 
 	obj = PHP_HTTP_OBJ(NULL, getThis());
 
@@ -580,7 +585,7 @@ static PHP_METHOD(HttpCookie, setExtras)
 	HashTable *extras = NULL;
 	php_http_cookie_object_t *obj;
 
-	php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|H", &extras), invalid_arg, return);
+	php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|H/", &extras), invalid_arg, return);
 
 	obj = PHP_HTTP_OBJ(NULL, getThis());
 
@@ -602,7 +607,7 @@ static PHP_METHOD(HttpCookie, addExtras)
 	HashTable *extras = NULL;
 	php_http_cookie_object_t *obj;
 
-	php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "H", &extras), invalid_arg, return);
+	php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "H/", &extras), invalid_arg, return);
 
 	obj = PHP_HTTP_OBJ(NULL, getThis());
 
@@ -851,7 +856,7 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpCookie_setExpires, 0, 0, 0)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(HttpCookie, setExpires)
 {
-	long ts = -1;
+	zend_long ts = -1;
 	php_http_cookie_object_t *obj;
 
 	php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &ts), invalid_arg, return);
@@ -887,7 +892,7 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpCookie_setMaxAge, 0, 0, 0)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(HttpCookie, setMaxAge)
 {
-	long ma = -1;
+	zend_long ma = -1;
 	php_http_cookie_object_t *obj;
 
 	php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &ma), invalid_arg, return);
@@ -923,7 +928,7 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpCookie_setFlags, 0, 0, 0)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(HttpCookie, setFlags)
 {
-	long flags = 0;
+	zend_long flags = 0;
 	php_http_cookie_object_t *obj;
 
 	php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &flags), invalid_arg, return);
@@ -1010,8 +1015,6 @@ static zend_function_entry php_http_cookie_methods[] = {
 	EMPTY_FUNCTION_ENTRY
 };
 
-zend_class_entry *php_http_cookie_class_entry;
-
 PHP_MINIT_FUNCTION(http_cookie)
 {
 	zend_class_entry ce = {0};