X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_object.c;h=59dd915434694eb3ba32df5bf2d3f8348f10d9e8;hp=40e36bc61586bdd986fe959e6bc16944958688e6;hb=0e998acc9b529b67de3b1a772e016dd85bbc8eb2;hpb=50343c32560e80c491911b107fab8217a35850eb

diff --git a/http_request_object.c b/http_request_object.c
index 40e36bc..59dd915 100644
--- a/http_request_object.c
+++ b/http_request_object.c
@@ -325,7 +325,7 @@ 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)
-#if HAVE_CURL_GETFORMDATA
+#ifdef HAVE_CURL_GETFORMDATA
 	HTTP_REQUEST_ALIAS(encodeBody, http_request_body_encode)
 #endif
 	EMPTY_FUNCTION_ENTRY
@@ -449,18 +449,16 @@ zend_object_value _http_request_object_new_ex(zend_class_entry *ce, CURL *ch, ht
 
 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, NULL, &new_obj);
+	new_ov = http_request_object_new_ex(old_obj->zo.ce, NULL, &new_obj);
 	if (old_obj->request->ch) {
 		http_curl_init_ex(curl_easy_duphandle(old_obj->request->ch), new_obj->request);
 	}
 	
-	zend_objects_clone_members(&new_obj->zo, new_ov, old_zo, Z_OBJ_HANDLE_P(this_ptr) TSRMLS_CC);
+	zend_objects_clone_members(&new_obj->zo, new_ov, &old_obj->zo, Z_OBJ_HANDLE_P(this_ptr) TSRMLS_CC);
 	phpstr_append(&new_obj->request->conv.request, old_obj->request->conv.request.data, old_obj->request->conv.request.used);
 	phpstr_append(&new_obj->request->conv.response, old_obj->request->conv.response.data, old_obj->request->conv.response.used);
 	
@@ -471,12 +469,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)
@@ -504,7 +498,7 @@ static inline void _http_request_object_check_request_content_type(zval *this_pt
 				
 				/* check for spaces only */
 				for (i = 0; i < Z_STRLEN_PP(ct_header); ++i) {
-					if (!isspace(Z_STRVAL_PP(ct_header)[i])) {
+					if (!HTTP_IS_CTYPE(space, Z_STRVAL_PP(ct_header)[i])) {
 						only_space = 0;
 						break;
 					}