Fix error: redefinition of typedef 'php_http_message_t' during RHEL build

[m6w6/ext-http] / php_http_env.h

diff --git a/php_http_env.h b/php_http_env.h
index 0fab82e4a15a254ee8b290d23ae5842c544a77f3..be0215b551a2eb98058f3a838c3cbd3a929b778c 100644 (file)
--- a/php_http_env.h
+++ b/php_http_env.h
@@ -14,7 +14,6 @@
 #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 {
@@ -41,7 +40,7 @@ typedef enum php_http_range_status {
 
 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 char *php_http_env_get_request_header(const char *name_str, size_t name_len, size_t *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);
 
@@ -69,6 +68,7 @@ PHP_HTTP_API STATUS php_http_env_set_response_header_format(long http_code, zend
 
 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))
+PHP_HTTP_API zval *php_http_env_get_superglobal(const char *key, size_t key_len TSRMLS_DC);
 
 extern zend_class_entry *php_http_env_class_entry;
 extern zend_function_entry php_http_env_method_entry[];
@@ -82,16 +82,11 @@ PHP_METHOD(HttpEnv, setResponseHeader);
 PHP_METHOD(HttpEnv, setResponseCode);
 PHP_METHOD(HttpEnv, negotiateLanguage);
 PHP_METHOD(HttpEnv, negotiateCharset);
+PHP_METHOD(HttpEnv, negotiateEncoding);
 PHP_METHOD(HttpEnv, negotiateContentType);
 PHP_METHOD(HttpEnv, negotiate);
-PHP_METHOD(HttpEnv, persistentHandlesStat);
-PHP_METHOD(HttpEnv, persistentHandlesClean);
-PHP_METHOD(HttpEnv, parseParams);
-
-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_METHOD(HttpEnv, statPersistentHandles);
+PHP_METHOD(HttpEnv, cleanPersistentHandles);
 
 PHP_MINIT_FUNCTION(http_env);
 PHP_RINIT_FUNCTION(http_env);