X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_response_object.c;h=4cbba7299d668eb4521970d20a52259e02e747d1;hp=544b60337198fd4841852d8b24e75caa9463d497;hb=7b88d9022c90eb12e5fe195af8644935141c9d68;hpb=92f5e5a5df0bff3d8076c1f5ed73590b40849501

diff --git a/http_response_object.c b/http_response_object.c
index 544b603..4cbba72 100644
--- a/http_response_object.c
+++ b/http_response_object.c
@@ -16,9 +16,9 @@
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
 #endif
-#include "php.h"
 
-#include "missing.h"
+#define HTTP_WANT_MAGIC
+#include "php_http.h"
 
 /* broken static properties in PHP 5.0 */
 #if defined(ZEND_ENGINE_2) && !defined(WONKY)
@@ -26,23 +26,12 @@
 #include "SAPI.h"
 #include "php_ini.h"
 
-#include "php_http.h"
 #include "php_http_api.h"
-#include "php_http_std_defs.h"
-#include "php_http_response_object.h"
-#include "php_http_exception_object.h"
-#include "php_http_send_api.h"
 #include "php_http_cache_api.h"
+#include "php_http_exception_object.h"
 #include "php_http_headers_api.h"
-
-#ifdef HTTP_HAVE_MHASH
-#	include <mhash.h>
-#endif
-#ifdef HTTP_HAVE_MAGIC
-#	include <magic.h>
-#endif
-
-ZEND_EXTERN_MODULE_GLOBALS(http);
+#include "php_http_response_object.h"
+#include "php_http_send_api.h"
 
 #define GET_STATIC_PROP(n)			*GET_STATIC_PROP_EX(http_response_object_ce, n)
 #define UPD_STATIC_PROP(t, n, v)	UPD_STATIC_PROP_EX(http_response_object_ce, t, n, v)
@@ -243,34 +232,6 @@ static inline void _http_response_object_declare_default_properties(TSRMLS_D)
 	DCL_CONST(long, "REDIRECT_PERM", HTTP_REDIRECT_PERM);
 	DCL_CONST(long, "REDIRECT_POST", HTTP_REDIRECT_POST);
 	DCL_CONST(long, "REDIRECT_TEMP", HTTP_REDIRECT_TEMP);
-	
-	DCL_CONST(long, "ETAG_MD5", HTTP_ETAG_MD5);
-	DCL_CONST(long, "ETAG_SHA1", HTTP_ETAG_SHA1);
-	DCL_CONST(long, "ETAG_CRC32", HTTP_ETAG_CRC32);
-	
-#	ifdef HTTP_HAVE_HASH_EXT
-	DCL_CONST(long, "ETAG_SHA256", HTTP_ETAG_SHA256);
-	DCL_CONST(long, "ETAG_SHA384", HTTP_ETAG_SHA384);
-	DCL_CONST(long, "ETAG_SHA512", HTTP_ETAG_SHA512);
-	DCL_CONST(long, "ETAG_RIPEMD128", HTTP_ETAG_RIPEMD128);
-	DCL_CONST(long, "ETAG_RIPEMD160", HTTP_ETAG_RIPEMD160);
-#	endif
-
-#	ifdef HTTP_HAVE_MHASH
-	{
-		int l, i, c = mhash_count();
-		
-		for (i = 0; i <= c; ++i) {
-			char const_name[256] = {0};
-			const char *hash_name = mhash_get_hash_name_static(i);
-			
-			if (hash_name) {
-				l = snprintf(const_name, 255, "ETAG_MHASH_%s", hash_name);
-				zend_declare_class_constant_long(ce, const_name, l, i TSRMLS_CC);
-			}
-		}
-	}
-#	endif /* HTTP_HAVE_MHASH */
 #endif /* WONKY */
 }
 
@@ -1194,7 +1155,7 @@ PHP_METHOD(HttpResponse, send)
 	}
 
 	/* gzip */
-	HTTP_G(send).gzip_encoding = zval_is_true(GET_STATIC_PROP(gzip));
+	HTTP_G(send).deflate.encoding = zval_is_true(GET_STATIC_PROP(gzip));
 	
 	/* start ob */
 	php_start_ob_buffer(NULL, HTTP_G(send).buffer_size, 0 TSRMLS_CC);