X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_message_body.c;h=ab1ec29bdc00b348cb360c5c5143f0fd1bf68c7a;hp=4be45ef0ce0b7d26d688e4811b5e271db7036d58;hb=d67af7f8dc8100a72ce2d5706c7d2f8d0d89796f;hpb=731b6a841374147b766c850b2a90c6bfade6f9f1

diff --git a/php_http_message_body.c b/php_http_message_body.c
index 4be45ef..ab1ec29 100644
--- a/php_http_message_body.c
+++ b/php_http_message_body.c
@@ -100,7 +100,7 @@ void php_http_message_body_free(php_http_message_body_t **body_ptr)
 			TSRMLS_FETCH_FROM_CTX(body->ts);
 			/* NOFIXME: shows leakinfo in DEBUG mode */
 			zend_list_delete(body->stream_id);
-			STR_FREE(body->boundary);
+			PTR_FREE(body->boundary);
 			efree(body);
 		}
 		*body_ptr = NULL;
@@ -128,25 +128,29 @@ const char *php_http_message_body_boundary(php_http_message_body_t *body)
 
 char *php_http_message_body_etag(php_http_message_body_t *body)
 {
-	const php_stream_statbuf *ssb = php_http_message_body_stat(body);
+	php_http_etag_t *etag;
+	php_stream *s = php_http_message_body_stream(body);
 	TSRMLS_FETCH_FROM_CTX(body->ts);
 
 	/* real file or temp buffer ? */
-	if (ssb && ssb->sb.st_mtime) {
-		char *etag;
+	if (s->ops != &php_stream_temp_ops && s->ops != &php_stream_memory_ops) {
+		php_stream_stat(php_http_message_body_stream(body), &body->ssb);
 
-		spprintf(&etag, 0, "%lx-%lx-%lx", ssb->sb.st_ino, ssb->sb.st_mtime, ssb->sb.st_size);
-		return etag;
-	} else {
-		php_http_etag_t *etag = php_http_etag_init(PHP_HTTP_G->env.etag_mode TSRMLS_CC);
+		if (body->ssb.sb.st_mtime) {
+			char *etag;
 
-		if (etag) {
-			php_http_message_body_to_callback(body, (php_http_pass_callback_t) php_http_etag_update, etag, 0, 0);
-			return php_http_etag_finish(etag);
-		} else {
-			return NULL;
+			spprintf(&etag, 0, "%lx-%lx-%lx", body->ssb.sb.st_ino, body->ssb.sb.st_mtime, body->ssb.sb.st_size);
+			return etag;
 		}
 	}
+
+	/* content based */
+	if ((etag = php_http_etag_init(PHP_HTTP_G->env.etag_mode TSRMLS_CC))) {
+		php_http_message_body_to_callback(body, (php_http_pass_callback_t) php_http_etag_update, etag, 0, 0);
+		return php_http_etag_finish(etag);
+	}
+
+	return NULL;
 }
 
 void php_http_message_body_to_string(php_http_message_body_t *body, char **buf, size_t *len, off_t offset, size_t forlen)
@@ -482,9 +486,11 @@ static size_t splitbody(void *opaque, char *buf, size_t len TSRMLS_DC)
 			}
 
 			if (!first_boundary) {
+				int st;
 				/* this is not the first boundary, read rest of this message */
 				php_http_buffer_append(&arg->buf, buf, real_boundary - buf);
-				php_http_message_parser_parse(arg->parser, &arg->buf, 0, &arg->parser->message);
+				st=php_http_message_parser_parse(arg->parser, &arg->buf, 0, &arg->parser->message);
+				//fprintf(stderr, "1 st=%d\n",st);
 			}
 
 			/* move after the boundary */
@@ -524,9 +530,11 @@ static size_t splitbody(void *opaque, char *buf, size_t len TSRMLS_DC)
 
 	/* let there be room for the next boundary */
 	if (len > arg->boundary_len) {
+		int st;
 		consumed += len - arg->boundary_len;
 		php_http_buffer_append(&arg->buf, buf, len - arg->boundary_len);
-		php_http_message_parser_parse(arg->parser, &arg->buf, 0, &arg->parser->message);
+		st=php_http_message_parser_parse(arg->parser, &arg->buf, 0, &arg->parser->message);
+		//fprintf(stderr, "2 st=%d\n", st);
 	}
 
 	arg->consumed += consumed;
@@ -557,7 +565,7 @@ php_http_message_t *php_http_message_body_split(php_http_message_body_t *body, c
 	php_http_buffer_free(&tmp);
 	php_http_message_parser_free(&arg.parser);
 	php_http_buffer_dtor(&arg.buf);
-	STR_FREE(arg.boundary_str);
+	PTR_FREE(arg.boundary_str);
 
 	return msg;
 }