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

diff --git a/http_response_object.c b/http_response_object.c
index 0d6cfa7..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,20 +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_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)
@@ -1163,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);