X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_env_response.c;h=5b4682084278d460c6672caafa745177fd289c9a;hp=80043a22f089ff7d562a4822c935ff2b00ee7136;hb=2e55401943bf7835544aa37e2aeaedfac545a6bb;hpb=8d084b7e31a4985d75e74efbabf21a818513fd0f

diff --git a/php_http_env_response.c b/php_http_env_response.c
index 80043a2..5b46820 100644
--- a/php_http_env_response.c
+++ b/php_http_env_response.c
@@ -834,14 +834,18 @@ typedef struct php_http_env_response_stream_ctx {
 	long status_code;
 
 	php_stream *stream;
+	php_stream_filter *chunked_filter;
+	php_http_message_t *request;
 
 	unsigned started:1;
 	unsigned finished:1;
+	unsigned chunked:1;
 } php_http_env_response_stream_ctx_t;
 
 static ZEND_RESULT_CODE php_http_env_response_stream_init(php_http_env_response_t *r, void *init_arg)
 {
 	php_http_env_response_stream_ctx_t *ctx;
+	size_t buffer_size = 0x1000;
 
 	ctx = ecalloc(1, sizeof(*ctx));
 
@@ -849,7 +853,15 @@ static ZEND_RESULT_CODE php_http_env_response_stream_init(php_http_env_response_
 	++GC_REFCOUNT(ctx->stream->res);
 	ZEND_INIT_SYMTABLE(&ctx->header);
 	php_http_version_init(&ctx->version, 1, 1);
+	php_stream_set_option(ctx->stream, PHP_STREAM_OPTION_WRITE_BUFFER, PHP_STREAM_BUFFER_FULL, &buffer_size);
 	ctx->status_code = 200;
+	ctx->chunked = 1;
+	ctx->request = get_request(&r->options);
+
+	/* there are some limitations regarding TE:chunked, see https://tools.ietf.org/html/rfc7230#section-3.3.1 */
+	if (ctx->request && ctx->request->http.version.major == 1 && ctx->request->http.version.minor == 0) {
+		ctx->version.minor = 0;
+	}
 
 	r->ctx = ctx;
 
@@ -859,24 +871,33 @@ static void php_http_env_response_stream_dtor(php_http_env_response_t *r)
 {
 	php_http_env_response_stream_ctx_t *ctx = r->ctx;
 
+	if (ctx->chunked_filter) {
+		ctx->chunked_filter = php_stream_filter_remove(ctx->chunked_filter, 1);
+	}
 	zend_hash_destroy(&ctx->header);
 	zend_list_delete(ctx->stream->res);
 	efree(ctx);
 	r->ctx = NULL;
 }
-static void php_http_env_response_stream_header(php_http_env_response_stream_ctx_t *ctx, HashTable *header)
+static void php_http_env_response_stream_header(php_http_env_response_stream_ctx_t *ctx, HashTable *header, php_http_buffer_t *buf)
 {
 	zval *val;
 
 	ZEND_HASH_FOREACH_VAL(header, val)
 	{
 		if (Z_TYPE_P(val) == IS_ARRAY) {
-			php_http_env_response_stream_header(ctx, Z_ARRVAL_P(val));
+			php_http_env_response_stream_header(ctx, Z_ARRVAL_P(val), buf);
 		} else {
 			zend_string *zs = zval_get_string(val);
 
-			php_stream_write(ctx->stream, zs->val, zs->len);
-			php_stream_write_string(ctx->stream, PHP_HTTP_CRLF);
+			if (ctx->chunked) {
+				/* disable chunked transfer encoding if we've got an explicit content-length */
+				if (!strncasecmp(zs->val, "Content-Length:", lenof("Content-Length:"))) {
+					ctx->chunked = 0;
+				}
+			}
+			php_http_buffer_append(buf, zs->val, zs->len);
+			php_http_buffer_appends(buf, PHP_HTTP_CRLF);
 			zend_string_release(zs);
 		}
 	}
@@ -884,15 +905,45 @@ static void php_http_env_response_stream_header(php_http_env_response_stream_ctx
 }
 static ZEND_RESULT_CODE php_http_env_response_stream_start(php_http_env_response_stream_ctx_t *ctx)
 {
+	php_http_buffer_t header_buf;
+
 	if (ctx->started || ctx->finished) {
 		return FAILURE;
 	}
 
-	php_stream_printf(ctx->stream TSRMLS_CC, "HTTP/%u.%u %ld %s" PHP_HTTP_CRLF, ctx->version.major, ctx->version.minor, ctx->status_code, php_http_env_get_response_status_for_code(ctx->status_code));
-	php_http_env_response_stream_header(ctx, &ctx->header);
-	php_stream_write_string(ctx->stream, PHP_HTTP_CRLF);
-	ctx->started = 1;
-	return SUCCESS;
+	php_http_buffer_init(&header_buf);
+	php_http_buffer_appendf(&header_buf, "HTTP/%u.%u %ld %s" PHP_HTTP_CRLF, ctx->version.major, ctx->version.minor, ctx->status_code, php_http_env_get_response_status_for_code(ctx->status_code));
+
+	/* there are some limitations regarding TE:chunked, see https://tools.ietf.org/html/rfc7230#section-3.3.1 */
+	if (ctx->version.major == 1 && ctx->version.minor == 0) {
+		ctx->chunked = 0;
+	} else if (ctx->status_code == 204 || ctx->status_code/100 == 1) {
+		ctx->chunked = 0;
+	} else if (ctx->request && ctx->status_code/100 == 2 && !strcasecmp(ctx->request->http.info.request.method, "CONNECT")) {
+		ctx->chunked = 0;
+	}
+
+	php_http_env_response_stream_header(ctx, &ctx->header, &header_buf);
+
+	/* enable chunked transfer encoding */
+	if (ctx->chunked) {
+		php_http_buffer_appends(&header_buf, "Transfer-Encoding: chunked" PHP_HTTP_CRLF);
+	}
+
+	php_http_buffer_appends(&header_buf, PHP_HTTP_CRLF);
+
+	if (header_buf.used == php_stream_write(ctx->stream, header_buf.data, header_buf.used)) {
+		ctx->started = 1;
+	}
+	php_http_buffer_dtor(&header_buf);
+	php_stream_flush(ctx->stream);
+
+	if (ctx->chunked) {
+		ctx->chunked_filter = php_stream_filter_create("http.chunked_encode", NULL, 0);
+		php_stream_filter_append(&ctx->stream->writefilters, ctx->chunked_filter);
+	}
+
+	return ctx->started ? SUCCESS : FAILURE;
 }
 static long php_http_env_response_stream_get_status(php_http_env_response_t *r)
 {
@@ -1029,18 +1080,24 @@ static ZEND_RESULT_CODE php_http_env_response_stream_flush(php_http_env_response
 }
 static ZEND_RESULT_CODE php_http_env_response_stream_finish(php_http_env_response_t *r)
 {
-	php_http_env_response_stream_ctx_t *stream_ctx = r->ctx;
+	php_http_env_response_stream_ctx_t *ctx = r->ctx;
 
-	if (stream_ctx->finished) {
+	if (ctx->finished) {
 		return FAILURE;
 	}
-	if (!stream_ctx->started) {
-		if (SUCCESS != php_http_env_response_stream_start(stream_ctx)) {
+	if (!ctx->started) {
+		if (SUCCESS != php_http_env_response_stream_start(ctx)) {
 			return FAILURE;
 		}
 	}
 
-	stream_ctx->finished = 1;
+	php_stream_flush(ctx->stream);
+	if (ctx->chunked && ctx->chunked_filter) {
+		php_stream_filter_flush(ctx->chunked_filter, 1);
+		ctx->chunked_filter = php_stream_filter_remove(ctx->chunked_filter, 1 TSRMLS_CC);
+	}
+
+	ctx->finished = 1;
 
 	return SUCCESS;
 }