back to dev

[m6w6/ext-http] / php_http_message_body.h

diff --git a/php_http_message_body.h b/php_http_message_body.h
index 55016b7f830ed765dfb7b3affcd353b0cb261ae8..860cd8a1d2d686bcb4f148fd18360b56448f9042 100644 (file)
--- a/php_http_message_body.h
+++ b/php_http_message_body.h
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2014, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -35,8 +35,8 @@ PHP_HTTP_API void php_http_message_body_add_part(php_http_message_body_t *body,
 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 void php_http_message_body_to_stream(php_http_message_body_t *body, php_stream *s, off_t offset, size_t forlen);
-PHP_HTTP_API void 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 STATUS php_http_message_body_to_stream(php_http_message_body_t *body, php_stream *s, off_t offset, size_t forlen);
+PHP_HTTP_API 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);
 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)
@@ -51,15 +51,13 @@ static inline php_stream *php_http_message_body_stream(php_http_message_body_t *
        return zend_fetch_resource(NULL TSRMLS_CC, body->stream_id, "stream", NULL, 2, php_file_le_stream(), php_file_le_pstream());
 }
 
-
 typedef struct php_http_message_body_object {
        zend_object zo;
+       zend_object_value zv;
        php_http_message_body_t *body;
-       unsigned shared:1;
 } php_http_message_body_object_t;
 
-zend_class_entry *php_http_message_body_get_class_entry(void);
-
+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);
@@ -67,18 +65,6 @@ zend_object_value php_http_message_body_object_new_ex(zend_class_entry *ce, php_
 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, addForm);
-PHP_METHOD(HttpMessageBody, addPart);
-PHP_METHOD(HttpMessageBody, etag);
-PHP_METHOD(HttpMessageBody, stat);
-
 #endif
 
 /*