X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_request_object.c;h=460ba243a085e94d2e3e1e7b6d72182528804bed;hb=a3fa6c90e487921b526a894df42cd3729a33ff5b;hp=f9bbf5e018451225b350145b4cf89796a965bd7b;hpb=ef504c97eb98ff93e63d32452aca0684ed3c514a;p=m6w6%2Fext-http

diff --git a/http_request_object.c b/http_request_object.c
index f9bbf5e..460ba24 100644
--- a/http_request_object.c
+++ b/http_request_object.c
@@ -549,12 +549,16 @@ static inline void _http_request_object_check_request_content_type(zval *this_pt
 STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_ptr TSRMLS_DC)
 {
 	STATUS status = SUCCESS;
+	char *url = http_absolute_url(Z_STRVAL_P(zend_read_property(THIS_CE, getThis(), ZEND_STRS("url")-1, 0 TSRMLS_CC)));
 
+	if (!url) {
+		return FAILURE;
+	}
+	
 	http_request_reset(obj->request);
+	obj->request->url = url;
 	HTTP_CHECK_CURL_INIT(obj->request->ch, http_curl_init(obj->request), return FAILURE);
 	
-	obj->request->url = http_absolute_url(Z_STRVAL_P(zend_read_property(THIS_CE, getThis(), ZEND_STRS("url")-1, 0 TSRMLS_CC)));
-	
 	switch (obj->request->meth = Z_LVAL_P(zend_read_property(THIS_CE, getThis(), ZEND_STRS("method")-1, 0 TSRMLS_CC)))
 	{
 		case HTTP_GET:
@@ -633,7 +637,7 @@ STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_
 			
 			if (	(Z_TYPE_P(options) != IS_ARRAY)
 				||	(SUCCESS != zend_hash_find(Z_ARRVAL_P(options), "onprogress", sizeof("onprogress"), (void *) &entry)
-				||	(!zend_is_callable(*entry, 0, NULL)))) {
+				||	(!IS_CALLABLE(*entry, 0, NULL)))) {
 				MAKE_STD_ZVAL(pcb);
 				array_init(pcb);
 				ZVAL_ADDREF(getThis());
@@ -741,7 +745,7 @@ STATUS _http_request_object_responsehandler(http_request_object *obj, zval *this
 
 static int apply_pretty_key(void *pDest, int num_args, va_list args, zend_hash_key *hash_key)
 {
-	if (hash_key->nKeyLength > 1) {
+	if (hash_key->arKey && hash_key->nKeyLength > 1) {
 		hash_key->h = zend_hash_func(pretty_key(hash_key->arKey, hash_key->nKeyLength - 1, 1, 0), hash_key->nKeyLength);
 	}
 	return ZEND_HASH_APPLY_KEEP;
@@ -777,7 +781,7 @@ static inline void _http_request_object_set_options_subr(INTERNAL_FUNCTION_PARAM
 		}
 	} else if (opts) {
 		if (prettify_keys) {
-			zend_hash_apply_with_arguments(Z_ARRVAL_P(opts), apply_pretty_key, 0);
+			zend_hash_apply_with_arguments(Z_ARRVAL_P(opts) HTTP_ZAPI_HASH_TSRMLS_CC, apply_pretty_key, 0, NULL);
 		}
 		ZVAL_ADDREF(opts);
 		add_assoc_zval_ex(new_opts, key, len, opts);
@@ -1168,13 +1172,10 @@ PHP_METHOD(HttpRequest, setQueryData)
 		zend_update_property_string(THIS_CE, getThis(), ZEND_STRS("queryData")-1, query_data TSRMLS_CC);
 		efree(query_data);
 	} else {
-		zval *orig = qdata;
+		zval *data = http_zsep(IS_STRING, qdata);
 		
-		convert_to_string_ex(&qdata);
-		zend_update_property_stringl(THIS_CE, getThis(), ZEND_STRS("queryData")-1, Z_STRVAL_P(qdata), Z_STRLEN_P(qdata) TSRMLS_CC);
-		if (orig != qdata) {
-			zval_ptr_dtor(&qdata);
-		}
+		zend_update_property_stringl(THIS_CE, getThis(), ZEND_STRS("queryData")-1, Z_STRVAL_P(data), Z_STRLEN_P(data) TSRMLS_CC);
+		zval_ptr_dtor(&data);
 	}
 	RETURN_TRUE;
 }
@@ -1309,14 +1310,14 @@ PHP_METHOD(HttpRequest, addBody)
 	}
 	
 	if (data_len) {
-		zval *data = zend_read_property(THIS_CE, getThis(), ZEND_STRS("rrequestBody")-1, 0 TSRMLS_CC);
+		zval *data = zend_read_property(THIS_CE, getThis(), ZEND_STRS("requestBody")-1, 0 TSRMLS_CC);
 		
 		if (Z_STRLEN_P(data)) {
 			Z_STRVAL_P(data) = erealloc(Z_STRVAL_P(data), (Z_STRLEN_P(data) += data_len) + 1);
 			Z_STRVAL_P(data)[Z_STRLEN_P(data)] = '\0';
 			memcpy(Z_STRVAL_P(data) + Z_STRLEN_P(data) - data_len, raw_data, data_len);
 		} else {
-			zend_update_property_stringl(THIS_CE, getThis(), ZEND_STRS("putData")-1, raw_data, data_len TSRMLS_CC);
+			zend_update_property_stringl(THIS_CE, getThis(), ZEND_STRS("requestBody")-1, raw_data, data_len TSRMLS_CC);
 		}
 	}
 	
@@ -1579,10 +1580,9 @@ PHP_METHOD(HttpRequest, getResponseCookies)
 				if (allowed_extras_array) {
 					allowed_extras = ecalloc(zend_hash_num_elements(Z_ARRVAL_P(allowed_extras_array)) + 1, sizeof(char *));
 					FOREACH_VAL(pos, allowed_extras_array, entry) {
-						ZVAL_ADDREF(*entry);
-						convert_to_string_ex(entry);
-						allowed_extras[i++] = estrndup(Z_STRVAL_PP(entry), Z_STRLEN_PP(entry));
-						zval_ptr_dtor(entry);
+						zval *data = http_zsep(IS_STRING, *entry);
+						allowed_extras[i++] = estrndup(Z_STRVAL_P(data), Z_STRLEN_P(data));
+						zval_ptr_dtor(&data);
 					}
 				}
 				
@@ -1594,9 +1594,9 @@ PHP_METHOD(HttpRequest, getResponseCookies)
 							zval **single_header;
 							
 							FOREACH_VAL(pos2, *header, single_header) {
-								ZVAL_ADDREF(*single_header);
-								convert_to_string_ex(single_header);
-								if (http_parse_cookie_ex(&list, Z_STRVAL_PP(single_header), flags, allowed_extras)) {
+								zval *data = http_zsep(IS_STRING, *single_header);
+								
+								if (http_parse_cookie_ex(&list, Z_STRVAL_P(data), flags, allowed_extras)) {
 									zval *cookie;
 									
 									MAKE_STD_ZVAL(cookie);
@@ -1605,12 +1605,11 @@ PHP_METHOD(HttpRequest, getResponseCookies)
 									add_next_index_zval(return_value, cookie);
 									http_cookie_list_dtor(&list);
 								}
-								zval_ptr_dtor(single_header);
+								zval_ptr_dtor(&data);
 							}
 						} else {
-							ZVAL_ADDREF(*header);
-							convert_to_string_ex(header);
-							if (http_parse_cookie_ex(&list, Z_STRVAL_PP(header), flags, allowed_extras)) {
+							zval *data = http_zsep(IS_STRING, *header);
+							if (http_parse_cookie_ex(&list, Z_STRVAL_P(data), flags, allowed_extras)) {
 								zval *cookie;
 								
 								MAKE_STD_ZVAL(cookie);
@@ -1619,7 +1618,7 @@ PHP_METHOD(HttpRequest, getResponseCookies)
 								add_next_index_zval(return_value, cookie);
 								http_cookie_list_dtor(&list);
 							}
-							zval_ptr_dtor(header);
+							zval_ptr_dtor(&data);
 						}
 					}
 				}