etag test & fixes; set default etag mode for temp streams to crc32(b)

[m6w6/ext-http] / php_http_message_body.c

diff --git a/php_http_message_body.c b/php_http_message_body.c
index a33e330a2fa6d421fd06e2e2d74fba1a65735f91..7019de30e763498b2e946ffd5df3ee00d80920bf 100644 (file)
--- 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);
 
@@ -250,8 +255,6 @@ PHP_HTTP_API STATUS php_http_message_body_add_field(php_http_message_body_t *bod
 
 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_statbuf ssb = {{0}};
-       php_stream_filter *tef = NULL;
        char *safe_name, *path_dup = estrdup(path);
        TSRMLS_FETCH_FROM_CTX(body->ts);
 
@@ -261,39 +264,14 @@ PHP_HTTP_API STATUS php_http_message_body_add_file(php_http_message_body_t *body
        php_http_message_body_appendf(
                body,
                "Content-Disposition: attachment; name=\"%s\"; filename=\"%s\"" PHP_HTTP_CRLF
-               "Content-Type: %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
        );
-
-       if (SUCCESS == php_stream_stat(in, &ssb)) {
-               php_http_message_body_appendf(
-                       body,
-                       "Content-Length: %zu" PHP_HTTP_CRLF
-                       "" PHP_HTTP_CRLF,
-                       ssb.sb.st_size
-               );
-       } else {
-               php_http_message_body_append(
-                       body,
-                       ZEND_STRL(
-                               "Transfer-Encoding: chunked" PHP_HTTP_CRLF
-                               "" PHP_HTTP_CRLF
-                       )
-               );
-
-               if ((tef = php_http_filter_factory.create_filter("http.chunked_encode", NULL, 0 TSRMLS_CC))) {
-                       php_stream_filter_append(&in->readfilters, tef);
-               }
-       }
-
        php_stream_copy_to_stream_ex(in, php_http_message_body_stream(body), PHP_STREAM_COPY_ALL, NULL);
        BOUNDARY_CLOSE(body);
 
-       if (tef) {
-               php_stream_filter_remove(tef, 1 TSRMLS_CC);
-               php_stream_filter_free(tef TSRMLS_CC);
-       }
-
        efree(safe_name);
        efree(path_dup);
 
@@ -312,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 {
-               estrdup("");
+               new_key = estrdup("");
        }
 
        return new_key;
@@ -374,13 +352,16 @@ static STATUS add_recursive_files(php_http_message_body_t *body, const char *nam
                if (!ht->nApplyCount) {
                        ++ht->nApplyCount;
                        FOREACH_HASH_KEYVAL(pos, ht, key, val) {
-                               char *str = format_key(key.type, key.str, key.num, name);
-                               if (SUCCESS != add_recursive_files(body, str, *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);
+                                               --ht->nApplyCount;
+                                               return FAILURE;
+                                       }
                                        efree(str);
-                                       --ht->nApplyCount;
-                                       return FAILURE;
                                }
-                               efree(str);
                        }
                        --ht->nApplyCount;
                }
@@ -395,9 +376,7 @@ static STATUS add_recursive_files(php_http_message_body_t *body, const char *nam
                        } else {
                                zval *tmp = php_http_ztyp(IS_STRING, *zdata);
 
-                               if ((stream = php_stream_temp_new())) {
-                                       php_stream_write(stream, Z_STRVAL_P(tmp), Z_STRLEN_P(tmp));
-                               }
+                               stream = php_stream_memory_open(TEMP_STREAM_READONLY, Z_STRVAL_P(tmp), Z_STRLEN_P(tmp));
                                zval_ptr_dtor(&tmp);
                        }
                } else {
@@ -414,6 +393,7 @@ static STATUS add_recursive_files(php_http_message_body_t *body, const char *nam
 
                        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);
@@ -449,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);
@@ -653,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));