X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_env_response.h;h=ae1441d37fab8032ba577c14088bbbf4218ce051;hp=3a702b23273c144412e131f21ff290ed4184ef90;hb=2e55401943bf7835544aa37e2aeaedfac545a6bb;hpb=731b6a841374147b766c850b2a90c6bfade6f9f1

diff --git a/php_http_env_response.h b/php_http_env_response.h
index 3a702b2..ae1441d 100644
--- a/php_http_env_response.h
+++ b/php_http_env_response.h
@@ -16,17 +16,17 @@
 typedef struct php_http_env_response php_http_env_response_t;
 
 typedef struct php_http_env_response_ops {
-	STATUS (*init)(php_http_env_response_t *r, void *arg);
+	ZEND_RESULT_CODE (*init)(php_http_env_response_t *r, void *arg);
 	void (*dtor)(php_http_env_response_t *r);
 	long (*get_status)(php_http_env_response_t *r);
-	STATUS (*set_status)(php_http_env_response_t *r, long http_code);
-	STATUS (*set_protocol_version)(php_http_env_response_t *r, php_http_version_t *v);
-	STATUS (*set_header)(php_http_env_response_t *r, const char *fmt, ...);
-	STATUS (*add_header)(php_http_env_response_t *r, const char *fmt, ...);
-	STATUS (*del_header)(php_http_env_response_t *r, const char *header_str, size_t header_len);
-	STATUS (*write)(php_http_env_response_t *r, const char *data_str, size_t data_len);
-	STATUS (*flush)(php_http_env_response_t *r);
-	STATUS (*finish)(php_http_env_response_t *r);
+	ZEND_RESULT_CODE (*set_status)(php_http_env_response_t *r, long http_code);
+	ZEND_RESULT_CODE (*set_protocol_version)(php_http_env_response_t *r, php_http_version_t *v);
+	ZEND_RESULT_CODE (*set_header)(php_http_env_response_t *r, const char *fmt, ...);
+	ZEND_RESULT_CODE (*add_header)(php_http_env_response_t *r, const char *fmt, ...);
+	ZEND_RESULT_CODE (*del_header)(php_http_env_response_t *r, const char *header_str, size_t header_len);
+	ZEND_RESULT_CODE (*write)(php_http_env_response_t *r, const char *data_str, size_t data_len);
+	ZEND_RESULT_CODE (*flush)(php_http_env_response_t *r);
+	ZEND_RESULT_CODE (*finish)(php_http_env_response_t *r);
 } php_http_env_response_ops_t;
 
 PHP_HTTP_API php_http_env_response_ops_t *php_http_env_response_get_sapi_ops(void);
@@ -36,8 +36,9 @@ struct php_http_env_response {
 	void *ctx;
 	php_http_env_response_ops_t *ops;
 
+	php_http_cookie_list_t *cookies;
 	php_http_buffer_t *buffer;
-	zval *options;
+	zval options;
 
 	struct {
 		size_t chunk;
@@ -59,19 +60,15 @@ struct php_http_env_response {
 	} content;
 
 	zend_bool done;
-
-#ifdef ZTS
-	void ***ts;
-#endif
 };
 
-PHP_HTTP_API php_http_env_response_t *php_http_env_response_init(php_http_env_response_t *r, zval *options, php_http_env_response_ops_t *ops, void *ops_ctx TSRMLS_DC);
-PHP_HTTP_API STATUS php_http_env_response_send(php_http_env_response_t *r);
+PHP_HTTP_API php_http_env_response_t *php_http_env_response_init(php_http_env_response_t *r, zval *options, php_http_env_response_ops_t *ops, void *ops_ctx);
+PHP_HTTP_API ZEND_RESULT_CODE php_http_env_response_send(php_http_env_response_t *r);
 PHP_HTTP_API void php_http_env_response_dtor(php_http_env_response_t *r);
 PHP_HTTP_API void php_http_env_response_free(php_http_env_response_t **r);
 
-PHP_HTTP_API php_http_cache_status_t php_http_env_is_response_cached_by_etag(zval *options, const char *header_str, size_t header_len, php_http_message_t *request TSRMLS_DC);
-PHP_HTTP_API php_http_cache_status_t php_http_env_is_response_cached_by_last_modified(zval *options, const char *header_str, size_t header_len, php_http_message_t *request TSRMLS_DC);
+PHP_HTTP_API php_http_cache_status_t php_http_env_is_response_cached_by_etag(zval *options, const char *header_str, size_t header_len, php_http_message_t *request);
+PHP_HTTP_API php_http_cache_status_t php_http_env_is_response_cached_by_last_modified(zval *options, const char *header_str, size_t header_len, php_http_message_t *request);
 
 PHP_HTTP_API zend_class_entry *php_http_env_response_class_entry;
 PHP_MINIT_FUNCTION(http_env_response);