X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=php_http_message.c;h=2c25aec7c7c431326302c999bce418be0fde8741;hb=a56d3d7f7020900acc4d00301f6e2acb0603f492;hp=ab2c86225f8c1328dc6495dfacfe55e9506b8d83;hpb=5389d7b1cc701efea82a2c6cbb1cc1b234f705e3;p=m6w6%2Fext-http

diff --git a/php_http_message.c b/php_http_message.c
index ab2c862..2c25aec 100644
--- a/php_http_message.c
+++ b/php_http_message.c
@@ -20,10 +20,14 @@ PHP_HTTP_API zend_bool php_http_message_info_callback(php_http_message_t **messa
 	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);
+		if (headers) {
+			(*headers) = &((*message)->hdrs);
+		}
 	}
 
-	php_http_message_set_info(*message, info);
+	if (info) {
+		php_http_message_set_info(*message, info);
+	}
 
 	return old != *message;
 }
@@ -179,6 +183,63 @@ PHP_HTTP_API zval *php_http_message_header(php_http_message_t *msg, char *key_st
 	return ret;
 }
 
+PHP_HTTP_API zend_bool php_http_message_is_multipart(php_http_message_t *msg, char **boundary)
+{
+	zval *ct = php_http_message_header(msg, ZEND_STRL("Content-Type"), 1);
+	zend_bool is_multipart = 0;
+	TSRMLS_FETCH_FROM_CTX(msg->ts);
+
+	if (ct) {
+		php_http_params_opts_t popts;
+		HashTable params;
+
+		ZEND_INIT_SYMTABLE(&params);
+		php_http_params_opts_default_get(&popts);
+		popts.input.str = Z_STRVAL_P(ct);
+		popts.input.len = Z_STRLEN_P(ct);
+
+		if (php_http_params_parse(&params, &popts TSRMLS_CC)) {
+			zval **cur, **arg;
+			char *ct_str;
+
+			zend_hash_internal_pointer_reset(&params);
+
+			if (SUCCESS == zend_hash_get_current_data(&params, (void *) &cur)
+			&&	Z_TYPE_PP(cur) == IS_ARRAY
+			&&	HASH_KEY_IS_STRING == zend_hash_get_current_key(&params, &ct_str, NULL, 0)
+			) {
+				if (php_http_match(ct_str, "multipart", PHP_HTTP_MATCH_WORD)) {
+					is_multipart = 1;
+
+					/* get boundary */
+					if (boundary
+					&&	SUCCESS == zend_hash_find(Z_ARRVAL_PP(cur), ZEND_STRS("arguments"), (void *) &arg)
+					&&	Z_TYPE_PP(arg) == IS_ARRAY
+					) {
+						zval **val;
+						HashPosition pos;
+						php_http_array_hashkey_t key = php_http_array_hashkey_init(0);
+
+						FOREACH_KEYVAL(pos, *arg, key, val) {
+							if (key.type == HASH_KEY_IS_STRING && !strcasecmp(key.str, "boundary")) {
+								zval *bnd = php_http_ztyp(IS_STRING, *val);
+
+								if (Z_STRLEN_P(bnd)) {
+									*boundary = estrndup(Z_STRVAL_P(bnd), Z_STRLEN_P(bnd));
+								}
+								zval_ptr_dtor(&bnd);
+							}
+						}
+					}
+				}
+			}
+		}
+		zend_hash_destroy(&params);
+		zval_ptr_dtor(&ct);
+	}
+
+	return is_multipart;
+}
 
 /* */
 PHP_HTTP_API void php_http_message_set_type(php_http_message_t *message, php_http_message_type_t type)
@@ -332,7 +393,6 @@ PHP_HTTP_API void php_http_message_to_callback(php_http_message_t *msg, php_http
 	if (php_http_message_body_size(&msg->body)) {
 		cb(cb_arg, ZEND_STRL(PHP_HTTP_CRLF));
 		php_http_message_body_to_callback(&msg->body, cb, cb_arg, 0, 0);
-		cb(cb_arg, ZEND_STRL(PHP_HTTP_CRLF));
 	}
 }
 
@@ -346,7 +406,6 @@ PHP_HTTP_API void php_http_message_to_string(php_http_message_t *msg, char **str
 	if (php_http_message_body_size(&msg->body)) {
 		php_http_buffer_appends(&str, PHP_HTTP_CRLF);
 		php_http_message_body_to_callback(&msg->body, (php_http_pass_callback_t) php_http_buffer_append, &str, 0, 0);
-		php_http_buffer_appends(&str, PHP_HTTP_CRLF);
 	}
 
 	data = php_http_buffer_data(&str, string, length);
@@ -367,6 +426,7 @@ PHP_HTTP_API void php_http_message_serialize(php_http_message_t *message, char *
 
 	do {
 		php_http_message_to_string(message, &buf, &len);
+		php_http_buffer_prepends(&str, PHP_HTTP_CRLF);
 		php_http_buffer_prepend(&str, buf, len);
 		efree(buf);
 	} while ((message = message->parent));
@@ -739,6 +799,11 @@ PHP_HTTP_BEGIN_ARGS(prepend, 1)
 PHP_HTTP_END_ARGS;
 PHP_HTTP_EMPTY_ARGS(reverse);
 
+PHP_HTTP_BEGIN_ARGS(isMultipart, 0)
+	PHP_HTTP_ARG_VAL(boundary, 1)
+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);
@@ -792,6 +857,9 @@ zend_function_entry php_http_message_method_entry[] = {
 	PHP_HTTP_MESSAGE_ME(prepend, ZEND_ACC_PUBLIC)
 	PHP_HTTP_MESSAGE_ME(reverse, ZEND_ACC_PUBLIC)
 
+	PHP_HTTP_MESSAGE_ME(isMultipart, ZEND_ACC_PUBLIC)
+	PHP_HTTP_MESSAGE_ME(splitMultipartBody, ZEND_ACC_PUBLIC)
+
 	EMPTY_FUNCTION_ENTRY
 };
 static zend_object_handlers php_http_message_object_handlers;
@@ -1890,6 +1958,40 @@ PHP_METHOD(HttpMessage, reverse)
 	}
 }
 
+PHP_METHOD(HttpMessage, isMultipart)
+{
+	zval *zboundary = NULL;
+
+	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|z", &zboundary)) {
+		php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+		char *boundary = NULL;
+
+		RETVAL_BOOL(php_http_message_is_multipart(obj->message, zboundary ? &boundary : NULL));
+
+		if (zboundary && boundary) {
+			zval_dtor(zboundary);
+			ZVAL_STRING(zboundary, boundary, 0);
+		}
+	}
+}
+
+PHP_METHOD(HttpMessage, splitMultipartBody)
+{
+	if (SUCCESS == zend_parse_parameters_none()) {
+		php_http_message_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+		char *boundary = NULL;
+
+		if (php_http_message_is_multipart(obj->message, &boundary)) {
+			php_http_message_t *msg;
+
+			if ((msg = php_http_message_body_split(&obj->message->body, boundary))) {
+				RETVAL_OBJVAL(php_http_message_object_new_ex(php_http_message_class_entry, msg, NULL TSRMLS_CC), 0);
+			}
+		}
+		STR_FREE(boundary);
+	}
+}
+
 PHP_METHOD(HttpMessage, count)
 {
 	if (SUCCESS == zend_parse_parameters_none()) {