X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=php_http_curl_client.c;h=23b8855e1e4104da4c08f337791610978800104e;hb=bfa5d473bdfb59fd39f04c2b8fb77ea4a7e9421b;hp=58f0d935a11783cf58706c73f33b4d98e72fd099;hpb=dada371ebca4e4015b00067254fad1d7c2f06d2f;p=m6w6%2Fext-http

diff --git a/php_http_curl_client.c b/php_http_curl_client.c
index 58f0d93..23b8855 100644
--- a/php_http_curl_client.c
+++ b/php_http_curl_client.c
@@ -14,7 +14,7 @@
 
 /* resource_factory ops */
 
-static void *php_http_curl_ctor(void *opaque TSRMLS_DC)
+static void *php_http_curl_ctor(void *opaque, void *init_arg TSRMLS_DC)
 {
 	void *ch;
 
@@ -1011,7 +1011,7 @@ static php_http_client_t *php_http_curl_client_init(php_http_client_t *h, void *
 	php_http_curl_client_t *ctx;
 	TSRMLS_FETCH_FROM_CTX(h->ts);
 
-	if (!handle && !(handle = php_http_resource_factory_handle_ctor(h->rf TSRMLS_CC))) {
+	if (!handle && !(handle = php_resource_factory_handle_ctor(h->rf, NULL TSRMLS_CC))) {
 		php_http_error(HE_WARNING, PHP_HTTP_E_CLIENT, "could not initialize curl handle");
 		return NULL;
 	}
@@ -1051,7 +1051,7 @@ static php_http_client_t *php_http_curl_client_copy(php_http_client_t *from, php
 	void *copy;
 	TSRMLS_FETCH_FROM_CTX(from->ts);
 
-	if (!(copy = php_http_resource_factory_handle_copy(from->rf, ctx->handle TSRMLS_CC))) {
+	if (!(copy = php_resource_factory_handle_copy(from->rf, ctx->handle TSRMLS_CC))) {
 		return NULL;
 	}
 
@@ -1072,7 +1072,7 @@ static void php_http_curl_client_dtor(php_http_client_t *h)
 	curl_easy_setopt(ctx->handle, CURLOPT_VERBOSE, 0L);
 	curl_easy_setopt(ctx->handle, CURLOPT_DEBUGFUNCTION, NULL);
 
-	php_http_resource_factory_handle_dtor(h->rf, ctx->handle TSRMLS_CC);
+	php_resource_factory_handle_dtor(h->rf, ctx->handle TSRMLS_CC);
 
 	php_http_buffer_dtor(&ctx->options.ranges);
 	php_http_buffer_dtor(&ctx->options.cookies);
@@ -1211,16 +1211,16 @@ PHP_HTTP_API STATUS php_http_curl_client_prepare(php_http_client_t *h, php_http_
 	}
 
 	/* attach request body */
-	if ((body_size = php_http_message_body_size(&msg->body))) {
+	if ((body_size = php_http_message_body_size(msg->body))) {
 		/* RFC2616, section 4.3 (para. 4) states that »a message-body MUST NOT be included in a request if the
 		 * specification of the request method (section 5.1.1) does not allow sending an entity-body in request.«
 		 * Following the clause in section 5.1.1 (para. 2) that request methods »MUST be implemented with the
 		 * same semantics as those specified in section 9« reveal that not any single defined HTTP/1.1 method
 		 * does not allow a request body.
 		 */
-		php_stream_rewind(php_http_message_body_stream(&msg->body));
-		curl_easy_setopt(curl->handle, CURLOPT_IOCTLDATA, &msg->body);
-		curl_easy_setopt(curl->handle, CURLOPT_READDATA, &msg->body);
+		php_stream_rewind(php_http_message_body_stream(msg->body));
+		curl_easy_setopt(curl->handle, CURLOPT_IOCTLDATA, msg->body);
+		curl_easy_setopt(curl->handle, CURLOPT_READDATA, msg->body);
 		curl_easy_setopt(curl->handle, CURLOPT_INFILESIZE, body_size);
 		curl_easy_setopt(curl->handle, CURLOPT_POSTFIELDSIZE, body_size);
 	}
@@ -1353,7 +1353,7 @@ static STATUS php_http_curl_client_getopt(php_http_client_t *h, php_http_client_
 	return SUCCESS;
 }
 
-static php_http_resource_factory_ops_t php_http_curl_client_resource_factory_ops = {
+static php_resource_factory_ops_t php_http_curl_client_resource_factory_ops = {
 	php_http_curl_ctor,
 	php_http_curl_copy,
 	php_http_curl_dtor
@@ -1432,7 +1432,7 @@ PHP_MINIT_FUNCTION(http_curl_client)
 {
 	php_http_options_t *options;
 
-	if (SUCCESS != php_http_persistent_handle_provide(ZEND_STRL("http_client.curl"), &php_http_curl_client_resource_factory_ops, NULL, NULL)) {
+	if (SUCCESS != php_persistent_handle_provide(ZEND_STRL("http_client.curl"), &php_http_curl_client_resource_factory_ops, NULL, NULL)) {
 		return FAILURE;
 	}