X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_message_body.c;h=c80c2389151b78ce0976dd23ba86f4796fb594d9;hp=2749fac7f4bed3508558850dbf05c58d91badd91;hb=refs%2Fheads%2Fv2.4.x;hpb=87db9817d428282792c8146d9c2ae9748ebf6f1e diff --git a/php_http_message_body.c b/php_http_message_body.c index 2749fac..c80c238 100644 --- a/php_http_message_body.c +++ b/php_http_message_body.c @@ -6,7 +6,7 @@ | modification, are permitted provided that the conditions mentioned | | in the accompanying LICENSE file are met. | +--------------------------------------------------------------------+ - | Copyright (c) 2004-2013, Michael Wallner | + | Copyright (c) 2004-2014, Michael Wallner | +--------------------------------------------------------------------+ */ @@ -28,8 +28,8 @@ #define BOUNDARY_CLOSE(body) \ php_http_message_body_appendf(body, PHP_HTTP_CRLF "--%s--" PHP_HTTP_CRLF, php_http_message_body_boundary(body)) -static STATUS add_recursive_fields(php_http_message_body_t *body, const char *name, zval *value); -static STATUS add_recursive_files(php_http_message_body_t *body, const char *name, zval *value); +static ZEND_RESULT_CODE add_recursive_fields(php_http_message_body_t *body, const char *name, zval *value); +static ZEND_RESULT_CODE add_recursive_files(php_http_message_body_t *body, const char *name, zval *value); php_http_message_body_t *php_http_message_body_init(php_http_message_body_t **body_ptr, php_stream *stream TSRMLS_DC) { @@ -55,6 +55,10 @@ php_http_message_body_t *php_http_message_body_init(php_http_message_body_t **bo } TSRMLS_SET_CTX(body->ts); + if (body_ptr) { + *body_ptr = body; + } + return body; } @@ -96,7 +100,7 @@ void php_http_message_body_free(php_http_message_body_t **body_ptr) TSRMLS_FETCH_FROM_CTX(body->ts); /* NOFIXME: shows leakinfo in DEBUG mode */ zend_list_delete(body->stream_id); - STR_FREE(body->boundary); + PTR_FREE(body->boundary); efree(body); } *body_ptr = NULL; @@ -124,25 +128,29 @@ const char *php_http_message_body_boundary(php_http_message_body_t *body) char *php_http_message_body_etag(php_http_message_body_t *body) { - const php_stream_statbuf *ssb = php_http_message_body_stat(body); + php_http_etag_t *etag; + php_stream *s = php_http_message_body_stream(body); TSRMLS_FETCH_FROM_CTX(body->ts); /* real file or temp buffer ? */ - if (ssb && ssb->sb.st_mtime) { - char *etag; + if (s->ops != &php_stream_temp_ops && s->ops != &php_stream_memory_ops) { + php_stream_stat(php_http_message_body_stream(body), &body->ssb); - spprintf(&etag, 0, "%lx-%lx-%lx", ssb->sb.st_ino, ssb->sb.st_mtime, ssb->sb.st_size); - return etag; - } else { - php_http_etag_t *etag = php_http_etag_init(PHP_HTTP_G->env.etag_mode TSRMLS_CC); + if (body->ssb.sb.st_mtime) { + char *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; + spprintf(&etag, 0, "%lx-%lx-%lx", body->ssb.sb.st_ino, body->ssb.sb.st_mtime, body->ssb.sb.st_size); + return etag; } } + + /* content based */ + if ((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); + } + + return NULL; } void php_http_message_body_to_string(php_http_message_body_t *body, char **buf, size_t *len, off_t offset, size_t forlen) @@ -157,7 +165,7 @@ void php_http_message_body_to_string(php_http_message_body_t *body, char **buf, *len = php_stream_copy_to_mem(s, buf, forlen, 0); } -STATUS php_http_message_body_to_stream(php_http_message_body_t *body, php_stream *dst, off_t offset, size_t forlen) +ZEND_RESULT_CODE php_http_message_body_to_stream(php_http_message_body_t *body, php_stream *dst, off_t offset, size_t forlen) { php_stream *s = php_http_message_body_stream(body); TSRMLS_FETCH_FROM_CTX(body->ts); @@ -170,7 +178,7 @@ STATUS php_http_message_body_to_stream(php_http_message_body_t *body, php_stream return php_stream_copy_to_stream_ex(s, dst, forlen, NULL); } -STATUS php_http_message_body_to_callback(php_http_message_body_t *body, php_http_pass_callback_t cb, void *cb_arg, off_t offset, size_t forlen) +ZEND_RESULT_CODE php_http_message_body_to_callback(php_http_message_body_t *body, php_http_pass_callback_t cb, void *cb_arg, off_t offset, size_t forlen) { php_stream *s = php_http_message_body_stream(body); char *buf = emalloc(0x1000); @@ -242,7 +250,7 @@ size_t php_http_message_body_appendf(php_http_message_body_t *body, const char * return print_len; } -STATUS php_http_message_body_add_form(php_http_message_body_t *body, HashTable *fields, HashTable *files) +ZEND_RESULT_CODE php_http_message_body_add_form(php_http_message_body_t *body, HashTable *fields, HashTable *files) { zval tmp; @@ -272,7 +280,7 @@ void php_http_message_body_add_part(php_http_message_body_t *body, php_http_mess } -STATUS php_http_message_body_add_form_field(php_http_message_body_t *body, const char *name, const char *value_str, size_t value_len) +ZEND_RESULT_CODE php_http_message_body_add_form_field(php_http_message_body_t *body, const char *name, const char *value_str, size_t value_len) { char *safe_name; TSRMLS_FETCH_FROM_CTX(body->ts); @@ -293,7 +301,7 @@ STATUS php_http_message_body_add_form_field(php_http_message_body_t *body, const return SUCCESS; } -STATUS php_http_message_body_add_form_file(php_http_message_body_t *body, const char *name, const char *ctype, const char *path, php_stream *in) +ZEND_RESULT_CODE php_http_message_body_add_form_file(php_http_message_body_t *body, const char *name, const char *ctype, const char *path, php_stream *in) { char *safe_name, *path_dup = estrdup(path), *bname; size_t bname_len; @@ -340,7 +348,7 @@ static inline char *format_key(uint type, char *str, ulong num, const char *pref return new_key; } -static STATUS add_recursive_fields(php_http_message_body_t *body, const char *name, zval *value) +static ZEND_RESULT_CODE add_recursive_fields(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 **val; @@ -372,7 +380,7 @@ static STATUS add_recursive_fields(php_http_message_body_t *body, const char *na return SUCCESS; } -static STATUS add_recursive_files(php_http_message_body_t *body, const char *name, zval *value) +static ZEND_RESULT_CODE add_recursive_files(php_http_message_body_t *body, const char *name, zval *value) { zval **zdata = NULL, **zfile, **zname, **ztype; HashTable *ht; @@ -433,7 +441,7 @@ static STATUS add_recursive_files(php_http_message_body_t *body, const char *nam } 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_form_file(body, key, Z_STRVAL_P(ztc), Z_STRVAL_P(zfc), stream); + ZEND_RESULT_CODE ret = php_http_message_body_add_form_file(body, key, Z_STRVAL_P(ztc), Z_STRVAL_P(zfc), stream); efree(key); zval_ptr_dtor(&znc); @@ -553,7 +561,7 @@ php_http_message_t *php_http_message_body_split(php_http_message_body_t *body, c php_http_buffer_free(&tmp); php_http_message_parser_free(&arg.parser); php_http_buffer_dtor(&arg.buf); - STR_FREE(arg.boundary_str); + PTR_FREE(arg.boundary_str); return msg; }