X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=php_http_curl_client.c;h=640f3bbf5cdf5365aebb45d913eabcfc1116dbe3;hb=cd4b861addec695f3b7d78c5184294c34c5ab732;hp=b2beba6bc310c4e5a1ec55276e8774d9a862adb9;hpb=7ba90c6d9d6843549fb9227d1a7aa05033e60772;p=m6w6%2Fext-http

diff --git a/php_http_curl_client.c b/php_http_curl_client.c
index b2beba6..640f3bb 100644
--- a/php_http_curl_client.c
+++ b/php_http_curl_client.c
@@ -10,9 +10,6 @@
     +--------------------------------------------------------------------+
 */
 
-#include <php/Zend/zend.h>
-#include <php/Zend/zend_API.h>
-
 #include "php_http_api.h"
 
 /* resource_factory ops */
@@ -22,7 +19,7 @@ static void *php_http_curl_ctor(void *opaque TSRMLS_DC)
 	void *ch;
 
 	if ((ch = curl_easy_init())) {
-		get_storage(ch);
+		php_http_curl_client_get_storage(ch);
 		return ch;
 	}
 	return NULL;
@@ -34,7 +31,7 @@ static void *php_http_curl_copy(void *opaque, void *handle TSRMLS_DC)
 
 	if ((ch = curl_easy_duphandle(handle))) {
 		curl_easy_reset(ch);
-		get_storage(ch);
+		php_http_curl_client_get_storage(ch);
 		return ch;
 	}
 	return NULL;
@@ -42,7 +39,7 @@ static void *php_http_curl_copy(void *opaque, void *handle TSRMLS_DC)
 
 static void php_http_curl_dtor(void *opaque, void *handle TSRMLS_DC)
 {
-	php_http_curl_client_storage_t *st = get_storage(handle);
+	php_http_curl_client_storage_t *st = php_http_curl_client_get_storage(handle);
 
 	curl_easy_cleanup(handle);
 
@@ -359,7 +356,7 @@ static STATUS get_info(CURL *ch, HashTable *info)
 		}
 	}
 #endif
-	add_assoc_string_ex(&array, "error", sizeof("error"), get_storage(ch)->errorbuffer, 1);
+	add_assoc_string_ex(&array, "error", sizeof("error"), php_http_curl_client_get_storage(ch)->errorbuffer, 1);
 
 	return SUCCESS;
 }
@@ -391,7 +388,7 @@ static STATUS php_http_curl_client_option_set_cookiestore(php_http_option_t *opt
 	CURL *ch = curl->handle;
 
 	if (val) {
-		php_http_curl_client_storage_t *storage = get_storage(curl->handle);
+		php_http_curl_client_storage_t *storage = php_http_curl_client_get_storage(curl->handle);
 
 		if (storage->cookiestore) {
 			pefree(storage->cookiestore, 1);
@@ -529,7 +526,7 @@ static STATUS php_http_curl_client_option_set_range(php_http_option_t *opt, zval
 
 		FOREACH_VAL(pos, val, rr) {
 			if (Z_TYPE_PP(rr) == IS_ARRAY) {
-				if (2 == php_http_array_list(*rr TSRMLS_CC, 2, &rb, &re)) {
+				if (2 == php_http_array_list(Z_ARRVAL_PP(rr) TSRMLS_CC, 2, &rb, &re)) {
 					if (	((Z_TYPE_PP(rb) == IS_LONG) || ((Z_TYPE_PP(rb) == IS_STRING) && is_numeric_string(Z_STRVAL_PP(rb), Z_STRLEN_PP(rb), NULL, NULL, 1))) &&
 							((Z_TYPE_PP(re) == IS_LONG) || ((Z_TYPE_PP(re) == IS_STRING) && is_numeric_string(Z_STRVAL_PP(re), Z_STRLEN_PP(re), NULL, NULL, 1)))) {
 						zval *rbl = php_http_ztyp(IS_LONG, *rb);
@@ -617,7 +614,7 @@ static STATUS php_http_curl_client_option_set_portrange(php_http_option_t *opt,
 	if (val && Z_TYPE_P(val) != IS_NULL) {
 		zval **z_port_start, *zps_copy = NULL, **z_port_end, *zpe_copy = NULL;
 
-		switch (php_http_array_list(val TSRMLS_CC, 2, &z_port_start, &z_port_end)) {
+		switch (php_http_array_list(Z_ARRVAL_P(val) TSRMLS_CC, 2, &z_port_start, &z_port_end)) {
 		case 2:
 			zps_copy = php_http_ztyp(IS_LONG, *z_port_start);
 			zpe_copy = php_http_ztyp(IS_LONG, *z_port_end);
@@ -1095,7 +1092,7 @@ static STATUS php_http_curl_client_reset(php_http_client_t *h)
 	CURL *ch = curl->handle;
 	php_http_curl_client_storage_t *st;
 
-	if ((st = get_storage(ch))) {
+	if ((st = php_http_curl_client_get_storage(ch))) {
 		if (st->url) {
 			pefree(st->url, 1);
 			st->url = NULL;
@@ -1142,7 +1139,7 @@ PHP_HTTP_API STATUS php_http_curl_client_prepare(php_http_client_t *h, php_http_
 {
 	size_t body_size;
 	php_http_curl_client_t *curl = h->ctx;
-	php_http_curl_client_storage_t *storage = get_storage(curl->handle);
+	php_http_curl_client_storage_t *storage = php_http_curl_client_get_storage(curl->handle);
 	TSRMLS_FETCH_FROM_CTX(h->ts);
 
 	/* request url */
@@ -1234,7 +1231,7 @@ static STATUS php_http_curl_client_exec(php_http_client_t *h, php_http_message_t
 	uint tries = 0;
 	CURLcode result;
 	php_http_curl_client_t *curl = h->ctx;
-	php_http_curl_client_storage_t *storage = get_storage(curl->handle);
+	php_http_curl_client_storage_t *storage = php_http_curl_client_get_storage(curl->handle);
 	TSRMLS_FETCH_FROM_CTX(h->ts);
 
 	if (SUCCESS != php_http_curl_client_prepare(h, msg)) {
@@ -1302,7 +1299,7 @@ static STATUS php_http_curl_client_setopt(php_http_client_t *h, php_http_client_
 
 		case PHP_HTTP_CLIENT_OPT_COOKIES_ENABLE:
 			/* are cookies already enabled anyway? */
-			if (!get_storage(curl->handle)->cookiestore) {
+			if (!php_http_curl_client_get_storage(curl->handle)->cookiestore) {
 				if (CURLE_OK != curl_easy_setopt(curl->handle, CURLOPT_COOKIEFILE, "")) {
 					return FAILURE;
 				}