- phpstr_init(&o->history);
- phpstr_init(&o->request);
- phpstr_init_ex(&o->response, HTTP_CURLBUF_SIZE, 0);
-
- ALLOC_HASHTABLE(OBJ_PROP(o));
- zend_hash_init(OBJ_PROP(o), 0, NULL, ZVAL_PTR_DTOR, 0);
- zend_hash_copy(OBJ_PROP(o), &ce->default_properties, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
-
- ov.handle = putObject(http_request_object, o);
- ov.handlers = &http_request_object_handlers;
-
- return ov;
-}
-
-zend_object_value _http_request_object_clone_obj(zval *this_ptr TSRMLS_DC)
-{
- zend_object *old_zo;
- zend_object_value new_ov;
- http_request_object *new_obj;
- getObject(http_request_object, old_obj);
-
- old_zo = zend_objects_get_address(this_ptr TSRMLS_CC);
- new_ov = http_request_object_new_ex(old_zo->ce, curl_easy_duphandle(old_obj->ch), &new_obj);
-
- zend_objects_clone_members(&new_obj->zo, new_ov, old_zo, Z_OBJ_HANDLE_P(this_ptr) TSRMLS_CC);
- phpstr_append(&new_obj->history, old_obj->history.data, old_obj->history.used);
- phpstr_append(&new_obj->request, old_obj->request.data, old_obj->request.used);
- phpstr_append(&new_obj->response, old_obj->response.data, old_obj->response.used);
-
- return new_ov;
-}
-
-static inline void _http_request_object_declare_default_properties(TSRMLS_D)
-{
- zend_class_entry *ce = http_request_object_ce;
-
- DCL_PROP_N(PROTECTED, options);
- DCL_PROP_N(PROTECTED, responseInfo);
- DCL_PROP_N(PROTECTED, responseData);
- DCL_PROP_N(PROTECTED, responseCode);
- DCL_PROP_N(PROTECTED, responseMessage);
- DCL_PROP_N(PROTECTED, postFields);
- DCL_PROP_N(PROTECTED, postFiles);
-
- DCL_PROP(PROTECTED, long, method, HTTP_GET);
-
- DCL_PROP(PROTECTED, string, url, "");
- DCL_PROP(PROTECTED, string, contentType, "");
- DCL_PROP(PROTECTED, string, rawPostData, "");
- DCL_PROP(PROTECTED, string, queryData, "");
- DCL_PROP(PROTECTED, string, putFile, "");
-
- DCL_PROP(PUBLIC, bool, recordHistory, 1);
+ DCL_PROP_N(PRIVATE, options);
+ DCL_PROP_N(PRIVATE, postFields);
+ DCL_PROP_N(PRIVATE, postFiles);
+ DCL_PROP_N(PRIVATE, responseInfo);
+ DCL_PROP_N(PRIVATE, responseData);
+ DCL_PROP_N(PRIVATE, responseMessage);
+ DCL_PROP(PRIVATE, long, responseCode, 0);
+ DCL_PROP(PRIVATE, string, responseStatus, "");
+ DCL_PROP(PRIVATE, long, method, HTTP_GET);
+ DCL_PROP(PRIVATE, string, url, "");
+ DCL_PROP(PRIVATE, string, contentType, "");
+ DCL_PROP(PRIVATE, string, rawPostData, "");
+ DCL_PROP(PRIVATE, string, queryData, "");
+ DCL_PROP(PRIVATE, string, putFile, "");
+ DCL_PROP(PRIVATE, string, putData, "");
+ DCL_PROP_N(PRIVATE, history);
+ DCL_PROP(PUBLIC, bool, recordHistory, 0);