X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_response_object.c;h=73aa0d86535a47c7181018fe004a789b72584453;hb=c64365b84429b86b4af55b283de3758af38d9369;hp=5d46fa509c73c7efaf2c4ec9428b71cae0dd0640;hpb=edc84b40eb2c5be04492fa98fec5833a030782eb;p=m6w6%2Fext-http

diff --git a/http_response_object.c b/http_response_object.c
index 5d46fa5..73aa0d8 100644
--- a/http_response_object.c
+++ b/http_response_object.c
@@ -6,24 +6,19 @@
     | 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>            |
     +--------------------------------------------------------------------+
 */
 
 /* $Id$ */
 
-
-#ifdef HAVE_CONFIG_H
-#	include "config.h"
-#endif
-
+#define HTTP_WANT_SAPI
 #define HTTP_WANT_MAGIC
 #include "php_http.h"
 
 /* broken static properties in PHP 5.0 */
 #if defined(ZEND_ENGINE_2) && !defined(WONKY)
 
-#include "SAPI.h"
 #include "php_ini.h"
 
 #include "php_http_api.h"
@@ -33,9 +28,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 +225,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 */
 }
@@ -1105,7 +1099,7 @@ PHP_METHOD(HttpResponse, send)
 		cctl = convert_to_type_ex(IS_STRING, GET_STATIC_PROP(cacheControl), &cctl_p);
 
 		http_cache_etag(Z_STRVAL_P(etag), Z_STRLEN_P(etag), Z_STRVAL_P(cctl), Z_STRLEN_P(cctl));
-		http_cache_last_modified(Z_LVAL_P(lmod), Z_LVAL_P(lmod) ? Z_LVAL_P(lmod) : time(NULL), Z_STRVAL_P(cctl), Z_STRLEN_P(cctl));
+		http_cache_last_modified(Z_LVAL_P(lmod), Z_LVAL_P(lmod) ? Z_LVAL_P(lmod) : HTTP_GET_REQUEST_TIME(), Z_STRVAL_P(cctl), Z_STRLEN_P(cctl));
 
 		if (etag_p) zval_ptr_dtor(&etag_p);
 		if (lmod_p) zval_ptr_dtor(&lmod_p);
@@ -1158,7 +1152,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);