X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_response_object.c;h=5ca8edd70fdb8f75a0039125f6efc1e517c43f36;hp=aee8612c182f63866b667df88da979aa6435fb6a;hb=4b918f89dfd55ec1b4cc928b50f33e35567ed533;hpb=3f9e9e90fecd011647139f2dc32ec616904b32b5

diff --git a/http_response_object.c b/http_response_object.c
index aee8612..5ca8edd 100644
--- a/http_response_object.c
+++ b/http_response_object.c
@@ -353,7 +353,7 @@ PHP_METHOD(HttpResponse, setContentDisposition)
 	}
 
 	spprintf(&cd, 0, HTTP_CONTENTDISPOSITION_TEMPLATE, send_inline ? "inline" : "attachment", file);
-	ZVAL_STRING_FREE(GET_STATIC_PROP(contentDisposition), cd, 0);
+	SET_STATIC_PROP_STRING(contentDisposition, cd, 0);
 	RETURN_TRUE;
 }
 /* }}} */
@@ -386,7 +386,8 @@ PHP_METHOD(HttpResponse, setETag)
 		RETURN_FALSE;
 	}
 
-	ZVAL_STRINGL_FREE(GET_STATIC_PROP(eTag), etag, etag_len, 1);
+	USE_STATIC_PROP();
+	SET_STATIC_PROP_STRINGL(eTag, etag, etag_len, 1);
 	RETURN_TRUE;
 }
 /* }}} */
@@ -475,6 +476,10 @@ PHP_METHOD(HttpResponse, setData)
 	SET_STATIC_PROP(data, the_data);
 	ZVAL_LONG(GET_STATIC_PROP(lastModified), http_last_modified(the_data, SEND_DATA));
 	ZVAL_LONG(GET_STATIC_PROP(mode), SEND_DATA);
+	if (!Z_STRLEN_P(GET_STATIC_PROP(eTag))) {
+		SET_STATIC_PROP_STRING(eTag, http_etag(Z_STRVAL_P(the_data), Z_STRLEN_P(the_data), SEND_DATA), 0);
+	}
+
 	RETURN_TRUE;
 }
 /* }}} */
@@ -506,12 +511,17 @@ PHP_METHOD(HttpResponse, setStream)
 	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &the_stream)) {
 		RETURN_FALSE;
 	}
+	zend_list_addref(Z_LVAL_P(the_stream));
+	php_stream_from_zval(the_real_stream, &the_stream);
 
 	USE_STATIC_PROP();
-	php_stream_from_zval(the_real_stream, &the_stream);
 	ZVAL_LONG(GET_STATIC_PROP(stream), Z_LVAL_P(the_stream));
 	ZVAL_LONG(GET_STATIC_PROP(lastModified), http_last_modified(the_real_stream, SEND_RSRC));
 	ZVAL_LONG(GET_STATIC_PROP(mode), SEND_RSRC);
+	if (!Z_STRLEN_P(GET_STATIC_PROP(eTag))) {
+		SET_STATIC_PROP_STRING(eTag, http_etag(the_real_stream, 0, SEND_RSRC), 0);
+	}
+
 	RETURN_TRUE;
 }
 /* }}} */
@@ -547,6 +557,9 @@ PHP_METHOD(HttpResponse, setFile)
 	SET_STATIC_PROP(file, the_file);
 	ZVAL_LONG(GET_STATIC_PROP(lastModified), http_last_modified(the_file, -1));
 	ZVAL_LONG(GET_STATIC_PROP(mode), -1);
+	if (!Z_STRLEN_P(GET_STATIC_PROP(eTag))) {
+		SET_STATIC_PROP_STRING(eTag, http_etag(the_file, 0, -1), 0);
+	}
 
 	RETURN_TRUE;
 }
@@ -579,17 +592,23 @@ PHP_METHOD(HttpResponse, send)
 	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &clean_ob)) {
 		RETURN_FALSE;
 	}
+	if (SG(headers_sent)) {
+		http_error(E_WARNING, HTTP_E_HEADER, "Cannot send HttpResponse, headers have already been sent");
+		RETURN_FALSE;
+	}
 
 	if (clean_ob) {
 		/* interrupt on-the-fly etag generation */
 		HTTP_G(etag).started = 0;
 		/* discard previous output buffers */
-		//php_end_ob_buffers(0 TSRMLS_CC);
+		php_end_ob_buffers(0 TSRMLS_CC);
 	}
 
 	/* gzip */
 	if (Z_LVAL_P(GET_STATIC_PROP(gzip))) {
-		php_start_ob_buffer_named("ob_gzhandler", 0, 1 TSRMLS_CC);
+		php_start_ob_buffer_named("ob_gzhandler", 0, 0 TSRMLS_CC);
+	} else {
+		php_start_ob_buffer(NULL, 0, 0 TSRMLS_CC);
 	}
 
 	/* caching */
@@ -602,7 +621,7 @@ PHP_METHOD(HttpResponse, send)
 		lmod = GET_STATIC_PROP(lastModified);
 		cctl = GET_STATIC_PROP(cacheControl);
 
-		http_cache_etag(Z_STRVAL_P(etag), Z_STRLEN_P(etag),Z_STRVAL_P(cctl), Z_STRLEN_P(cctl));
+		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));
 	}
 
@@ -612,7 +631,14 @@ PHP_METHOD(HttpResponse, send)
 		if (Z_STRLEN_P(ctype)) {
 			http_send_content_type(Z_STRVAL_P(ctype), Z_STRLEN_P(ctype));
 		} else {
-			http_send_content_type("application/x-octetstream", lenof("application/x-octetstream"));
+			char *ctypes = INI_STR("default_mimetype");
+			size_t ctlen = ctypes ? strlen(ctypes) : 0;
+
+			if (ctlen) {
+				http_send_content_type(ctypes, ctlen);
+			} else {
+				http_send_content_type("application/x-octetstream", lenof("application/x-octetstream"));
+			}
 		}
 	}
 
@@ -648,6 +674,7 @@ PHP_METHOD(HttpResponse, send)
 			{
 				php_stream *the_real_stream;
 				zval *the_stream = GET_STATIC_PROP(stream);
+				the_stream->type = IS_RESOURCE;
 				php_stream_from_zval(the_real_stream, &the_stream);
 				RETURN_SUCCESS(http_send_stream(the_real_stream));
 			}