Merge branch 'R_2_5'

[m6w6/ext-http] / src / php_http_message_body.h

diff --git a/src/php_http_message_body.h b/src/php_http_message_body.h
index dc2c7a270bc0ea17e9f60621bed3e26f33d11e1b..92353f7319e48f89daeed35922dd3f02dbc00602 100644 (file)
--- a/src/php_http_message_body.h
+++ b/src/php_http_message_body.h
@@ -14,18 +14,15 @@
 #define PHP_HTTP_MESSAGE_BODY_H
 
 typedef struct php_http_message_body {
-       int stream_id;
        php_stream_statbuf ssb;
+       zend_resource *res;
        char *boundary;
        unsigned refcount;
-#ifdef ZTS
-       void ***ts;
-#endif
 } php_http_message_body_t;
 
 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_init(php_http_message_body_t **body, php_stream *stream);
 PHP_HTTP_API unsigned php_http_message_body_addref(php_http_message_body_t *body);
 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);
 PHP_HTTP_API ZEND_RESULT_CODE php_http_message_body_add_form(php_http_message_body_t *body, HashTable *fields, HashTable *files);
@@ -34,36 +31,42 @@ PHP_HTTP_API ZEND_RESULT_CODE php_http_message_body_add_form_file(php_http_messa
 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);
+PHP_HTTP_API zend_string *php_http_message_body_to_string(php_http_message_body_t *body, off_t offset, size_t forlen);
 PHP_HTTP_API ZEND_RESULT_CODE php_http_message_body_to_stream(php_http_message_body_t *body, php_stream *s, off_t offset, size_t forlen);
 PHP_HTTP_API 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_HTTP_API void php_http_message_body_free(php_http_message_body_t **body);
 PHP_HTTP_API const php_stream_statbuf *php_http_message_body_stat(php_http_message_body_t *body);
-#define php_http_message_body_size(b) (php_http_message_body_stat((b))->sb.st_size)
-#define php_http_message_body_mtime(b) (php_http_message_body_stat((b))->sb.st_mtime)
 PHP_HTTP_API char *php_http_message_body_etag(php_http_message_body_t *body);
 PHP_HTTP_API const char *php_http_message_body_boundary(php_http_message_body_t *body);
 PHP_HTTP_API struct php_http_message *php_http_message_body_split(php_http_message_body_t *body, const char *boundary);
 
+static inline size_t php_http_message_body_size(php_http_message_body_t *b)
+{
+       return php_http_message_body_stat(b)->sb.st_size;
+}
+
+static inline time_t php_http_message_body_mtime(php_http_message_body_t *b)
+{
+       return php_http_message_body_stat(b)->sb.st_mtime;
+}
+
 static inline php_stream *php_http_message_body_stream(php_http_message_body_t *body)
 {
-       TSRMLS_FETCH_FROM_CTX(body->ts);
-       return zend_fetch_resource(NULL TSRMLS_CC, body->stream_id, "stream", NULL, 2, php_file_le_stream(), php_file_le_pstream());
+       return body->res->ptr;
 }
 
 typedef struct php_http_message_body_object {
-       zend_object zo;
-       zend_object_value zv;
        php_http_message_body_t *body;
+       zend_object zo;
 } php_http_message_body_object_t;
 
 PHP_HTTP_API zend_class_entry *php_http_message_body_class_entry;
 PHP_MINIT_FUNCTION(http_message_body);
 
-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);
+zend_object *php_http_message_body_object_new(zend_class_entry *ce);
+php_http_message_body_object_t *php_http_message_body_object_new_ex(zend_class_entry *ce, php_http_message_body_t *body);
+zend_object *php_http_message_body_object_clone(zval *object);
+void php_http_message_body_object_free(zend_object *object);
 
 #endif