- API juggling

[m6w6/ext-http] / http_request_object.c

diff --git a/http_request_object.c b/http_request_object.c
index 94de28a9a77380caa3fdcce2974948b2f141c850..4d862279e0807a13b05cb45cea093fc2bad16902 100644 (file)
--- a/http_request_object.c
+++ b/http_request_object.c
@@ -27,6 +27,7 @@
 #include "php_http_request_object.h"
 #include "php_http_request_api.h"
 #include "php_http_request_pool_api.h"
 #include "php_http_request_object.h"
 #include "php_http_request_api.h"
 #include "php_http_request_pool_api.h"

+#include "php_http.h"

 #include "php_http_api.h"
 #include "php_http_url_api.h"
 #include "php_http_message_api.h"
 #include "php_http_api.h"
 #include "php_http_url_api.h"
 #include "php_http_message_api.h"


@@ -38,82 +39,83 @@
 #endif
 #include <curl/curl.h>
 
 #endif
 #include <curl/curl.h>
 

-#define HTTP_BEGIN_ARGS(method, req_args)              HTTP_BEGIN_ARGS_EX(HttpRequest, method, ZEND_RETURN_REFERENCE_AGNOSTIC, req_args)
-#define HTTP_EMPTY_ARGS(method, ret_ref)               HTTP_EMPTY_ARGS_EX(HttpRequest, method, ret_ref)
-#define HTTP_REQUEST_ME(method, visibility)            PHP_ME(HttpRequest, method, HTTP_ARGS(HttpRequest, method), visibility)
+#define HTTP_BEGIN_ARGS(method, ret_ref, req_args)     HTTP_BEGIN_ARGS_EX(HttpRequest, method, ret_ref, req_args)
+#define HTTP_EMPTY_ARGS(method, ret_ref)                       HTTP_EMPTY_ARGS_EX(HttpRequest, method, ret_ref)
+#define HTTP_REQUEST_ME(method, visibility)                    PHP_ME(HttpRequest, method, HTTP_ARGS(HttpRequest, method), visibility)
+#define HTTP_REQUEST_ALIAS(method, func)                       HTTP_STATIC_ME_ALIAS(method, func, HTTP_ARGS(HttpRequest, method))

 
 HTTP_EMPTY_ARGS(__destruct, 0);
 
 HTTP_EMPTY_ARGS(__destruct, 0);

-HTTP_BEGIN_ARGS(__construct, 0)
+HTTP_BEGIN_ARGS(__construct, 0, 0)

        HTTP_ARG_VAL(url, 0)
        HTTP_ARG_VAL(method, 0)
 HTTP_END_ARGS;
 
 HTTP_EMPTY_ARGS(getOptions, 0);
 HTTP_EMPTY_ARGS(unsetOptions, 0);
        HTTP_ARG_VAL(url, 0)
        HTTP_ARG_VAL(method, 0)
 HTTP_END_ARGS;
 
 HTTP_EMPTY_ARGS(getOptions, 0);
 HTTP_EMPTY_ARGS(unsetOptions, 0);

-HTTP_BEGIN_ARGS(setOptions, 1)
+HTTP_BEGIN_ARGS(setOptions, 0, 1)

        HTTP_ARG_VAL(options, 0)
 HTTP_END_ARGS;
 
 HTTP_EMPTY_ARGS(getSslOptions, 0);
 HTTP_EMPTY_ARGS(unsetSslOptions, 0);
        HTTP_ARG_VAL(options, 0)
 HTTP_END_ARGS;
 
 HTTP_EMPTY_ARGS(getSslOptions, 0);
 HTTP_EMPTY_ARGS(unsetSslOptions, 0);

