X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_response_object.c;h=0e860bf95da232c3a8d6ecd9c7dee44e21387fd9;hp=f7ba0b2f18aaab8a476093b68dd33b572ab2e284;hb=b3afcfc70bf06c062115f4994cc04fc8c6e4aa67;hpb=5e06e2629f8cbe71bc2985bf7ca4f149bb08d482 diff --git a/http_response_object.c b/http_response_object.c index f7ba0b2..0e860bf 100644 --- a/http_response_object.c +++ b/http_response_object.c @@ -33,7 +33,7 @@ #define HTTP_RESPONSE_ME(method, visibility) PHP_ME(HttpResponse, method, HTTP_ARGS(HttpResponse, method), visibility|ZEND_ACC_STATIC) #define HTTP_RESPONSE_ALIAS(method, func) HTTP_STATIC_ME_ALIAS(method, func, HTTP_ARGS(HttpResponse, method)) -HTTP_BEGIN_ARGS(setHeader, 2) +HTTP_BEGIN_ARGS(setHeader, 1) HTTP_ARG_VAL(name, 0) HTTP_ARG_VAL(value, 0) HTTP_ARG_VAL(replace, 0) @@ -209,7 +209,7 @@ PHP_MINIT_FUNCTION(http_response_object) DCL_STATIC_PROP_N(PROTECTED, cacheControl); DCL_STATIC_PROP_N(PROTECTED, contentType); DCL_STATIC_PROP_N(PROTECTED, contentDisposition); - DCL_STATIC_PROP(PROTECTED, long, bufferSize, HTTP_SENDBUF_SIZE); + DCL_STATIC_PROP(PROTECTED, long, bufferSize, 0); DCL_STATIC_PROP(PROTECTED, double, throttleDelay, 0.0); #ifndef WONKY @@ -232,7 +232,7 @@ static void _http_grab_response_headers(void *data, void *arg TSRMLS_DC) /* ### USERLAND ### */ -/* {{{ proto static bool HttpResponse::setHeader(string name, mixed value[, bool replace = true]) +/* {{{ proto static bool HttpResponse::setHeader(string name[, mixed value[, bool replace = true]]) * * Send an HTTP header. * @@ -251,9 +251,9 @@ PHP_METHOD(HttpResponse, setHeader) zend_bool replace = 1; char *name; int name_len = 0; - zval *value = NULL, *orig = NULL; + zval *value = NULL; - if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz/!|b", &name, &name_len, &value, &replace)) { + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|z/!b", &name, &name_len, &value, &replace)) { RETURN_FALSE; } if (SG(headers_sent)) { @@ -264,39 +264,8 @@ PHP_METHOD(HttpResponse, setHeader) http_error(HE_WARNING, HTTP_E_HEADER, "Cannot send anonymous headers"); RETURN_FALSE; } - - /* delete header if value == null */ - if (!value || Z_TYPE_P(value) == IS_NULL) { - RETURN_SUCCESS(http_send_header_ex(name, name_len, "", 0, replace, NULL)); - } - /* send multiple header if replace is false and value is an array */ - if (!replace && Z_TYPE_P(value) == IS_ARRAY) { - zval **data; - HashPosition pos; - - FOREACH_VAL(pos, value, data) { - zval *orig = *data; - - convert_to_string_ex(data); - if (SUCCESS != http_send_header_ex(name, name_len, Z_STRVAL_PP(data), Z_STRLEN_PP(data), 0, NULL)) { - if (orig != *data) { - zval_ptr_dtor(data); - } - RETURN_FALSE; - } - if (orig != *data) { - zval_ptr_dtor(data); - } - } - RETURN_TRUE; - } - /* send standard header */ - orig = value; - convert_to_string_ex(&value); - RETVAL_SUCCESS(http_send_header_ex(name, name_len, Z_STRVAL_P(value), Z_STRLEN_P(value), replace, NULL)); - if (orig != value) { - zval_ptr_dtor(&value); - } + http_send_header_zval_ex(name, name_len, &value, replace); + RETURN_TRUE; } /* }}} */ @@ -384,7 +353,7 @@ PHP_METHOD(HttpResponse, getCache) { NO_ARGS; - IF_RETVAL_USED { + if (return_value_used) { zval *cache_p, *cache = convert_to_type_ex(IS_BOOL, GET_STATIC_PROP(cache), &cache_p); RETVAL_ZVAL(cache, 1, 0); @@ -426,7 +395,7 @@ PHP_METHOD(HttpResponse, getGzip) { NO_ARGS; - IF_RETVAL_USED { + if (return_value_used) { zval *gzip_p, *gzip = convert_to_type_ex(IS_BOOL, GET_STATIC_PROP(gzip), &gzip_p); RETVAL_ZVAL(gzip, 1, 0); @@ -485,7 +454,7 @@ PHP_METHOD(HttpResponse, getCacheControl) { NO_ARGS; - IF_RETVAL_USED { + if (return_value_used) { zval *ccontrol_p, *ccontrol = convert_to_type_ex(IS_STRING, GET_STATIC_PROP(cacheControl), &ccontrol_p); RETVAL_ZVAL(ccontrol, 1, 0); @@ -532,7 +501,7 @@ PHP_METHOD(HttpResponse, getContentType) { NO_ARGS; - IF_RETVAL_USED { + if (return_value_used) { zval *ctype_p, *ctype = convert_to_type_ex(IS_STRING, GET_STATIC_PROP(contentType), &ctype_p); RETVAL_ZVAL(ctype, 1, 0); @@ -573,8 +542,8 @@ PHP_METHOD(HttpResponse, guessContentType) { zval *data = GET_STATIC_PROP(data); ct = http_guess_content_type(magic_file, magic_mode, Z_STRVAL_P(data), Z_STRLEN_P(data), SEND_DATA); + break; } - break; case SEND_RSRC: { @@ -583,12 +552,12 @@ PHP_METHOD(HttpResponse, guessContentType) z->type = IS_RESOURCE; php_stream_from_zval(s, &z); ct = http_guess_content_type(magic_file, magic_mode, s, 0, SEND_RSRC); + break; } - break; default: ct = http_guess_content_type(magic_file, magic_mode, Z_STRVAL_P(GET_STATIC_PROP(file)), 0, -1); - break; + break; } if (ct) { UPD_STATIC_PROP(string, contentType, ct); @@ -643,7 +612,7 @@ PHP_METHOD(HttpResponse, getContentDisposition) { NO_ARGS; - IF_RETVAL_USED { + if (return_value_used) { zval *cd_p, *cd = convert_to_type_ex(IS_STRING, GET_STATIC_PROP(contentDisposition), &cd_p); RETVAL_ZVAL(cd, 1, 0); @@ -686,7 +655,7 @@ PHP_METHOD(HttpResponse, getETag) { NO_ARGS; - IF_RETVAL_USED { + if (return_value_used) { zval *etag_p, *etag = convert_to_type_ex(IS_STRING, GET_STATIC_PROP(eTag), &etag_p); RETVAL_ZVAL(etag, 1, 0); @@ -729,7 +698,7 @@ PHP_METHOD(HttpResponse, getLastModified) { NO_ARGS; - IF_RETVAL_USED { + if (return_value_used) { zval *lm_p, *lm = convert_to_type_ex(IS_LONG, GET_STATIC_PROP(lastModified), &lm_p); RETVAL_ZVAL(lm, 1, 0); @@ -776,7 +745,7 @@ PHP_METHOD(HttpResponse, getThrottleDelay) { NO_ARGS; - IF_RETVAL_USED { + if (return_value_used) { zval *delay_p, *delay = convert_to_type_ex(IS_DOUBLE, GET_STATIC_PROP(throttleDelay), &delay_p); RETVAL_ZVAL(delay, 1, 0); @@ -822,7 +791,7 @@ PHP_METHOD(HttpResponse, getBufferSize) { NO_ARGS; - IF_RETVAL_USED { + if (return_value_used) { zval *size_p, *size = convert_to_type_ex(IS_LONG, GET_STATIC_PROP(bufferSize), &size_p); RETVAL_ZVAL(size, 1, 0); @@ -848,7 +817,7 @@ PHP_METHOD(HttpResponse, setData) char *etag; zval *the_data; - if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &the_data)) { + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z/", &the_data)) { RETURN_FALSE; } if (Z_TYPE_P(the_data) != IS_STRING) { @@ -880,7 +849,7 @@ PHP_METHOD(HttpResponse, getData) { NO_ARGS; - IF_RETVAL_USED { + if (return_value_used) { zval *the_data = GET_STATIC_PROP(data); RETURN_ZVAL(the_data, 1, 0); @@ -939,7 +908,7 @@ PHP_METHOD(HttpResponse, getStream) { NO_ARGS; - IF_RETVAL_USED { + if (return_value_used) { zval *stream_p; RETVAL_RESOURCE(Z_LVAL_P(convert_to_type_ex(IS_LONG, GET_STATIC_PROP(stream), &stream_p))); @@ -998,7 +967,7 @@ PHP_METHOD(HttpResponse, getFile) { NO_ARGS; - IF_RETVAL_USED { + if (return_value_used) { zval *the_file_p, *the_file = convert_to_type_ex(IS_STRING, GET_STATIC_PROP(file), &the_file_p); RETVAL_ZVAL(the_file, 1, 0); @@ -1094,7 +1063,11 @@ PHP_METHOD(HttpResponse, send) cctl = convert_to_type_ex(IS_STRING, GET_STATIC_PROP(cacheControl), &cctl_p); if (Z_LVAL_P(lmod) || Z_STRLEN_P(etag)) { - http_send_cache_control(Z_STRVAL_P(cctl), Z_STRLEN_P(cctl)); + if (Z_STRLEN_P(cctl)) { + http_send_cache_control(Z_STRVAL_P(cctl), Z_STRLEN_P(cctl)); + } else { + http_send_cache_control(HTTP_DEFAULT_CACHECONTROL, lenof(HTTP_DEFAULT_CACHECONTROL)); + } if (Z_STRLEN_P(etag)) { http_send_etag(Z_STRVAL_P(etag), Z_STRLEN_P(etag)); } @@ -1150,14 +1123,10 @@ PHP_METHOD(HttpResponse, send) } /* gzip */ - HTTP_G->send.deflate.encoding = zval_is_true(GET_STATIC_PROP(gzip)); + HTTP_G->send.deflate.response = zval_is_true(GET_STATIC_PROP(gzip)); - /* start ob */ - php_start_ob_buffer(NULL, HTTP_G->send.buffer_size, 0 TSRMLS_CC); - /* send */ - switch (Z_LVAL_P(GET_STATIC_PROP(mode))) - { + switch (Z_LVAL_P(GET_STATIC_PROP(mode))) { case SEND_DATA: { zval *zdata_p, *zdata = convert_to_type_ex(IS_STRING, GET_STATIC_PROP(data), &zdata_p); @@ -1210,7 +1179,7 @@ PHP_METHOD(HttpResponse, capture) UPD_STATIC_PROP(long, catch, 1); php_end_ob_buffers(0 TSRMLS_CC); - php_start_ob_buffer(NULL, 40960, 0 TSRMLS_CC); + php_start_ob_buffer(NULL, 0, 0 TSRMLS_CC); /* register shutdown function */ {