X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=php_http_message.c;h=0322a4a1acf76fc6d196a5c0bbdb42398863e2e0;hb=82c3dedd73be0292b8105b489359fc81fefce0a5;hp=7c91ac5551077a7224f1696d51e23adbb72bb4be;hpb=bbbecc2dde9ed1a605fd97cdde99960f41b098ab;p=m6w6%2Fext-http

diff --git a/php_http_message.c b/php_http_message.c
index 7c91ac5..0322a4a 100644
--- a/php_http_message.c
+++ b/php_http_message.c
@@ -17,13 +17,15 @@ 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->type || zend_hash_num_elements(&old->hdrs) || PHP_HTTP_BUFFER_LEN(old)) {
+	if (!old || old->type || zend_hash_num_elements(&old->hdrs) || PHP_HTTP_BUFFER_LEN(old)) {
 		(*message) = php_http_message_init(NULL, 0 TSRMLS_CC);
 		(*message)->parent = old;
 		(*headers) = &((*message)->hdrs);
 	}
 
-	php_http_message_set_info(*message, info);
+	if (info) {
+		php_http_message_set_info(*message, info);
+	}
 
 	return old != *message;
 }
@@ -65,6 +67,14 @@ PHP_HTTP_API php_http_message_t *php_http_message_init_env(php_http_message_t *m
 			if ((sval = php_http_env_get_server_var(ZEND_STRL("REQUEST_URI"), 1 TSRMLS_CC))) {
 				message->http.info.request.url = estrdup(Z_STRVAL_P(sval));
 			}
+			if ((sval = php_http_env_get_server_var(ZEND_STRL("CONTENT_TYPE"), 1 TSRMLS_CC))) {
+				Z_ADDREF_P(sval);
+				zend_hash_update(&message->hdrs, "Content-Type", sizeof("Content-Type"), (void *) &sval, sizeof(zval *), NULL);
+			}
+			if ((sval = php_http_env_get_server_var(ZEND_STRL("CONTENT_LENGTH"), 1 TSRMLS_CC))) {
+				Z_ADDREF_P(sval);
+				zend_hash_update(&message->hdrs, "Content-Length", sizeof("Content-Length"), (void *) &sval, sizeof(zval *), NULL);
+			}
 			
 			php_http_env_get_request_headers(&message->hdrs TSRMLS_CC);
 
@@ -1282,25 +1292,36 @@ static HashTable *php_http_message_object_get_props(zval *object TSRMLS_DC)
 
 PHP_METHOD(HttpMessage, __construct)
 {
-	int length = 0;
-	char *message = NULL;
+	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_class_entry) {
-		if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &message, &length) && message && length) {
-			if (message && length) {
-				php_http_message_t *msg = php_http_message_parse(NULL, message, length TSRMLS_CC);
+		if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|z!", &zmessage) && 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);
+					php_http_message_parser_dtor(&p);
+				}
+			} else {
+				zmessage = php_http_ztyp(IS_STRING, zmessage);
+				msg = php_http_message_parse(NULL, Z_STRVAL_P(zmessage), Z_STRLEN_P(zmessage) TSRMLS_CC);
+				zval_ptr_dtor(&zmessage);
+			}
 
-				if (!msg) {
-					php_http_error(HE_THROW, PHP_HTTP_E_MESSAGE, "could not parse message: %.*s", 25, message);
-				} else {
-					php_http_message_dtor(obj->message);
-					obj->message = msg;{
-					if (obj->message->parent) {
-						obj->parent = php_http_message_object_new_ex(Z_OBJCE_P(getThis()), obj->message->parent, NULL TSRMLS_CC);
-					}
+			if (msg) {
+				php_http_message_dtor(obj->message);
+				obj->message = msg;
+				if (obj->message->parent) {
+					obj->parent = php_http_message_object_new_ex(Z_OBJCE_P(getThis()), obj->message->parent, NULL TSRMLS_CC);
 				}
-			} end_error_handling();
+			} else {
+				php_http_error(HE_THROW, PHP_HTTP_E_MESSAGE, "could not parse message: %.*s", 25, Z_STRVAL_P(zmessage));
+			}
 		}
 		if (!obj->message) {
 			obj->message = php_http_message_init(NULL, 0 TSRMLS_CC);