X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_message_body.h;h=1e6f4ea63e64bef7d337107b01810e01d5b5725c;hp=53e565463eb20c4e5c74b3e22bc710bc96dfa89f;hb=4ebb73feef38aea0560abf7c3a9435dda4d77820;hpb=66f7e8b6b937976c9c1d3dbfb86a90141b19b5c6

diff --git a/php_http_message_body.h b/php_http_message_body.h
index 53e5654..1e6f4ea 100644
--- a/php_http_message_body.h
+++ b/php_http_message_body.h
@@ -26,9 +26,10 @@ struct php_http_message;
 
 PHP_HTTP_API php_http_message_body_t *php_http_message_body_init(php_http_message_body_t *body, php_stream *stream TSRMLS_DC);
 PHP_HTTP_API php_http_message_body_t *php_http_message_body_copy(php_http_message_body_t *from, php_http_message_body_t *to, zend_bool dup_internal_stream_and_contents);
-PHP_HTTP_API STATUS php_http_message_body_add(php_http_message_body_t *body, HashTable *fields, HashTable *files);
-PHP_HTTP_API STATUS php_http_message_body_add_field(php_http_message_body_t *body, const char *name, const char *value_str, size_t value_len);
-PHP_HTTP_API STATUS php_http_message_body_add_file(php_http_message_body_t *body, const char *name, const char *ctype, const char *file, php_stream *stream);
+PHP_HTTP_API STATUS php_http_message_body_add_form(php_http_message_body_t *body, HashTable *fields, HashTable *files);
+PHP_HTTP_API 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);
+PHP_HTTP_API STATUS php_http_message_body_add_form_file(php_http_message_body_t *body, const char *name, const char *ctype, const char *file, php_stream *stream);
+PHP_HTTP_API void php_http_message_body_add_part(php_http_message_body_t *body, struct php_http_message *part);
 PHP_HTTP_API size_t php_http_message_body_append(php_http_message_body_t *body, const char *buf, size_t len);
 PHP_HTTP_API size_t php_http_message_body_appendf(php_http_message_body_t *body, const char *fmt, ...);
 PHP_HTTP_API void php_http_message_body_to_string(php_http_message_body_t *body, char **buf, size_t *len, off_t offset, size_t forlen);
@@ -53,24 +54,27 @@ static inline php_stream *php_http_message_body_stream(php_http_message_body_t *
 typedef struct php_http_message_body_object {
 	zend_object zo;
 	php_http_message_body_t *body;
+	unsigned shared:1;
 } php_http_message_body_object_t;
 
-extern zend_class_entry *php_http_message_body_class_entry;
-extern zend_function_entry php_http_message_body_method_entry[];
+zend_class_entry *php_http_message_body_get_class_entry(void);
 
-extern PHP_MINIT_FUNCTION(http_message_body);
+PHP_MINIT_FUNCTION(http_message_body);
 
-extern zend_object_value php_http_message_body_object_new(zend_class_entry *ce TSRMLS_DC);
-extern zend_object_value php_http_message_body_object_new_ex(zend_class_entry *ce, php_http_message_body_t *body, php_http_message_body_object_t **ptr TSRMLS_DC);
-extern zend_object_value php_http_message_body_object_clone(zval *object TSRMLS_DC);
-extern void php_http_message_body_object_free(void *object TSRMLS_DC);
+zend_object_value php_http_message_body_object_new(zend_class_entry *ce TSRMLS_DC);
+zend_object_value php_http_message_body_object_new_ex(zend_class_entry *ce, php_http_message_body_t *body, php_http_message_body_object_t **ptr TSRMLS_DC);
+zend_object_value php_http_message_body_object_clone(zval *object TSRMLS_DC);
+void php_http_message_body_object_free(void *object TSRMLS_DC);
 
 PHP_METHOD(HttpMessageBody, __construct);
 PHP_METHOD(HttpMessageBody, __toString);
+PHP_METHOD(HttpMessageBody, unserialize);
+PHP_METHOD(HttpMessageBody, getResource);
 PHP_METHOD(HttpMessageBody, toStream);
 PHP_METHOD(HttpMessageBody, toCallback);
 PHP_METHOD(HttpMessageBody, append);
-PHP_METHOD(HttpMessageBody, add);
+PHP_METHOD(HttpMessageBody, addForm);
+PHP_METHOD(HttpMessageBody, addPart);
 PHP_METHOD(HttpMessageBody, etag);
 PHP_METHOD(HttpMessageBody, stat);