Don't forget to reset CUSTOMREQUEST on method change and defaults restore.

[m6w6/ext-http] / http_response_object.c

diff --git a/http_response_object.c b/http_response_object.c
index 5d46fa509c73c7efaf2c4ec9428b71cae0dd0640..eda4e763cf520e964b9a1a925cb18d5e6a7b5818 100644 (file)
--- a/http_response_object.c
+++ b/http_response_object.c
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2005, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2006, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -33,9 +33,6 @@
 #include "php_http_response_object.h"
 #include "php_http_send_api.h"
 
-
-ZEND_EXTERN_MODULE_GLOBALS(http);
-
 #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)
 #define SET_STATIC_PROP(n, v)          SET_STATIC_PROP_EX(http_response_object_ce, n, v)
@@ -233,7 +230,9 @@ static inline void _http_response_object_declare_default_properties(TSRMLS_D)
 #ifndef WONKY
        DCL_CONST(long, "REDIRECT", HTTP_REDIRECT);
        DCL_CONST(long, "REDIRECT_PERM", HTTP_REDIRECT_PERM);
+       DCL_CONST(long, "REDIRECT_FOUND", HTTP_REDIRECT_FOUND);
        DCL_CONST(long, "REDIRECT_POST", HTTP_REDIRECT_POST);
+       DCL_CONST(long, "REDIRECT_PROXY", HTTP_REDIRECT_PROXY);
        DCL_CONST(long, "REDIRECT_TEMP", HTTP_REDIRECT_TEMP);
 #endif /* WONKY */
 }
@@ -1158,7 +1157,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);