X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_env_request.c;h=a884d2ffe432d804c145cf2685757049a914fbea;hp=6aff0c00fe0d106fba418841e061efc02bb7778d;hb=bc3a439b3ae1617da6d17aca43dac9d0b62757ff;hpb=eaa046dc3e6496e523a17c3b786ef27067b9795c

diff --git a/php_http_env_request.c b/php_http_env_request.c
index 6aff0c0..a884d2f 100644
--- a/php_http_env_request.c
+++ b/php_http_env_request.c
@@ -149,6 +149,16 @@ static PHP_METHOD(HttpEnvRequest, __construct)
 	zend_update_property(php_http_env_request_class_entry, getThis(), ZEND_STRL("form"), zqs TSRMLS_CC);
 	zval_ptr_dtor(&zqs);
 
+	zsg = php_http_env_get_superglobal(ZEND_STRL("_COOKIE") TSRMLS_CC);
+	MAKE_STD_ZVAL(zqs);
+	object_init_ex(zqs, php_http_querystring_class_entry);
+	php_http_expect(SUCCESS == php_http_querystring_ctor(zqs, zsg TSRMLS_CC), unexpected_val,
+			zval_ptr_dtor(&zqs);
+			return;
+	);
+	zend_update_property(php_http_env_request_class_entry, getThis(), ZEND_STRL("cookie"), zqs TSRMLS_CC);
+	zval_ptr_dtor(&zqs);
+
 	MAKE_STD_ZVAL(zqs);
 	array_init(zqs);
 	if ((zsg = php_http_env_get_superglobal(ZEND_STRL("_FILES") TSRMLS_CC))) {
@@ -162,7 +172,7 @@ static PHP_METHOD(HttpEnvRequest, __construct)
 	do {\
 		zend_fcall_info fci; \
 		zend_fcall_info_cache fcc; \
-		zval *rv, mn, ***args = ecalloc(sizeof(zval **), ZEND_NUM_ARGS()); \
+		zval *rv = NULL, mn, ***args = ecalloc(sizeof(zval **), ZEND_NUM_ARGS()); \
 		zval *qs = zend_read_property(Z_OBJCE_P(getThis()), getThis(), ZEND_STRL(prop), 0 TSRMLS_CC); \
 		 \
 		INIT_PZVAL(&mn); \
@@ -177,7 +187,9 @@ static PHP_METHOD(HttpEnvRequest, __construct)
 		zend_fcall_info_args_clear(&fci, 1); \
 		efree(args); \
 		zval_dtor(&mn); \
-		RETVAL_ZVAL(rv, 0, 1); \
+		if (rv) { \
+			RETVAL_ZVAL(rv, 0, 1); \
+		} \
 	} while(0);
 
 ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnvRequest_getForm, 0, 0, 0)
@@ -212,6 +224,22 @@ static PHP_METHOD(HttpEnvRequest, getQuery)
 	}
 }
 
+ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnvRequest_getCookie, 0, 0, 0)
+	ZEND_ARG_INFO(0, name)
+	ZEND_ARG_INFO(0, type)
+	ZEND_ARG_INFO(0, defval)
+	ZEND_ARG_INFO(0, delete)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(HttpEnvRequest, getCookie)
+{
+	if (ZEND_NUM_ARGS()) {
+		call_querystring_get("cookie");
+	} else {
+		zval *zcookie = zend_read_property(php_http_env_request_class_entry, getThis(), ZEND_STRL("cookie"), 0 TSRMLS_CC);
+		RETURN_ZVAL(zcookie, 1, 0);
+	}
+}
+
 ZEND_BEGIN_ARG_INFO_EX(ai_HttpEnvRequest_getFiles, 0, 0, 0)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(HttpEnvRequest, getFiles)
@@ -226,6 +254,7 @@ static zend_function_entry php_http_env_request_methods[] = {
 	PHP_ME(HttpEnvRequest, __construct,  ai_HttpEnvRequest___construct,  ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(HttpEnvRequest, getForm,      ai_HttpEnvRequest_getForm,      ZEND_ACC_PUBLIC)
 	PHP_ME(HttpEnvRequest, getQuery,     ai_HttpEnvRequest_getQuery,     ZEND_ACC_PUBLIC)
+	PHP_ME(HttpEnvRequest, getCookie,    ai_HttpEnvRequest_getCookie,    ZEND_ACC_PUBLIC)
 	PHP_ME(HttpEnvRequest, getFiles,     ai_HttpEnvRequest_getFiles,     ZEND_ACC_PUBLIC)
 	EMPTY_FUNCTION_ENTRY
 };
@@ -241,6 +270,7 @@ PHP_MINIT_FUNCTION(http_env_request)
 
 	zend_declare_property_null(php_http_env_request_class_entry, ZEND_STRL("query"), ZEND_ACC_PROTECTED TSRMLS_CC);
 	zend_declare_property_null(php_http_env_request_class_entry, ZEND_STRL("form"), ZEND_ACC_PROTECTED TSRMLS_CC);
+	zend_declare_property_null(php_http_env_request_class_entry, ZEND_STRL("cookie"), ZEND_ACC_PROTECTED TSRMLS_CC);
 	zend_declare_property_null(php_http_env_request_class_entry, ZEND_STRL("files"), ZEND_ACC_PROTECTED TSRMLS_CC);
 
 	return SUCCESS;