X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_response_object.c;h=8b00412771d531ee6c6e051e6c9fadc119354ebb;hb=fe0761a31f82ea9807f9dcdc4bce3e9de9c766b4;hp=918647dc721db4c14269f865728491afcefc6892;hpb=1a4ecd0664889f053891e861096f2ae1bc23e6e6;p=m6w6%2Fext-http diff --git a/http_response_object.c b/http_response_object.c index 918647d..8b00412 100644 --- a/http_response_object.c +++ b/http_response_object.c @@ -130,6 +130,7 @@ HTTP_END_ARGS; HTTP_EMPTY_ARGS(getRequestHeaders); HTTP_EMPTY_ARGS(getRequestBody); +HTTP_EMPTY_ARGS(getRequestBodyStream); #define http_grab_response_headers _http_grab_response_headers static void _http_grab_response_headers(void *data, void *arg TSRMLS_DC); @@ -186,6 +187,7 @@ zend_function_entry http_response_object_fe[] = { HTTP_RESPONSE_ALIAS(status, http_send_status) HTTP_RESPONSE_ALIAS(getRequestHeaders, http_get_request_headers) HTTP_RESPONSE_ALIAS(getRequestBody, http_get_request_body) + HTTP_RESPONSE_ALIAS(getRequestBodyStream, http_get_request_body_stream) EMPTY_FUNCTION_ENTRY }; @@ -207,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 @@ -331,7 +333,7 @@ PHP_METHOD(HttpResponse, getHeader) zend_hash_init(&headers_ht, sizeof(zval *), NULL, ZVAL_PTR_DTOR, 0); if ( (SUCCESS == http_parse_headers_ex(PHPSTR_VAL(&headers), &headers_ht, 1)) && - (SUCCESS == zend_hash_find(&headers_ht, name, name_len + 1, (void **) &header))) { + (SUCCESS == zend_hash_find(&headers_ht, name, name_len + 1, (void *) &header))) { RETVAL_ZVAL(*header, 1, 0); } else { RETVAL_NULL(); @@ -382,7 +384,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); @@ -424,7 +426,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); @@ -483,7 +485,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); @@ -530,7 +532,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); @@ -571,8 +573,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: { @@ -581,12 +583,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); @@ -641,7 +643,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); @@ -684,7 +686,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); @@ -727,7 +729,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); @@ -774,7 +776,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); @@ -820,7 +822,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); @@ -878,7 +880,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); @@ -937,7 +939,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))); @@ -996,7 +998,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); @@ -1092,7 +1094,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)); } @@ -1148,14 +1154,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); @@ -1208,7 +1210,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 */ {