X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_message.c;h=39f857d5d7c280d30f140311d94f965190384f6a;hp=a93d9f5632c5f0c2f97053b60a271d94424717e3;hb=25f0c16244fc5f8b2c9d9bfddab8a541d2521789;hpb=64722314d70dc547e477d87927c22b598aa463d0

diff --git a/php_http_message.c b/php_http_message.c
index a93d9f5..39f857d 100644
--- a/php_http_message.c
+++ b/php_http_message.c
@@ -20,7 +20,7 @@ PHP_HTTP_API zend_bool php_http_message_info_callback(php_http_message_t **messa
 	php_http_message_t *old = *message;
 
 	/* advance message */
-	if (!old || old->type || zend_hash_num_elements(&old->hdrs) || PHP_HTTP_BUFFER_LEN(old)) {
+	if (!old || old->type || zend_hash_num_elements(&old->hdrs)) {
 		(*message) = php_http_message_init(NULL, 0 TSRMLS_CC);
 		(*message)->parent = old;
 		if (headers) {
@@ -89,7 +89,7 @@ PHP_HTTP_API php_http_message_t *php_http_message_init_env(php_http_message_t *m
 			}
 			
 			php_http_env_get_response_headers(&message->hdrs TSRMLS_CC);
-
+#if PHP_VERSION_ID >= 50400
 			if (php_output_get_level(TSRMLS_C)) {
 				if (php_output_get_status(TSRMLS_C) & PHP_OUTPUT_SENT) {
 					php_http_error(HE_WARNING, PHP_HTTP_E_RUNTIME, "Could not fetch response body, output has already been sent at %s:%d", php_output_get_start_filename(TSRMLS_C), php_output_get_start_lineno(TSRMLS_C));
@@ -102,6 +102,7 @@ PHP_HTTP_API php_http_message_t *php_http_message_init_env(php_http_message_t *m
 					zval_dtor(&tval);
 				}
 			}
+#endif
 			break;
 			
 		default:
@@ -117,10 +118,11 @@ PHP_HTTP_API php_http_message_t *php_http_message_init_env(php_http_message_t *m
 	return message;
 }
 
-PHP_HTTP_API php_http_message_t *php_http_message_parse(php_http_message_t *msg, const char *str, size_t len TSRMLS_DC)
+PHP_HTTP_API php_http_message_t *php_http_message_parse(php_http_message_t *msg, const char *str, size_t len, zend_bool greedy TSRMLS_DC)
 {
 	php_http_message_parser_t p;
 	php_http_buffer_t buf;
+	unsigned flags = PHP_HTTP_MESSAGE_PARSER_CLEANUP;
 	int free_msg;
 
 	php_http_buffer_from_string_ex(&buf, str, len);
@@ -130,7 +132,10 @@ PHP_HTTP_API php_http_message_t *php_http_message_parse(php_http_message_t *msg,
 		msg = php_http_message_init(NULL, 0 TSRMLS_CC);
 	}
 
-	if (FAILURE == php_http_message_parser_parse(&p, &buf, PHP_HTTP_MESSAGE_PARSER_CLEANUP, &msg)) {
+	if (greedy) {
+		flags |= PHP_HTTP_MESSAGE_PARSER_GREEDY;
+	}
+	if (FAILURE == php_http_message_parser_parse(&p, &buf, flags, &msg)) {
 		if (free_msg) {
 			php_http_message_free(&msg);
 		}
@@ -272,9 +277,10 @@ PHP_HTTP_API void php_http_message_update_headers(php_http_message_t *msg)
 {
 	zval *h;
 	size_t size;
-	TSRMLS_FETCH_FROM_CTX(msg->ts);
 
-	if ((size = php_http_message_body_size(&msg->body))) {
+	if (php_http_message_body_stream(&msg->body)->readfilters.head) {
+		/* if a read stream filter is attached to the body the caller must also care for the headers */
+	} else if ((size = php_http_message_body_size(&msg->body))) {
 		MAKE_STD_ZVAL(h);
 		ZVAL_LONG(h, size);
 		zend_hash_update(&msg->hdrs, "Content-Length", sizeof("Content-Length"), &h, sizeof(zval *), NULL);
@@ -316,11 +322,11 @@ static zval *message_header_strval(zval **header TSRMLS_DC)
 		FOREACH_VAL(pos, *header, val) {
 			zval *strval = message_header_strval(val TSRMLS_CC);
 
-			php_http_buffer_appendf(&str, PHP_HTTP_BUFFER_LEN(&str) ? ", %s":"%s", Z_STRVAL_P(strval));
+			php_http_buffer_appendf(&str, str.used ? ", %s":"%s", Z_STRVAL_P(strval));
 			zval_ptr_dtor(&strval);
 		}
 		php_http_buffer_fix(&str);
-		ZVAL_STRINGL(ret, PHP_HTTP_BUFFER_VAL(&str), PHP_HTTP_BUFFER_LEN(&str), 0);
+		ZVAL_STRINGL(ret, str.data, str.used, 0);
 	} else  {
 		ret = php_http_zsep(1, IS_STRING, *header);
 	}
@@ -392,7 +398,7 @@ PHP_HTTP_API void php_http_message_to_callback(php_http_message_t *msg, php_http
 
 	php_http_buffer_init_ex(&str, 0x1000, 0);
 	message_headers(msg, &str);
-	cb(cb_arg, PHP_HTTP_BUFFER_VAL(&str), PHP_HTTP_BUFFER_LEN(&str));
+	cb(cb_arg, str.data, str.used);
 	php_http_buffer_dtor(&str);
 
 	if (php_http_message_body_size(&msg->body)) {
@@ -565,6 +571,7 @@ PHP_HTTP_API void php_http_message_free(php_http_message_t **message)
 
 PHP_HTTP_BEGIN_ARGS(__construct, 0)
 	PHP_HTTP_ARG_VAL(message, 0)
+	PHP_HTTP_ARG_VAL(greedy, 0)
 PHP_HTTP_END_ARGS;
 
 PHP_HTTP_EMPTY_ARGS(getBody);
@@ -671,9 +678,9 @@ PHP_HTTP_BEGIN_ARGS(isMultipart, 0)
 PHP_HTTP_END_ARGS;
 PHP_HTTP_EMPTY_ARGS(splitMultipartBody);
 
-static zval *php_http_message_object_read_prop(zval *object, zval *member, int type, const zend_literal *literal_key TSRMLS_DC);
-static void php_http_message_object_write_prop(zval *object, zval *member, zval *value, const zend_literal *literal_key TSRMLS_DC);
-static zval **php_http_message_object_get_prop_ptr(zval *object, zval *member, const zend_literal *literal_key TSRMLS_DC);
+static zval *php_http_message_object_read_prop(zval *object, zval *member, int type PHP_HTTP_ZEND_LITERAL_DC TSRMLS_DC);
+static void php_http_message_object_write_prop(zval *object, zval *member, zval *value PHP_HTTP_ZEND_LITERAL_DC TSRMLS_DC);
+static zval **php_http_message_object_get_prop_ptr(zval *object, zval *member PHP_HTTP_ZEND_LITERAL_DC TSRMLS_DC);
 static HashTable *php_http_message_object_get_props(zval *object TSRMLS_DC);
 
 static zend_class_entry *php_http_message_class_entry;
@@ -867,11 +874,14 @@ static void php_http_message_object_prophandler_get_parent_message(php_http_mess
 }
 static void php_http_message_object_prophandler_set_parent_message(php_http_message_object_t *obj, zval *value TSRMLS_DC) {
 	if (Z_TYPE_P(value) == IS_OBJECT && instanceof_function(Z_OBJCE_P(value), php_http_message_class_entry TSRMLS_CC)) {
+		php_http_message_object_t *parent_obj = zend_object_store_get_object(value TSRMLS_CC);
+
 		if (obj->message->parent) {
 			zend_objects_store_del_ref_by_handle(obj->parent.handle TSRMLS_CC);
 		}
 		Z_OBJ_ADDREF_P(value);
 		obj->parent = Z_OBJVAL_P(value);
+		obj->message->parent = parent_obj->message;
 	}
 }
 
@@ -891,7 +901,7 @@ PHP_MINIT_FUNCTION(http_message)
 	zend_hash_init(&php_http_message_object_prophandlers, 9, NULL, NULL, 1);
 	zend_declare_property_long(php_http_message_class_entry, ZEND_STRL("type"), PHP_HTTP_NONE, ZEND_ACC_PROTECTED TSRMLS_CC);
 	php_http_message_object_add_prophandler(ZEND_STRL("type"), php_http_message_object_prophandler_get_type, php_http_message_object_prophandler_set_type);
-	zend_declare_property_string(php_http_message_class_entry, ZEND_STRL("body"), "", ZEND_ACC_PROTECTED TSRMLS_CC);
+	zend_declare_property_null(php_http_message_class_entry, ZEND_STRL("body"), ZEND_ACC_PROTECTED TSRMLS_CC);
 	php_http_message_object_add_prophandler(ZEND_STRL("body"), php_http_message_object_prophandler_get_body, php_http_message_object_prophandler_set_body);
 	zend_declare_property_string(php_http_message_class_entry, ZEND_STRL("requestMethod"), "", ZEND_ACC_PROTECTED TSRMLS_CC);
 	php_http_message_object_add_prophandler(ZEND_STRL("requestMethod"), php_http_message_object_prophandler_get_request_method, php_http_message_object_prophandler_set_request_method);
@@ -933,7 +943,7 @@ void php_http_message_object_reverse(zval *this_ptr, zval *return_value TSRMLS_D
 	if (i > 1) {
 		zend_object_value *ovalues = NULL;
 		php_http_message_object_t **objects = NULL;
-		int last = i - 1;
+		int last;
 
 		objects = ecalloc(i, sizeof(**objects));
 		ovalues = ecalloc(i, sizeof(*ovalues));
@@ -1140,7 +1150,7 @@ void php_http_message_object_free(void *object TSRMLS_DC)
 }
 
 
-static zval **php_http_message_object_get_prop_ptr(zval *object, zval *member, const zend_literal *literal_key TSRMLS_DC)
+static zval **php_http_message_object_get_prop_ptr(zval *object, zval *member PHP_HTTP_ZEND_LITERAL_DC TSRMLS_DC)
 {
 	php_http_message_object_prophandler_t *handler;
 	zval *copy = php_http_ztyp(IS_STRING, member);
@@ -1151,10 +1161,10 @@ static zval **php_http_message_object_get_prop_ptr(zval *object, zval *member, c
 	}
 	zval_ptr_dtor(&copy);
 
-	return zend_get_std_object_handlers()->get_property_ptr_ptr(object, member, literal_key TSRMLS_CC);
+	return zend_get_std_object_handlers()->get_property_ptr_ptr(object, member PHP_HTTP_ZEND_LITERAL_CC TSRMLS_CC);
 }
 
-static zval *php_http_message_object_read_prop(zval *object, zval *member, int type, const zend_literal *literal_key TSRMLS_DC)
+static zval *php_http_message_object_read_prop(zval *object, zval *member, int type PHP_HTTP_ZEND_LITERAL_DC TSRMLS_DC)
 {
 	php_http_message_object_t *obj = zend_object_store_get_object(object TSRMLS_CC);
 	php_http_message_object_prophandler_t *handler;
@@ -1172,7 +1182,7 @@ static zval *php_http_message_object_read_prop(zval *object, zval *member, int t
 			return_value = NULL;
 		}
 	} else {
-		return_value = zend_get_std_object_handlers()->read_property(object, member, type, literal_key TSRMLS_CC);
+		return_value = zend_get_std_object_handlers()->read_property(object, member, type PHP_HTTP_ZEND_LITERAL_CC TSRMLS_CC);
 	}
 
 	zval_ptr_dtor(&copy);
@@ -1180,7 +1190,7 @@ static zval *php_http_message_object_read_prop(zval *object, zval *member, int t
 	return return_value;
 }
 
-static void php_http_message_object_write_prop(zval *object, zval *member, zval *value, const zend_literal *literal_key TSRMLS_DC)
+static void php_http_message_object_write_prop(zval *object, zval *member, zval *value PHP_HTTP_ZEND_LITERAL_DC TSRMLS_DC)
 {
 	php_http_message_object_t *obj = zend_object_store_get_object(object TSRMLS_CC);
 	php_http_message_object_prophandler_t *handler;
@@ -1189,7 +1199,7 @@ static void php_http_message_object_write_prop(zval *object, zval *member, zval
 	if (SUCCESS == php_http_message_object_get_prophandler(Z_STRVAL_P(copy), Z_STRLEN_P(copy), &handler)) {
 		handler->write(obj, value TSRMLS_CC);
 	} else {
-		zend_get_std_object_handlers()->write_property(object, member, value, literal_key TSRMLS_CC);
+		zend_get_std_object_handlers()->write_property(object, member, value PHP_HTTP_ZEND_LITERAL_CC TSRMLS_CC);
 	}
 
 	zval_ptr_dtor(&copy);
@@ -1280,24 +1290,33 @@ static HashTable *php_http_message_object_get_props(zval *object TSRMLS_DC)
 
 PHP_METHOD(HttpMessage, __construct)
 {
+	zend_bool greedy = 1;
 	zval *zmessage = NULL;
 	php_http_message_t *msg = NULL;
 	php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
 	with_error_handling(EH_THROW, php_http_exception_get_class_entry()) {
-		if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|z!", &zmessage) && zmessage) {
+		if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|z!b", &zmessage, &greedy) && zmessage) {
 			if (Z_TYPE_P(zmessage) == IS_RESOURCE) {
 				php_stream *s;
 				php_http_message_parser_t p;
 
 				php_stream_from_zval(s, &zmessage);
 				if (s && php_http_message_parser_init(&p TSRMLS_CC)) {
-					php_http_message_parser_parse_stream(&p, s, &msg);
+					unsigned flags = (greedy ? PHP_HTTP_MESSAGE_PARSER_GREEDY : 0);
+					
+					php_http_message_parser_parse_stream(&p, s, flags, &msg);
 					php_http_message_parser_dtor(&p);
 				}
+				
+				if (!msg) {
+					php_http_error(HE_THROW, PHP_HTTP_E_MESSAGE, "could not parse message from stream");
+				}
 			} else {
 				zmessage = php_http_ztyp(IS_STRING, zmessage);
-				msg = php_http_message_parse(NULL, Z_STRVAL_P(zmessage), Z_STRLEN_P(zmessage) TSRMLS_CC);
+				if (!(msg = php_http_message_parse(NULL, Z_STRVAL_P(zmessage), Z_STRLEN_P(zmessage), greedy TSRMLS_CC))) {
+					php_http_error(HE_THROW, PHP_HTTP_E_MESSAGE, "could not parse message: %.*s", MIN(25, Z_STRLEN_P(zmessage)), Z_STRVAL_P(zmessage));
+				}
 				zval_ptr_dtor(&zmessage);
 			}
 
@@ -1307,8 +1326,6 @@ PHP_METHOD(HttpMessage, __construct)
 				if (obj->message->parent) {
 					obj->parent = php_http_message_object_new_ex(Z_OBJCE_P(getThis()), obj->message->parent, NULL TSRMLS_CC);
 				}
-			} else {
-				php_http_error(HE_THROW, PHP_HTTP_E_MESSAGE, "could not parse message: %.*s", 25, Z_STRVAL_P(zmessage));
 			}
 		}
 		if (!obj->message) {
@@ -1341,7 +1358,6 @@ PHP_METHOD(HttpMessage, setBody)
 
 	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &zbody, php_http_message_body_get_class_entry())) {
 		php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
-		php_http_message_body_object_t *body_obj = zend_object_store_get_object(zbody TSRMLS_CC);
 
 		if (!obj->message) {
 			obj->message = php_http_message_init(NULL, 0 TSRMLS_CC);
@@ -1356,10 +1372,10 @@ PHP_METHOD(HttpMessage, addBody)
 	zval *new_body;
 
 	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &new_body, php_http_message_body_get_class_entry())) {
-		php_http_message_body_object_t *old_obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+		php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 		php_http_message_body_object_t *new_obj = zend_object_store_get_object(new_body TSRMLS_CC);
 
-		php_http_message_body_to_callback(old_obj->body, (php_http_pass_callback_t) php_http_message_body_append, new_obj->body, 0, 0);
+		php_http_message_body_to_callback(new_obj->body, (php_http_pass_callback_t) php_http_message_body_append, &obj->message->body, 0, 0);
 	}
 	RETVAL_ZVAL(getThis(), 1, 0);
 }
@@ -1462,6 +1478,7 @@ PHP_METHOD(HttpMessage, addHeader)
 		if ((header = php_http_message_header(obj->message, name, name_len, 0))) {
 			convert_to_array(header);
 			zend_hash_next_index_insert(Z_ARRVAL_P(header), &zvalue, sizeof(void *), NULL);
+			zval_ptr_dtor(&header);
 		} else {
 			zend_symtable_update(&obj->message->hdrs, name, name_len + 1, &zvalue, sizeof(void *), NULL);
 		}
@@ -1875,7 +1892,7 @@ PHP_METHOD(HttpMessage, unserialize)
 			php_http_message_dtor(obj->message);
 			efree(obj->message);
 		}
-		if ((msg = php_http_message_parse(NULL, serialized, (size_t) length TSRMLS_CC))) {
+		if ((msg = php_http_message_parse(NULL, serialized, (size_t) length, 1 TSRMLS_CC))) {
 			obj->message = msg;
 		} else {
 			obj->message = php_http_message_init(NULL, 0 TSRMLS_CC);