X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_functions.c;h=2675fbcae41ad9a850ba40de481c958380d41f83;hb=0dd8ced9885c983b6814dbea762fc29bc2a0ffd0;hp=89a8c61ca093c6ca1086a513e8121830676f73fd;hpb=33601b5f7d0b26b1e7f95ca44f349426594fbece;p=m6w6%2Fext-http

diff --git a/http_functions.c b/http_functions.c
index 89a8c61..2675fbc 100644
--- a/http_functions.c
+++ b/http_functions.c
@@ -1667,6 +1667,100 @@ PHP_FUNCTION(http_request)
 	http_request_dtor(&request);
 }
 /* }}} */
+
+/* {{{ proto string http_request_body_encode(array fields, array files)
+ *
+ * Generate x-www-form-urlencoded resp. form-data encoded request body.
+ *
+ * Returns encoded string on success, or FALSE on failure.
+ */
+static char *file_get_contents(char *file, size_t *len TSRMLS_DC)
+{
+	php_stream *s = NULL;
+	char *buf = NULL;
+	
+	if ((s = php_stream_open_wrapper_ex(file, "rb", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL, HTTP_DEFAULT_STREAM_CONTEXT))) {
+		*len = php_stream_copy_to_mem(s, &buf, (size_t) -1, 0);
+		php_stream_close(s);
+	} else {
+		*len = 0;
+	}
+	return buf;
+}
+struct FormData {
+	struct FormData *next;
+	int type;
+	char *line;
+	size_t length;
+};
+CURLcode Curl_getFormData(struct FormData **, struct curl_httppost *post, curl_off_t *size);
+PHP_FUNCTION(http_request_body_encode)
+{
+	zval *fields = NULL, *files = NULL;
+	HashTable *fields_ht, *files_ht;
+	http_request_body body;
+	phpstr rbuf;
+	struct FormData *data, *ptr;
+	curl_off_t size;
+	char *fdata = NULL;
+	size_t fsize = 0;
+	CURLcode rc;
+	int fgc_error = 0;
+	
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a!a!", &fields, &files)) {
+		RETURN_FALSE;
+	}
+	
+	fields_ht = (fields && Z_TYPE_P(fields) == IS_ARRAY) ? Z_ARRVAL_P(fields) : NULL;
+	files_ht = (files && Z_TYPE_P(files) == IS_ARRAY) ? Z_ARRVAL_P(files) : NULL;
+	if (!http_request_body_fill(&body, fields_ht, files_ht)) {
+		RETURN_FALSE;
+	}
+	
+	switch (body.type)
+	{
+		case HTTP_REQUEST_BODY_CURLPOST:
+			if (CURLE_OK != (rc = Curl_getFormData(&data, body.data, &size))) {
+				http_error_ex(HE_WARNING, HTTP_E_RUNTIME, "Could not encode request body: %s", curl_easy_strerror(rc));
+				RETVAL_FALSE;
+			} else {
+				phpstr_init_ex(&rbuf, (size_t) size, PHPSTR_INIT_PREALLOC);
+				for (ptr = data; ptr; ptr = ptr->next) {
+					if (!fgc_error) {
+						if (ptr->type) {
+							if ((fdata = file_get_contents(ptr->line, &fsize TSRMLS_CC))) {
+								phpstr_append(&rbuf, fdata, fsize);
+								efree(fdata);
+							} else {
+								fgc_error = 1;
+							}
+						} else {
+							phpstr_append(&rbuf, ptr->line, ptr->length);
+						}
+					}
+					curl_free(ptr->line);
+				}
+				curl_free(data);
+				if (fgc_error) {
+					phpstr_dtor(&rbuf);
+					RETVAL_FALSE;
+				} else {
+					RETVAL_PHPSTR_VAL(&rbuf);
+				}
+			}
+			http_request_body_dtor(&body);
+		break;
+		
+		case HTTP_REQUEST_BODY_CSTRING:
+			RETVAL_STRINGL(body.data, body.size, 0);
+		break;
+		
+		default:
+			http_request_body_dtor(&body);
+			RETVAL_FALSE;
+		break;
+	}
+}
 #endif /* HTTP_HAVE_CURL */
 /* }}} HAVE_CURL */