X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_buffer.c;h=ef0abcd067f7c186953f81e78f64d61ba8dfbc82;hp=5a3927e17cfc7dc9071641fc2d68da5d65ca6e75;hb=4957436be59f65fae9cdbaec1dc865acc680862f;hpb=29a54250b58e444974ae19840194e214cab80bd5

diff --git a/php_http_buffer.c b/php_http_buffer.c
index 5a3927e..ef0abcd 100644
--- a/php_http_buffer.c
+++ b/php_http_buffer.c
@@ -72,6 +72,19 @@ PHP_HTTP_BUFFER_API size_t php_http_buffer_resize_ex(php_http_buffer_t *buf, siz
 	return 0;
 }
 
+PHP_HTTP_BUFFER_API char *php_http_buffer_account(php_http_buffer_t *buf, size_t to_account)
+{
+	/* it's probably already too late but check anyway */
+	if (to_account > buf->free) {
+		return NULL;
+	}
+
+	buf->free -= to_account;
+	buf->used += to_account;
+
+	return buf->data + buf->used;
+}
+
 PHP_HTTP_BUFFER_API size_t php_http_buffer_shrink(php_http_buffer_t *buf)
 {
 	/* avoid another realloc on fixation */
@@ -384,22 +397,22 @@ PHP_HTTP_BUFFER_API void php_http_buffer_chunked_output(php_http_buffer_t **s, c
 	STR_FREE(chunk);
 }
 
-PHP_HTTP_BUFFER_API ssize_t php_http_buffer_passthru(php_http_buffer_t *s, size_t chunk_size, php_http_buffer_pass_func_t passin, void *passin_arg, php_http_buffer_pass_func_t passon, void *passon_arg TSRMLS_DC)
+PHP_HTTP_BUFFER_API ssize_t php_http_buffer_passthru(php_http_buffer_t **s, size_t chunk_size, php_http_buffer_pass_func_t passin, void *passin_arg, php_http_buffer_pass_func_t passon, void *passon_arg TSRMLS_DC)
 {
-	size_t passed_on = 0, passed_in = php_http_buffer_chunked_input(&s, chunk_size, passin, passin_arg TSRMLS_CC);
+	size_t passed_on = 0, passed_in = php_http_buffer_chunked_input(s, chunk_size, passin, passin_arg TSRMLS_CC);
 
 	if (passed_in == PHP_HTTP_BUFFER_PASS0) {
 		return passed_in;
 	}
-	if (passed_in) {
-		passed_on = passon(passon_arg, s->data, passed_in TSRMLS_CC);
+	if (passed_in || (*s)->used) {
+		passed_on = passon(passon_arg, (*s)->data, (*s)->used TSRMLS_CC);
 
 		if (passed_on == PHP_HTTP_BUFFER_PASS0) {
 			return passed_on;
 		}
 
 		if (passed_on) {
-			php_http_buffer_cut(s, 0, passed_on);
+			php_http_buffer_cut(*s, 0, passed_on);
 		}
 	}