X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_message_body.c;h=7019de30e763498b2e946ffd5df3ee00d80920bf;hp=14486a9edaeb7240f0ae0315d649428080849839;hb=14aec371d6123fbedbe13ca73b6a6d5768c635cb;hpb=aba384d552ef79668427db4c5b904229ff7b169f

diff --git a/php_http_message_body.c b/php_http_message_body.c
index 14486a9..7019de3 100644
--- a/php_http_message_body.c
+++ b/php_http_message_body.c
@@ -123,8 +123,12 @@ PHP_HTTP_API char *php_http_message_body_etag(php_http_message_body_t *body)
 	} else {
 		php_http_etag_t *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);
+		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;
+		}
 	}
 }
 
@@ -238,9 +242,10 @@ PHP_HTTP_API STATUS php_http_message_body_add_field(php_http_message_body_t *bod
 	BOUNDARY_OPEN(body);
 	php_http_message_body_appendf(
 		body,
-			"Content-Disposition: form-data; name=\"%s\"" PHP_HTTP_CRLF
-			"" PHP_HTTP_CRLF,
-		safe_name);
+		"Content-Disposition: form-data; name=\"%s\"" PHP_HTTP_CRLF
+		"" PHP_HTTP_CRLF,
+		safe_name
+	);
 	php_http_message_body_append(body, value_str, value_len);
 	BOUNDARY_CLOSE(body);
 
@@ -248,44 +253,29 @@ PHP_HTTP_API STATUS php_http_message_body_add_field(php_http_message_body_t *bod
 	return SUCCESS;
 }
 
