X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_response_object.c;h=32bd5f87443886aa1a2dc5df8bf08d9025ef3d75;hb=1374172d6c717de67faf91519b100b5348329aee;hp=f7ba0b2f18aaab8a476093b68dd33b572ab2e284;hpb=5e06e2629f8cbe71bc2985bf7ca4f149bb08d482;p=m6w6%2Fext-http

diff --git a/http_response_object.c b/http_response_object.c
index f7ba0b2..32bd5f8 100644
--- a/http_response_object.c
+++ b/http_response_object.c
@@ -384,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);
@@ -426,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);
@@ -485,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);
@@ -532,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);
@@ -573,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:
 			{
@@ -583,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);
@@ -643,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);
@@ -686,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);
@@ -729,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);
@@ -776,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);
@@ -822,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);
@@ -880,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);
@@ -939,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)));
@@ -998,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);
@@ -1094,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));
 			}
@@ -1156,8 +1160,7 @@ PHP_METHOD(HttpResponse, send)
 	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);