-HTTP_BEGIN_ARGS(setSslOptions, 1)
+HTTP_BEGIN_ARGS(setSslOptions, 0, 1)

        HTTP_ARG_VAL(ssl_options, 0)
 HTTP_END_ARGS;
 
 HTTP_EMPTY_ARGS(getHeaders, 0);
 HTTP_EMPTY_ARGS(unsetHeaders, 0);
        HTTP_ARG_VAL(ssl_options, 0)
 HTTP_END_ARGS;
 
 HTTP_EMPTY_ARGS(getHeaders, 0);
 HTTP_EMPTY_ARGS(unsetHeaders, 0);

-HTTP_BEGIN_ARGS(addHeaders, 1)
+HTTP_BEGIN_ARGS(addHeaders, 0, 1)

        HTTP_ARG_VAL(headers, 0)
 HTTP_END_ARGS;
 
 HTTP_EMPTY_ARGS(getCookies, 0);
 HTTP_EMPTY_ARGS(unsetCookies, 0);
        HTTP_ARG_VAL(headers, 0)
 HTTP_END_ARGS;
 
 HTTP_EMPTY_ARGS(getCookies, 0);
 HTTP_EMPTY_ARGS(unsetCookies, 0);

-HTTP_BEGIN_ARGS(addCookies, 1)
+HTTP_BEGIN_ARGS(addCookies, 0, 1)

        HTTP_ARG_VAL(cookies, 0)
 HTTP_END_ARGS;
 
 HTTP_EMPTY_ARGS(getUrl, 0);
        HTTP_ARG_VAL(cookies, 0)
 HTTP_END_ARGS;
 
 HTTP_EMPTY_ARGS(getUrl, 0);

-HTTP_BEGIN_ARGS(setUrl, 1)
+HTTP_BEGIN_ARGS(setUrl, 0, 1)

        HTTP_ARG_VAL(url, 0)
 HTTP_END_ARGS;
 
 HTTP_EMPTY_ARGS(getMethod, 0);
        HTTP_ARG_VAL(url, 0)
 HTTP_END_ARGS;
 
 HTTP_EMPTY_ARGS(getMethod, 0);

-HTTP_BEGIN_ARGS(setMethod, 1)
+HTTP_BEGIN_ARGS(setMethod, 0, 1)

        HTTP_ARG_VAL(request_method, 0)
 HTTP_END_ARGS;
 
 HTTP_EMPTY_ARGS(getContentType, 0);
        HTTP_ARG_VAL(request_method, 0)
 HTTP_END_ARGS;
 
 HTTP_EMPTY_ARGS(getContentType, 0);

-HTTP_BEGIN_ARGS(setContentType, 1)
+HTTP_BEGIN_ARGS(setContentType, 0, 1)

        HTTP_ARG_VAL(content_type, 0)
 HTTP_END_ARGS;
 
 HTTP_EMPTY_ARGS(getQueryData, 0);
 HTTP_EMPTY_ARGS(unsetQueryData, 0);
        HTTP_ARG_VAL(content_type, 0)
 HTTP_END_ARGS;
 
 HTTP_EMPTY_ARGS(getQueryData, 0);
 HTTP_EMPTY_ARGS(unsetQueryData, 0);

-HTTP_BEGIN_ARGS(setQueryData, 1)
+HTTP_BEGIN_ARGS(setQueryData, 0, 1)

        HTTP_ARG_VAL(query_data, 0)
 HTTP_END_ARGS;
 
        HTTP_ARG_VAL(query_data, 0)
 HTTP_END_ARGS;
 

-HTTP_BEGIN_ARGS(addQueryData, 1)
+HTTP_BEGIN_ARGS(addQueryData, 0, 1)

        HTTP_ARG_VAL(query_data, 0)
 HTTP_END_ARGS;
 
 HTTP_EMPTY_ARGS(getPostFields, 0);
 HTTP_EMPTY_ARGS(unsetPostFields, 0);
        HTTP_ARG_VAL(query_data, 0)
 HTTP_END_ARGS;
 
 HTTP_EMPTY_ARGS(getPostFields, 0);
 HTTP_EMPTY_ARGS(unsetPostFields, 0);

