X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_api.c;h=b92cbfe88b761d874cf3279979758c8f5ca98e5a;hp=ace6b4eb7e4347bcd522e150f95aa70b816187d6;hb=64f9c50ce4d7f7ecc5b414b46fe44c28bf54974d;hpb=e83a7438dc70ed96630887246a1d3aefcf155b1c

diff --git a/http_request_api.c b/http_request_api.c
index ace6b4e..b92cbfe 100644
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -277,12 +277,15 @@ PHP_HTTP_API STATUS _http_request_body_fill(http_request_body *body, HashTable *
 		char *key = NULL;
 		ulong idx;
 		zval **data;
+		HashPosition pos;
 		struct curl_httppost *http_post_data[2] = {NULL, NULL};
 
 		/* normal data */
-		FOREACH_HASH_KEYVAL(fields, key, idx, data) {
+		FOREACH_HASH_KEYVAL(pos, fields, key, idx, data) {
 			CURLcode err;
 			if (key) {
+				zval *orig = *data;
+				
 				convert_to_string_ex(data);
 				err = curl_formadd(&http_post_data[0], &http_post_data[1],
 					CURLFORM_COPYNAME,			key,
@@ -290,6 +293,11 @@ PHP_HTTP_API STATUS _http_request_body_fill(http_request_body *body, HashTable *
 					CURLFORM_CONTENTSLENGTH,	(long) Z_STRLEN_PP(data),
 					CURLFORM_END
 				);
+				
+				if (orig != *data) {
+					zval_ptr_dtor(data);
+				}
+				
 				if (CURLE_OK != err) {
 					http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Could not encode post fields: %s", curl_easy_strerror(err));
 					curl_formfree(http_post_data[0]);
@@ -302,12 +310,14 @@ PHP_HTTP_API STATUS _http_request_body_fill(http_request_body *body, HashTable *
 		}
 
 		/* file data */
-		FOREACH_HASH_VAL(files, data) {
+		FOREACH_HASH_VAL(pos, files, data) {
 			zval **file, **type, **name;
 			
-			if (	SUCCESS != zend_hash_find(Z_ARRVAL_PP(data), "name", sizeof("name"), (void **) &name) ||
-					SUCCESS != zend_hash_find(Z_ARRVAL_PP(data), "type", sizeof("type"), (void **) &type) ||
-					SUCCESS != zend_hash_find(Z_ARRVAL_PP(data), "file", sizeof("file"), (void **) &file)) {
+			if (Z_TYPE_PP(data) != IS_ARRAY) {
+				http_error(HE_NOTICE, HTTP_E_INVALID_PARAM, "Unrecognized type of post file array entry");
+			} else if (	SUCCESS != zend_hash_find(Z_ARRVAL_PP(data), "name", sizeof("name"), (void **) &name) ||
+						SUCCESS != zend_hash_find(Z_ARRVAL_PP(data), "type", sizeof("type"), (void **) &type) ||
+						SUCCESS != zend_hash_find(Z_ARRVAL_PP(data), "file", sizeof("file"), (void **) &file)) {
 				http_error(HE_NOTICE, HTTP_E_INVALID_PARAM, "Post file array entry misses either 'name', 'type' or 'file' entry");
 			} else {
 				CURLcode err = curl_formadd(&http_post_data[0], &http_post_data[1],
@@ -493,12 +503,13 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char
 	if (zoption = http_curl_getopt(options, "headers", IS_ARRAY)) {
 		char *header_key;
 		ulong header_idx;
+		HashPosition pos;
 		struct curl_slist *headers = NULL;
 
-		FOREACH_KEY(zoption, header_key, header_idx) {
+		FOREACH_KEY(pos, zoption, header_key, header_idx) {
 			if (header_key) {
 				zval **header_val;
-				if (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(zoption), (void **) &header_val)) {
+				if (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_P(zoption), (void **) &header_val, &pos)) {
 					char header[1024] = {0};
 					snprintf(header, 1023, "%s: %s", header_key, Z_STRVAL_PP(header_val));
 					headers = curl_slist_append(headers, http_request_data_copy(COPY_STRING, header));
@@ -518,12 +529,13 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char
 	if (zoption = http_curl_getopt(options, "cookies", IS_ARRAY)) {
 		char *cookie_key = NULL;
 		ulong cookie_idx = 0;
+		HashPosition pos;
 		phpstr *qstr = phpstr_new();
 
-		FOREACH_KEY(zoption, cookie_key, cookie_idx) {
+		FOREACH_KEY(pos, zoption, cookie_key, cookie_idx) {
 			if (cookie_key) {
 				zval **cookie_val;
-				if (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(zoption), (void **) &cookie_val)) {
+				if (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_P(zoption), (void **) &cookie_val, &pos)) {
 					phpstr_appendf(qstr, "%s=%s; ", cookie_key, Z_STRVAL_PP(cookie_val));
 				}
 
@@ -596,8 +608,9 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char
 		ulong idx;
 		char *key = NULL;
 		zval **param;
+		HashPosition pos;
 
-		FOREACH_KEYVAL(zoption, key, idx, param) {
+		FOREACH_KEYVAL(pos, zoption, key, idx, param) {
 			if (key) {
 				HTTP_CURL_OPT_SSL_STRING(CERT);
 #if LIBCURL_VERSION_NUM >= 0x070903
@@ -834,10 +847,6 @@ static int http_curl_raw_callback(CURL *ch, curl_infotype type, char *data, size
 {
 	HTTP_REQUEST_CALLBACK_DATA(ctx, http_request_conv *, conv);
 
-#if 0
-	fprintf(stderr, "DEBUG: %s\n", data);
-#endif
-
 	switch (type)
 	{
 		case CURLINFO_DATA_IN:
@@ -858,6 +867,26 @@ static int http_curl_raw_callback(CURL *ch, curl_infotype type, char *data, size
 				phpstr_append(conv->request, data, length);
 			}
 		break;
+#if 0
+		default:
+			fprintf(stderr, "## ", type);
+			if (!type) {
+				fprintf(stderr, "%s", data);
+			} else {
+				ulong i;
+				for (i = 1; i <= length; ++i) {
+					fprintf(stderr, "%02X ", data[i-1] & 0xFF);
+					if (!(i % 20)) {
+						fprintf(stderr, "\n## ");
+					}
+				}
+				fprintf(stderr, "\n");
+			}
+			if (data[length-1] != 0xa) {
+				fprintf(stderr, "\n");
+			}
+		break;
+#endif
 	}
 
 	if (type) {
@@ -907,9 +936,9 @@ static void http_ssl_lock(int mode, int n, const char * file, int line)
 	}
 }
 
-static unsigned long http_ssl_id(void)
+static ulong http_ssl_id(void)
 {
-	return (unsigned long) tsrm_thread_id();
+	return (ulong) tsrm_thread_id();
 }
 
 static inline void http_ssl_init(void)