X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_response_object.c;h=73aa0d86535a47c7181018fe004a789b72584453;hp=87d3e630137f0ad7205a6761c3e5d8792de70018;hb=13dc652c45a4a0b4dc219e46065bb3310229cedc;hpb=32e91737086db53bb1fd9ed9f79d693c43ec459f diff --git a/http_response_object.c b/http_response_object.c index 87d3e63..73aa0d8 100644 --- a/http_response_object.c +++ b/http_response_object.c @@ -12,18 +12,13 @@ /* $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" @@ -230,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 */ } @@ -1102,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);