X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_env.h;h=273ba16c4ffa9c0481184d41a2ff8cda46ab9ca0;hp=94fff29c28aa2395aa6fe2b75bdc445266829d56;hb=ac1886f1b6fb1e938405eb92e62303ffd21d8828;hpb=4d708279b6956fc95b253ddc88671fb2f0e5aa39

diff --git a/php_http_env.h b/php_http_env.h
index 94fff29..273ba16 100644
--- a/php_http_env.h
+++ b/php_http_env.h
@@ -6,17 +6,14 @@
     | 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-2014, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id$ */
-
 #ifndef PHP_HTTP_ENV_H
 #define PHP_HTTP_ENV_H
 
 #include "php_http_message_body.h"
-#include "php_http_encoding.h"
 #include "php_http_version.h"
 
 struct php_http_env_globals {
@@ -24,7 +21,6 @@ struct php_http_env_globals {
 	char *etag_mode;
 
 	struct {
-		time_t time;
 		HashTable *headers;
 		php_http_message_body_t *body;
 	} request;
@@ -41,11 +37,12 @@ typedef enum php_http_range_status {
 	PHP_HTTP_RANGE_ERR
 } php_http_range_status_t;
 
-PHP_HTTP_API php_http_range_status_t php_http_env_get_request_ranges(HashTable *ranges, size_t entity_length TSRMLS_DC);
-PHP_HTTP_API void php_http_env_get_request_headers(HashTable *headers TSRMLS_DC);
-PHP_HTTP_API char *php_http_env_get_request_header(const char *name_str, size_t name_len TSRMLS_DC);
-PHP_HTTP_API int php_http_env_got_request_header(const char *name_str, size_t name_len TSRMLS_DC);
-PHP_HTTP_API php_http_message_body_t *php_http_env_get_request_body(TSRMLS_D);
+PHP_HTTP_API php_http_range_status_t php_http_env_get_request_ranges(HashTable *ranges, size_t entity_length, php_http_message_t *request);
+PHP_HTTP_API void php_http_env_get_request_headers(HashTable *headers);
+PHP_HTTP_API char *php_http_env_get_request_header(const char *name_str, size_t name_len, size_t *len, php_http_message_t *request);
+PHP_HTTP_API zend_bool php_http_env_got_request_header(const char *name_str, size_t name_len, php_http_message_t *request);
+PHP_HTTP_API php_http_message_body_t *php_http_env_get_request_body(void);
+PHP_HTTP_API const char *php_http_env_get_request_method(php_http_message_t *request);
 
 typedef enum php_http_content_disposition {
 	PHP_HTTP_CONTENT_DISPOSITION_NONE,
@@ -59,43 +56,28 @@ typedef enum php_http_cache_status {
 	PHP_HTTP_CACHE_MISS
 } php_http_cache_status_t;
 
-PHP_HTTP_API long php_http_env_get_response_code(TSRMLS_D);
+PHP_HTTP_API long php_http_env_get_response_code(void);
 PHP_HTTP_API const char *php_http_env_get_response_status_for_code(unsigned code);
-PHP_HTTP_API STATUS php_http_env_get_response_headers(HashTable *headers_ht TSRMLS_DC);
-PHP_HTTP_API char *php_http_env_get_response_header(const char *name_str, size_t name_len TSRMLS_DC);
-PHP_HTTP_API STATUS php_http_env_set_response_code(long http_code TSRMLS_DC);
-PHP_HTTP_API STATUS php_http_env_set_response_protocol_version(php_http_version_t *v TSRMLS_DC);
-PHP_HTTP_API STATUS php_http_env_set_response_header(long http_code, const char *header_str, size_t header_len, zend_bool replace TSRMLS_DC);
-PHP_HTTP_API STATUS php_http_env_set_response_header_value(long http_code, const char *name_str, size_t name_len, zval *value, zend_bool replace TSRMLS_DC);
-PHP_HTTP_API STATUS php_http_env_set_response_header_format(long http_code, zend_bool replace TSRMLS_DC, const char *fmt, ...);
-
-PHP_HTTP_API zval *php_http_env_get_server_var(const char *key_str, size_t key_len, zend_bool check TSRMLS_DC);
-#define php_http_env_got_server_var(v) (NULL != php_http_env_get_server_var((v), strlen(v), 1 TSRMLS_CC))
-
-extern zend_class_entry *php_http_env_class_entry;
-extern zend_function_entry php_http_env_method_entry[];
-
-PHP_METHOD(HttpEnv, getRequestHeader);
-PHP_METHOD(HttpEnv, getRequestBody);
-PHP_METHOD(HttpEnv, getResponseStatusForCode);
-PHP_METHOD(HttpEnv, getResponseHeader);
-PHP_METHOD(HttpEnv, getResponseCode);
-PHP_METHOD(HttpEnv, setResponseHeader);
-PHP_METHOD(HttpEnv, setResponseCode);
-PHP_METHOD(HttpEnv, negotiateLanguage);
-PHP_METHOD(HttpEnv, negotiateCharset);
-PHP_METHOD(HttpEnv, negotiateContentType);
-PHP_METHOD(HttpEnv, negotiate);
-PHP_METHOD(HttpEnv, persistentHandlesStat);
-PHP_METHOD(HttpEnv, persistentHandlesClean);
-
-extern zend_class_entry *php_http_env_request_class_entry;
-extern zend_function_entry php_http_env_request_method_entry[];
-
-PHP_METHOD(HttpEnvRequest, __construct);
+PHP_HTTP_API ZEND_RESULT_CODE php_http_env_get_response_headers(HashTable *headers_ht);
+PHP_HTTP_API char *php_http_env_get_response_header(const char *name_str, size_t name_len);
+PHP_HTTP_API ZEND_RESULT_CODE php_http_env_set_response_code(long http_code);
+PHP_HTTP_API ZEND_RESULT_CODE php_http_env_set_response_protocol_version(php_http_version_t *v);
+PHP_HTTP_API ZEND_RESULT_CODE php_http_env_set_response_header(long http_code, const char *header_str, size_t header_len, zend_bool replace);
+PHP_HTTP_API ZEND_RESULT_CODE php_http_env_set_response_header_value(long http_code, const char *name_str, size_t name_len, zval *value, zend_bool replace);
+PHP_HTTP_API ZEND_RESULT_CODE php_http_env_set_response_header_format(long http_code, zend_bool replace, const char *fmt, ...);
+PHP_HTTP_API ZEND_RESULT_CODE php_http_env_set_response_header_va(long http_code, zend_bool replace, const char *fmt, va_list argv);
+
+PHP_HTTP_API zval *php_http_env_get_server_var(const char *key_str, size_t key_len, zend_bool check);
+PHP_HTTP_API zval *php_http_env_get_superglobal(const char *key, size_t key_len);
+
+static inline zend_bool php_http_env_got_server_var(const char *v)
+{
+	return NULL != php_http_env_get_server_var(v, strlen(v), 1);
+}
+
 
+PHP_HTTP_API zend_class_entry *php_http_env_class_entry;
 PHP_MINIT_FUNCTION(http_env);
-PHP_RINIT_FUNCTION(http_env);
 PHP_RSHUTDOWN_FUNCTION(http_env);
 
 #endif