X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_request_object.c;h=fc039f824fb1e5226cdc0ccf0da2e87681ddc9e1;hb=c8dff7011092296f9fcc12e68ad8eef18b19cdf4;hp=d90803db8ce87cdda5b273dd53d68b4b5202075f;hpb=b3dd66ed1452139236b7101f7d73f19917bd1ea2;p=m6w6%2Fext-http diff --git a/http_request_object.c b/http_request_object.c index d90803d..fc039f8 100644 --- a/http_request_object.c +++ b/http_request_object.c @@ -234,10 +234,12 @@ HTTP_BEGIN_ARGS(methodExists, 1) HTTP_ARG_VAL(method, 0) HTTP_END_ARGS; +#ifdef HAVE_CURL_GETFORMDATA HTTP_BEGIN_ARGS(encodeBody, 2) HTTP_ARG_VAL(fields, 0) HTTP_ARG_VAL(files, 0) HTTP_END_ARGS; +#endif #define OBJ_PROP_CE http_request_object_ce zend_class_entry *http_request_object_ce; @@ -323,9 +325,9 @@ zend_function_entry http_request_object_fe[] = { HTTP_REQUEST_ALIAS(methodUnregister, http_request_method_unregister) HTTP_REQUEST_ALIAS(methodName, http_request_method_name) HTTP_REQUEST_ALIAS(methodExists, http_request_method_exists) - +#ifdef HAVE_CURL_GETFORMDATA HTTP_REQUEST_ALIAS(encodeBody, http_request_body_encode) - +#endif EMPTY_FUNCTION_ENTRY }; static zend_object_handlers http_request_object_handlers; @@ -469,12 +471,8 @@ void _http_request_object_free(zend_object *object TSRMLS_DC) { http_request_object *o = (http_request_object *) object; - if (OBJ_PROP(o)) { - zend_hash_destroy(OBJ_PROP(o)); - FREE_HASHTABLE(OBJ_PROP(o)); - } http_request_free(&o->request); - efree(o); + freeObject(o); } #define http_request_object_check_request_content_type(t) _http_request_object_check_request_content_type((t) TSRMLS_CC)