X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_response_object.c;h=12a9849427d8f376efc58fe2a0476db8680f60ef;hb=30f23d359aff10b458f036226a8e10bceb0a2da9;hp=e011e7e16c671f0c2c526dcaf15422bee736e85f;hpb=1a0dbb96fbe46a2edec1c813798cef7b0898eebe;p=m6w6%2Fext-http diff --git a/http_response_object.c b/http_response_object.c index e011e7e..12a9849 100644 --- a/http_response_object.c +++ b/http_response_object.c @@ -28,11 +28,6 @@ #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) -#define SET_STATIC_PROP(n, v) SET_STATIC_PROP_EX(http_response_object_ce, n, v) -#define UPD_STATIC_STRL(n, v, l) UPD_STATIC_STRL_EX(http_response_object_ce, n, v, l) - #define HTTP_BEGIN_ARGS(method, req_args) HTTP_BEGIN_ARGS_EX(HttpResponse, method, 0, req_args) #define HTTP_EMPTY_ARGS(method) HTTP_EMPTY_ARGS_EX(HttpResponse, method, 0) #define HTTP_RESPONSE_ME(method, visibility) PHP_ME(HttpResponse, method, HTTP_ARGS(HttpResponse, method), visibility|ZEND_ACC_STATIC) @@ -72,6 +67,7 @@ HTTP_EMPTY_ARGS(getCacheControl); HTTP_BEGIN_ARGS(setCacheControl, 1) HTTP_ARG_VAL(cache_control, 0) HTTP_ARG_VAL(max_age, 0) + HTTP_ARG_VAL(must_revalidate, 0) HTTP_END_ARGS; HTTP_EMPTY_ARGS(getContentType); @@ -135,11 +131,10 @@ HTTP_END_ARGS; HTTP_EMPTY_ARGS(getRequestHeaders); HTTP_EMPTY_ARGS(getRequestBody); -#define http_response_object_declare_default_properties() _http_response_object_declare_default_properties(TSRMLS_C) -static inline void _http_response_object_declare_default_properties(TSRMLS_D); #define http_grab_response_headers _http_grab_response_headers static void _http_grab_response_headers(void *data, void *arg TSRMLS_DC); +#define OBJ_PROP_CE http_response_object_ce zend_class_entry *http_response_object_ce; zend_function_entry http_response_object_fe[] = { @@ -198,14 +193,7 @@ zend_function_entry http_response_object_fe[] = { PHP_MINIT_FUNCTION(http_response_object) { HTTP_REGISTER_CLASS(HttpResponse, http_response_object, NULL, 0); - http_response_object_declare_default_properties(); - return SUCCESS; -} - -static inline void _http_response_object_declare_default_properties(TSRMLS_D) -{ - zend_class_entry *ce = http_response_object_ce; - + DCL_STATIC_PROP(PRIVATE, bool, sent, 0); DCL_STATIC_PROP(PRIVATE, bool, catch, 0); DCL_STATIC_PROP(PRIVATE, long, mode, -1); @@ -230,6 +218,8 @@ static inline void _http_response_object_declare_default_properties(TSRMLS_D) DCL_CONST(long, "REDIRECT_PROXY", HTTP_REDIRECT_PROXY); DCL_CONST(long, "REDIRECT_TEMP", HTTP_REDIRECT_TEMP); #endif /* WONKY */ + + return SUCCESS; } static void _http_grab_response_headers(void *data, void *arg TSRMLS_DC) @@ -316,6 +306,8 @@ PHP_METHOD(HttpResponse, setHeader) * header to read. If the parameter is empty or omitted, an associative array * with all headers will be returned. * + * NOTE: In Apache2 this only works for PHP-5.1.3 and greater. + * * Returns either a string containing the value of the header matching name, * FALSE on failure, or an associative array with all headers. */ @@ -444,13 +436,15 @@ PHP_METHOD(HttpResponse, getGzip) } /* }}} */ -/* {{{ proto static bool HttpResponse::setCacheControl(string control[, int max_age = 0]) +/* {{{ proto static bool HttpResponse::setCacheControl(string control[, int max_age = 0[, bool must_revalidate = true]]) * * Set a custom cache-control header, usually being "private" or "public"; * The max_age parameter controls how long the cache entry is valid on the client side. * * Expects a string parameter containing the primary cache control setting. * Additionally accepts an int parameter specifying the max-age setting. + * Accepts an optional third bool parameter indicating whether the cache + * must be revalidated every request. * * Returns TRUE on success, or FALSE if control does not match one of * "public" , "private" or "no-cache". @@ -462,8 +456,9 @@ PHP_METHOD(HttpResponse, setCacheControl) char *ccontrol, *cctl; int cc_len; long max_age = 0; + zend_bool must_revalidate = 1; - if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &ccontrol, &cc_len, &max_age)) { + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|lb", &ccontrol, &cc_len, &max_age, &must_revalidate)) { RETURN_FALSE; } @@ -471,7 +466,7 @@ PHP_METHOD(HttpResponse, setCacheControl) http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Cache-Control '%s' doesn't match public, private or no-cache", ccontrol); RETURN_FALSE; } else { - size_t cctl_len = spprintf(&cctl, 0, "%s, must-revalidate, max-age=%ld", ccontrol, max_age); + size_t cctl_len = spprintf(&cctl, 0, "%s,%s max-age=%ld", ccontrol, must_revalidate?" must-revalidate,":"", max_age); RETVAL_SUCCESS(UPD_STATIC_STRL(cacheControl, cctl, cctl_len)); efree(cctl); } @@ -563,15 +558,12 @@ PHP_METHOD(HttpResponse, getContentType) */ PHP_METHOD(HttpResponse, guessContentType) { +#ifdef HTTP_HAVE_MAGIC char *magic_file, *ct = NULL; int magic_file_len; - long magic_mode = 0; + long magic_mode = MAGIC_MIME; RETVAL_FALSE; - -#ifdef HTTP_HAVE_MAGIC - magic_mode = MAGIC_MIME; - SET_EH_THROW_HTTP(); if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &magic_file, &magic_file_len, &magic_mode)) { switch (Z_LVAL_P(GET_STATIC_PROP(mode))) { @@ -604,6 +596,7 @@ PHP_METHOD(HttpResponse, guessContentType) SET_EH_NORMAL(); #else http_error(HE_THROW, HTTP_E_RUNTIME, "Cannot guess Content-Type; libmagic not available"); + RETURN_FALSE; #endif } /* }}} */ @@ -1085,7 +1078,7 @@ PHP_METHOD(HttpResponse, send) if (clean_ob) { /* interrupt on-the-fly etag generation */ - HTTP_G(etag).started = 0; + HTTP_G->etag.started = 0; /* discard previous output buffers */ php_end_ob_buffers(0 TSRMLS_CC); } @@ -1145,17 +1138,17 @@ PHP_METHOD(HttpResponse, send) { zval *bsize_p, *bsize = convert_to_type_ex(IS_LONG, GET_STATIC_PROP(bufferSize), &bsize_p); zval *delay_p, *delay = convert_to_type_ex(IS_DOUBLE, GET_STATIC_PROP(throttleDelay), &delay_p); - HTTP_G(send).buffer_size = Z_LVAL_P(bsize); - HTTP_G(send).throttle_delay = Z_DVAL_P(delay); + HTTP_G->send.buffer_size = Z_LVAL_P(bsize); + HTTP_G->send.throttle_delay = Z_DVAL_P(delay); if (bsize_p) zval_ptr_dtor(&bsize_p); if (delay_p) zval_ptr_dtor(&delay_p); } /* gzip */ - HTTP_G(send).deflate.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); + php_start_ob_buffer(NULL, HTTP_G->send.buffer_size, 0 TSRMLS_CC); /* send */ switch (Z_LVAL_P(GET_STATIC_PROP(mode)))