-PHP_HTTP_API STATUS php_http_message_body_add_file(php_http_message_body_t *body, const char *name, const char *path, const char *ctype)
+PHP_HTTP_API STATUS php_http_message_body_add_file(php_http_message_body_t *body, const char *name, const char *ctype, const char *path, php_stream *in)
 {
-	php_stream *in;
-	char *path_dup = estrdup(path);
+	char *safe_name, *path_dup = estrdup(path);
 	TSRMLS_FETCH_FROM_CTX(body->ts);
 
-	if ((in = php_stream_open_wrapper(path_dup, "r", REPORT_ERRORS|USE_PATH|STREAM_MUST_SEEK, NULL))) {
-		php_stream_statbuf ssb = {{0}};
-
-		if (SUCCESS == php_stream_stat(in, &ssb) && S_ISREG(ssb.sb.st_mode)) {
-			char *safe_name = php_addslashes(estrdup(name), strlen(name), NULL, 1 TSRMLS_CC);
-
-			BOUNDARY_OPEN(body);
-			php_http_message_body_appendf(
-				body,
-				"Content-Disposition: attachment; name=\"%s\"; filename=\"%s\""	PHP_HTTP_CRLF
-				"Content-Type: %s" PHP_HTTP_CRLF
-				"Content-Length: %zu" PHP_HTTP_CRLF
-				"" PHP_HTTP_CRLF,
-				safe_name, basename(path_dup), ctype, ssb.sb.st_size);
-			php_stream_copy_to_stream_ex(in, php_http_message_body_stream(body), PHP_STREAM_COPY_ALL, NULL);
-			BOUNDARY_CLOSE(body);
-
-			efree(safe_name);
-			efree(path_dup);
-			php_stream_close(in);
-			return SUCCESS;
-		} else {
-			efree(path_dup);
-			php_stream_close(in);
-			php_http_error(HE_WARNING, PHP_HTTP_E_MESSAGE_BODY, "Not a valid regular file: %s", path);
-			return FAILURE;
-		}
-	} else {
-		efree(path_dup);
-		return FAILURE;
-	}
+	safe_name = php_addslashes(estrdup(name), strlen(name), NULL, 1 TSRMLS_CC);
 
+	BOUNDARY_OPEN(body);
+	php_http_message_body_appendf(
+		body,
+		"Content-Disposition: attachment; name=\"%s\"; filename=\"%s\""	PHP_HTTP_CRLF
+		"Content-Transfer-Encoding: binary" PHP_HTTP_CRLF
+		"Content-Type: %s" PHP_HTTP_CRLF
+		PHP_HTTP_CRLF,
+		safe_name, basename(path_dup), ctype
+	);
+	php_stream_copy_to_stream_ex(in, php_http_message_body_stream(body), PHP_STREAM_COPY_ALL, NULL);
+	BOUNDARY_CLOSE(body);
+
+	efree(safe_name);
+	efree(path_dup);
+
+	return SUCCESS;
 }
 
 static inline char *format_key(uint type, char *str, ulong num, const char *prefix) {
@@ -300,7 +290,7 @@ static inline char *format_key(uint type, char *str, ulong num, const char *pref
 	} else if (type == HASH_KEY_IS_STRING) {
 		new_key = estrdup(str);
 	} else {
-		spprintf(&new_key, 0, "%lu", num);
+		new_key = estrdup("");
 	}
 
 	return new_key;
@@ -310,22 +300,24 @@ static STATUS add_recursive_fields(php_http_message_body_t *body, const char *na
 {
 	if (Z_TYPE_P(value) == IS_ARRAY || Z_TYPE_P(value) == IS_OBJECT) {
 		zval **val;
+		HashTable *ht;
 		HashPosition pos;
 		php_http_array_hashkey_t key = php_http_array_hashkey_init(0);
 		TSRMLS_FETCH_FROM_CTX(body->ts);
 
-		if (!HASH_OF(value)->nApplyCount) {
-			++HASH_OF(value)->nApplyCount;
+		ht = HASH_OF(value);
+		if (!ht->nApplyCount) {
+			++ht->nApplyCount;
 			FOREACH_KEYVAL(pos, value, key, val) {
 				char *str = format_key(key.type, key.str, key.num, name);
 				if (SUCCESS != add_recursive_fields(body, str, *val)) {
 					efree(str);
-					HASH_OF(value)->nApplyCount--;
+					ht->nApplyCount--;
 					return FAILURE;
 				}
 				efree(str);
 			}
-			--HASH_OF(value)->nApplyCount;
+			--ht->nApplyCount;
 		}
 	} else {
 		zval *cpy = php_http_ztyp(IS_STRING, value);
@@ -338,52 +330,78 @@ static STATUS add_recursive_fields(php_http_message_body_t *body, const char *na
 
 static STATUS add_recursive_files(php_http_message_body_t *body, const char *name, zval *value)
 {
-	if (Z_TYPE_P(value) == IS_ARRAY || Z_TYPE_P(value) == IS_OBJECT) {
-		zval **zfile, **zname, **ztype;
-		TSRMLS_FETCH_FROM_CTX(body->ts);
+	zval **zdata = NULL, **zfile, **zname, **ztype;
+	HashTable *ht;
+	TSRMLS_FETCH_FROM_CTX(body->ts);
 
-		if ((SUCCESS == zend_hash_find(HASH_OF(value), ZEND_STRS("name"), (void *) &zname))
-		&&	(SUCCESS == zend_hash_find(HASH_OF(value), ZEND_STRS("file"), (void *) &zfile))
-		&&	(SUCCESS == zend_hash_find(HASH_OF(value), ZEND_STRS("type"), (void *) &ztype))
-		) {
-			zval *zfc = php_http_ztyp(IS_STRING, *zfile), *znc = php_http_ztyp(IS_STRING, *zname), *ztc = php_http_ztyp(IS_STRING, *ztype);
-			char *str = format_key(HASH_KEY_IS_STRING, Z_STRVAL_P(znc), 0, name);
-			STATUS ret = php_http_message_body_add_file(body, str, Z_STRVAL_P(zfc), Z_STRVAL_P(ztc));
+	if (Z_TYPE_P(value) != IS_ARRAY && Z_TYPE_P(value) != IS_OBJECT) {
+		php_http_error(HE_WARNING, PHP_HTTP_E_MESSAGE_BODY, "Expected array or object (name, type, file) for message body file to add");
+		return FAILURE;
+	}
 
-			efree(str);
-			zval_ptr_dtor(&znc);
-			zval_ptr_dtor(&zfc);
-			zval_ptr_dtor(&ztc);
+	ht = HASH_OF(value);
 
-			if (ret != SUCCESS) {
-				return ret;
-			}
-		} else {
-			zval **val;
-			HashPosition pos;
-			php_http_array_hashkey_t key = php_http_array_hashkey_init(0);
+	if ((SUCCESS != zend_hash_find(ht, ZEND_STRS("name"), (void *) &zname))
+	||	(SUCCESS != zend_hash_find(ht, ZEND_STRS("type"), (void *) &ztype))
+	||	(SUCCESS != zend_hash_find(ht, ZEND_STRS("file"), (void *) &zfile))
+	) {
+		zval **val;
+		HashPosition pos;
+		php_http_array_hashkey_t key = php_http_array_hashkey_init(0);
 
-			if (!HASH_OF(value)->nApplyCount) {
-				++HASH_OF(value)->nApplyCount;
-				FOREACH_KEYVAL(pos, value, key, val) {
+		if (!ht->nApplyCount) {
+			++ht->nApplyCount;
+			FOREACH_HASH_KEYVAL(pos, ht, key, val) {
+				if (Z_TYPE_PP(val) == IS_ARRAY || Z_TYPE_PP(val) == IS_OBJECT) {
 					char *str = format_key(key.type, key.str, key.num, name);
+
 					if (SUCCESS != add_recursive_files(body, str, *val)) {
 						efree(str);
-						--HASH_OF(value)->nApplyCount;
+						--ht->nApplyCount;
 						return FAILURE;
 					}
 					efree(str);
 				}
-				--HASH_OF(value)->nApplyCount;
 			}
+			--ht->nApplyCount;
 		}
+		return SUCCESS;
 	} else {
-		TSRMLS_FETCH_FROM_CTX(body->ts);
-		php_http_error(HE_WARNING, PHP_HTTP_E_MESSAGE_BODY, "Unrecognized array format for message body file to add");
-		return FAILURE;
-	}
+		php_stream *stream;
+		zval *zfc = php_http_ztyp(IS_STRING, *zfile);
 
-	return SUCCESS;
+		if (SUCCESS == zend_hash_find(ht, ZEND_STRS("data"), (void *) &zdata)) {
+			if (Z_TYPE_PP(zdata) == IS_RESOURCE) {
+				php_stream_from_zval_no_verify(stream, zdata);
+			} else {
+				zval *tmp = php_http_ztyp(IS_STRING, *zdata);
+
+				stream = php_stream_memory_open(TEMP_STREAM_READONLY, Z_STRVAL_P(tmp), Z_STRLEN_P(tmp));
+				zval_ptr_dtor(&tmp);
+			}
+		} else {
+			stream = php_stream_open_wrapper(Z_STRVAL_P(zfc), "r", REPORT_ERRORS|USE_PATH, NULL);
+		}
+
+		if (!stream) {
+			zval_ptr_dtor(&zfc);
+			return FAILURE;
+		} else {
+			zval *znc = php_http_ztyp(IS_STRING, *zname), *ztc = php_http_ztyp(IS_STRING, *ztype);
+			char *key = format_key(HASH_KEY_IS_STRING, Z_STRVAL_P(znc), 0, name);
+			STATUS ret =  php_http_message_body_add_file(body, key, Z_STRVAL_P(ztc), Z_STRVAL_P(zfc), stream);
+
+			efree(key);
+			zval_ptr_dtor(&znc);
+			zval_ptr_dtor(&ztc);
+			zval_ptr_dtor(&zfc);
+			if (!zdata || Z_TYPE_PP(zdata) != IS_RESOURCE) {
+				php_stream_close(stream);
+			}
+			return ret;
+		}
+
+	}
 }
 
 /* PHP */
@@ -411,8 +429,8 @@ PHP_HTTP_BEGIN_ARGS(append, 1)
 PHP_HTTP_END_ARGS;
 
 PHP_HTTP_BEGIN_ARGS(add, 0)
-	PHP_HTTP_ARG_VAL(fields, 0)
-	PHP_HTTP_ARG_VAL(files, 0)
+	PHP_HTTP_ARG_ARR(fields, 1, 0)
+	PHP_HTTP_ARG_ARR(files, 1, 0)
 PHP_HTTP_END_ARGS;
 
 PHP_HTTP_EMPTY_ARGS(etag);
@@ -615,7 +633,7 @@ PHP_METHOD(HttpMessageBody, add)
 {
 	HashTable *fields = NULL, *files = NULL;
 
-	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|hh", &fields, &files)) {
+	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|h!h!", &fields, &files)) {
 		php_http_message_body_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
 		RETURN_SUCCESS(php_http_message_body_add(obj->body, fields, files));