split off property proxy

[m6w6/ext-http] / php_http_client.c

diff --git a/php_http_client.c b/php_http_client.c
index 5aca3bce113917231e7be63815f9975a92e0b521..4d109bd0e313de840f262e72a6b7fc759180ecc6 100644 (file)
--- a/php_http_client.c
+++ b/php_http_client.c
@@ -15,7 +15,7 @@
 #include <ext/spl/spl_observer.h>
 #include <ext/standard/php_array.h>
 
-PHP_HTTP_API php_http_client_t *php_http_client_init(php_http_client_t *h, php_http_client_ops_t *ops, php_http_resource_factory_t *rf, void *init_arg TSRMLS_DC)
+PHP_HTTP_API php_http_client_t *php_http_client_init(php_http_client_t *h, php_http_client_ops_t *ops, php_resource_factory_t *rf, void *init_arg TSRMLS_DC)
 {
        php_http_client_t *free_h = NULL;
 
@@ -28,15 +28,15 @@ PHP_HTTP_API php_http_client_t *php_http_client_init(php_http_client_t *h, php_h
        if (rf) {
                h->rf = rf;
        } else if (ops->rsrc) {
-               h->rf = php_http_resource_factory_init(NULL, h->ops->rsrc, h, NULL);
+               h->rf = php_resource_factory_init(NULL, h->ops->rsrc, h, NULL);
        }
        h->request.buffer = php_http_buffer_init(NULL);
        h->request.parser = php_http_message_parser_init(NULL TSRMLS_CC);
-       h->request.message = php_http_message_init(NULL, 0 TSRMLS_CC);
+       h->request.message = php_http_message_init(NULL, 0, NULL TSRMLS_CC);
 
        h->response.buffer = php_http_buffer_init(NULL);
        h->response.parser = php_http_message_parser_init(NULL TSRMLS_CC);
-       h->response.message = php_http_message_init(NULL, 0 TSRMLS_CC);
+       h->response.message = php_http_message_init(NULL, 0, NULL TSRMLS_CC);
 
        TSRMLS_SET_CTX(h->ts);
 
@@ -59,7 +59,7 @@ PHP_HTTP_API void php_http_client_dtor(php_http_client_t *h)
                h->ops->dtor(h);
        }
 
-       php_http_resource_factory_free(&h->rf);
+       php_resource_factory_free(&h->rf);
 
        php_http_message_parser_free(&h->request.parser);
        php_http_message_free(&h->request.message);
@@ -92,19 +92,19 @@ PHP_HTTP_API php_http_client_t *php_http_client_copy(php_http_client_t *from, ph
 
                to->ops = from->ops;
                if (from->rf) {
-                       php_http_resource_factory_addref(from->rf);
+                       php_resource_factory_addref(from->rf);
                        to->rf = from->rf;
                } else if (to->ops->rsrc){
-                       to->rf = php_http_resource_factory_init(NULL, to->ops->rsrc, to, NULL);
+                       to->rf = php_resource_factory_init(NULL, to->ops->rsrc, to, NULL);
                }
 
                to->request.buffer = php_http_buffer_init(NULL);
                to->request.parser = php_http_message_parser_init(NULL TSRMLS_CC);
-               to->request.message = php_http_message_init(NULL, 0 TSRMLS_CC);
+               to->request.message = php_http_message_init(NULL, 0, NULL TSRMLS_CC);
 
                to->response.buffer = php_http_buffer_init(NULL);
                to->response.parser = php_http_message_parser_init(NULL TSRMLS_CC);
-               to->response.message = php_http_message_init(NULL, 0 TSRMLS_CC);
+               to->response.message = php_http_message_init(NULL, 0, NULL TSRMLS_CC);
 
                TSRMLS_SET_CTX(to->ts);
 
@@ -452,7 +452,7 @@ STATUS php_http_client_object_handle_response(zval *zclient TSRMLS_DC)
                        zend_update_property(php_http_client_class_entry, zclient, ZEND_STRL("responseMessage"), message TSRMLS_CC);
                        zval_ptr_dtor(&message);
 
-                       obj->client->response.message = php_http_message_init(NULL, 0 TSRMLS_CC);
+                       obj->client->response.message = php_http_message_init(NULL, 0, NULL TSRMLS_CC);
                } else {
                        zend_update_property_null(php_http_client_class_entry, zclient, ZEND_STRL("responseMessage") TSRMLS_CC);
                }
@@ -469,7 +469,7 @@ STATUS php_http_client_object_handle_response(zval *zclient TSRMLS_DC)
                        ZVAL_OBJVAL(message, php_http_message_object_new_ex(php_http_message_get_class_entry(), msg, NULL TSRMLS_CC), 0);
                        zend_update_property(php_http_client_class_entry, zclient, ZEND_STRL("requestMessage"), message TSRMLS_CC);
                        zval_ptr_dtor(&message);
-                       obj->client->request.message = php_http_message_init(NULL, 0 TSRMLS_CC);
+                       obj->client->request.message = php_http_message_init(NULL, 0, NULL TSRMLS_CC);
                }
        }
 
@@ -932,7 +932,7 @@ PHP_METHOD(HttpClient, request)
                        MAKE_STD_ZVAL(req);
                        ZVAL_OBJVAL(req, ov, 0);
 
-                       msg_obj->message = php_http_message_init(NULL, PHP_HTTP_REQUEST TSRMLS_CC);
+                       msg_obj->message = php_http_message_init(NULL, PHP_HTTP_REQUEST, NULL TSRMLS_CC);
                        PHP_HTTP_INFO(msg_obj->message).request.url = estrndup(url_str, url_len);
                        PHP_HTTP_INFO(msg_obj->message).request.method = estrndup(meth_str, meth_len);