-HTTP_BEGIN_ARGS(setPostFields, 1)
+HTTP_BEGIN_ARGS(setPostFields, 0, 1)

        HTTP_ARG_VAL(post_fields, 0)
 HTTP_END_ARGS;
 
        HTTP_ARG_VAL(post_fields, 0)
 HTTP_END_ARGS;
 

-HTTP_BEGIN_ARGS(addPostFields, 1)
+HTTP_BEGIN_ARGS(addPostFields, 0, 1)

        HTTP_ARG_VAL(post_fields, 0)
 HTTP_END_ARGS;
 
 HTTP_EMPTY_ARGS(getPostFiles, 0);
 HTTP_EMPTY_ARGS(unsetPostFiles, 0);
        HTTP_ARG_VAL(post_fields, 0)
 HTTP_END_ARGS;
 
 HTTP_EMPTY_ARGS(getPostFiles, 0);
 HTTP_EMPTY_ARGS(unsetPostFiles, 0);

-HTTP_BEGIN_ARGS(setPostFiles, 1)
+HTTP_BEGIN_ARGS(setPostFiles, 0, 1)

        HTTP_ARG_VAL(post_files, 0)
 HTTP_END_ARGS;
 
        HTTP_ARG_VAL(post_files, 0)
 HTTP_END_ARGS;
 

-HTTP_BEGIN_ARGS(addPostFile, 2)
+HTTP_BEGIN_ARGS(addPostFile, 0, 2)

        HTTP_ARG_VAL(formname, 0)
        HTTP_ARG_VAL(filename, 0)
        HTTP_ARG_VAL(content_type, 0)
        HTTP_ARG_VAL(formname, 0)
        HTTP_ARG_VAL(filename, 0)
        HTTP_ARG_VAL(content_type, 0)


@@ -121,28 +123,84 @@ HTTP_END_ARGS;
 
 HTTP_EMPTY_ARGS(getPutFile, 0);
 HTTP_EMPTY_ARGS(unsetPutFile, 0);
 
 HTTP_EMPTY_ARGS(getPutFile, 0);
 HTTP_EMPTY_ARGS(unsetPutFile, 0);

-HTTP_BEGIN_ARGS(setPutFile, 1)
+HTTP_BEGIN_ARGS(setPutFile, 0, 1)

        HTTP_ARG_VAL(filename, 0)
 HTTP_END_ARGS;
 
 HTTP_EMPTY_ARGS(getResponseData, 0);
        HTTP_ARG_VAL(filename, 0)
 HTTP_END_ARGS;
 
 HTTP_EMPTY_ARGS(getResponseData, 0);

-HTTP_BEGIN_ARGS(getResponseHeader, 0)
+HTTP_BEGIN_ARGS(getResponseHeader, 0, 0)

        HTTP_ARG_VAL(name, 0)
 HTTP_END_ARGS;
 
        HTTP_ARG_VAL(name, 0)
 HTTP_END_ARGS;
 

-HTTP_BEGIN_ARGS(getResponseCookie, 0)
+HTTP_BEGIN_ARGS(getResponseCookie, 0, 0)

        HTTP_ARG_VAL(name, 0)
 HTTP_END_ARGS;
 
 HTTP_EMPTY_ARGS(getResponseBody, 0);
 HTTP_EMPTY_ARGS(getResponseCode, 0);
        HTTP_ARG_VAL(name, 0)
 HTTP_END_ARGS;
 
 HTTP_EMPTY_ARGS(getResponseBody, 0);
 HTTP_EMPTY_ARGS(getResponseCode, 0);

-HTTP_BEGIN_ARGS(getResponseInfo, 0)
+HTTP_BEGIN_ARGS(getResponseInfo, 0, 0)

        HTTP_ARG_VAL(name, 0)
 HTTP_END_ARGS;
 
 HTTP_EMPTY_ARGS(getResponseMessage, 1);
 HTTP_EMPTY_ARGS(send, 0);
 
        HTTP_ARG_VAL(name, 0)
 HTTP_END_ARGS;
 
 HTTP_EMPTY_ARGS(getResponseMessage, 1);
 HTTP_EMPTY_ARGS(send, 0);
 

