X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=src%2Fphp_http_encoding.c;h=2e3007b7ff4940fba218946101e6751a110ee3f8;hp=c20e1630b4efcdbca028d94dd124b1695d03d8f9;hb=4d376d38ec260d4fd467bb95b41451bf645d92e4;hpb=edab58cb1940a7710d931a54b278b344682d1031

diff --git a/src/php_http_encoding.c b/src/php_http_encoding.c
index c20e163..2e3007b 100644
--- a/src/php_http_encoding.c
+++ b/src/php_http_encoding.c
@@ -36,7 +36,7 @@ const char *php_http_encoding_dechunk(const char *encoded, size_t encoded_len, c
 	*decoded = ecalloc(1, encoded_len + 1);
 
 	while ((encoded + encoded_len - e_ptr) > 0) {
-		ulong chunk_len = 0, rest;
+		unsigned long chunk_len = 0, rest;
 
 		chunk_len = strtoul(e_ptr, &n_ptr, 16);
 
@@ -237,7 +237,7 @@ void php_http_encoding_stream_free(php_http_encoding_stream_t **s)
 
 struct dechunk_ctx {
 	php_http_buffer_t buffer;
-	ulong hexlen;
+	unsigned long hexlen;
 	unsigned zeroed:1;
 };
 
@@ -477,9 +477,9 @@ php_http_encoding_stream_object_t *php_http_encoding_stream_object_new_ex(zend_c
 	return o;
 }
 
-zend_object *php_http_encoding_stream_object_clone(zval *object)
+zend_object *php_http_encoding_stream_object_clone(zend_object *object)
 {
-	php_http_encoding_stream_object_t *new_obj, *old_obj = PHP_HTTP_OBJ(NULL, object);
+	php_http_encoding_stream_object_t *new_obj, *old_obj = PHP_HTTP_OBJ(object, NULL);
 	php_http_encoding_stream_t *cpy = php_http_encoding_stream_copy(old_obj->stream, NULL);
 
 	if (!cpy) {
@@ -528,7 +528,7 @@ static PHP_METHOD(HttpEncodingStream, __construct)
 	obj = PHP_HTTP_OBJ(NULL, getThis());
 
 	if (UNEXPECTED(obj->stream)) {
-		php_http_throw(bad_method_call, "http\\Encoding\\Stream cannot be initialized twice", NULL);
+		php_http_throw(bad_method_call, "http\\Encoding\\Stream cannot be initialized twice");
 		return;
 	}
 
@@ -640,7 +640,7 @@ static PHP_METHOD(HttpEncodingStream, finish)
 }
 
 static zend_function_entry php_http_encoding_stream_methods[] = {
-	PHP_ME(HttpEncodingStream, __construct,  ai_HttpEncodingStream___construct,  ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+	PHP_ME(HttpEncodingStream, __construct,  ai_HttpEncodingStream___construct,  ZEND_ACC_PUBLIC)
 	PHP_ME(HttpEncodingStream, update,       ai_HttpEncodingStream_update,       ZEND_ACC_PUBLIC)
 	PHP_ME(HttpEncodingStream, flush,        ai_HttpEncodingStream_flush,        ZEND_ACC_PUBLIC)
 	PHP_ME(HttpEncodingStream, done,         ai_HttpEncodingStream_done,         ZEND_ACC_PUBLIC)