+HTTP_BEGIN_ARGS(get, 1, 0)
+       HTTP_ARG_VAL(url, 0)
+       HTTP_ARG_VAL(options, 0)
+       HTTP_ARG_VAL(info, 1)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(head, 1, 0)
+       HTTP_ARG_VAL(url, 0)
+       HTTP_ARG_VAL(options, 0)
+       HTTP_ARG_VAL(info, 1)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(postData, 2, 0)
+       HTTP_ARG_VAL(url, 0)
+       HTTP_ARG_VAL(data, 0)
+       HTTP_ARG_VAL(options, 0)
+       HTTP_ARG_VAL(info, 1)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(postFields, 2, 0)
+       HTTP_ARG_VAL(url, 0)
+       HTTP_ARG_VAL(data, 0)
+       HTTP_ARG_VAL(options, 0)
+       HTTP_ARG_VAL(info, 1)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(putFile, 2, 0)
+       HTTP_ARG_VAL(url, 0)
+       HTTP_ARG_VAL(file, 0)
+       HTTP_ARG_VAL(options, 0)
+       HTTP_ARG_VAL(info, 1)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(putStream, 2, 0)
+       HTTP_ARG_VAL(url, 0)
+       HTTP_ARG_VAL(stream, 0)
+       HTTP_ARG_VAL(options, 0)
+       HTTP_ARG_VAL(info, 1)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(methodRegister, 1, 0)
+       HTTP_ARG_VAL(method_name, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(methodUnregister, 1, 0)
+       HTTP_ARG_VAL(method, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(methodName, 1, 0)
+       HTTP_ARG_VAL(method_id, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(methodExists, 1, 0)
+       HTTP_ARG_VAL(method, 0)
+HTTP_END_ARGS;
+

 #define http_request_object_declare_default_properties() _http_request_object_declare_default_properties(TSRMLS_C)
 static inline void _http_request_object_declare_default_properties(TSRMLS_D);
 
 #define http_request_object_declare_default_properties() _http_request_object_declare_default_properties(TSRMLS_C)
 static inline void _http_request_object_declare_default_properties(TSRMLS_D);
 


@@ -203,6 +261,18 @@ zend_function_entry http_request_object_fe[] = {
        HTTP_REQUEST_ME(getResponseInfo, ZEND_ACC_PUBLIC)
        HTTP_REQUEST_ME(getResponseMessage, ZEND_ACC_PUBLIC)
 
        HTTP_REQUEST_ME(getResponseInfo, ZEND_ACC_PUBLIC)
        HTTP_REQUEST_ME(getResponseMessage, ZEND_ACC_PUBLIC)
 

+       HTTP_REQUEST_ALIAS(get, http_get)
+       HTTP_REQUEST_ALIAS(head, http_head)
+       HTTP_REQUEST_ALIAS(postData, http_post_data)
+       HTTP_REQUEST_ALIAS(postFields, http_post_fields)
+       HTTP_REQUEST_ALIAS(putFile, http_put_file)
+       HTTP_REQUEST_ALIAS(putStream, http_put_stream)
+
+       HTTP_REQUEST_ALIAS(methodRegister, http_request_method_register)
+       HTTP_REQUEST_ALIAS(methodUnregister, http_request_method_unregister)
+       HTTP_REQUEST_ALIAS(methodName, http_request_method_name)
+       HTTP_REQUEST_ALIAS(methodExists, http_request_method_exists)
+

        {NULL, NULL, NULL}
 };
 static zend_object_handlers http_request_object_handlers;
        {NULL, NULL, NULL}
 };
 static zend_object_handlers http_request_object_handlers;


@@ -391,6 +461,9 @@ STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_
                break;
        }
 
                break;
        }
 

+       /* clean previous response */
+       phpstr_dtor(&obj->response);
+

        efree(request_uri);
        return status;
 }
        efree(request_uri);
        return status;
 }