- add missing http_request_body_encode()

[m6w6/ext-http] / http_functions.c

diff --git a/http_functions.c b/http_functions.c
index 2cd1dfe554b4d5974253b35efed8eb37e5201186..ab889cd71d4323c3e6f1fe353e67402c2a5910d5 100644 (file)
--- a/http_functions.c
+++ b/http_functions.c
@@ -1624,6 +1624,126 @@ PHP_FUNCTION(http_put_data)
        http_request_dtor(&request);
 }
 /* }}} */
+
+/* {{{ proto string http_request(int method, string url[, string body[, array options[, array &info]]])
+ *
+ * Performs a custom HTTP request on the supplied url.
+ *
+ * Expects the first parameter to be an integer specifying the request method to use.
+ * Accepts an optional third string parameter containing the raw request body.
+ * See http_get() for a full list of available options.
+ *
+ * Returns the HTTP response(s) as string on success, or FALSE on failure.
+ */
+PHP_FUNCTION(http_request)
+{
+       long meth;
+       char *URL, *data = NULL;
+       int URL_len, data_len = 0;
+       zval *options = NULL, *info = NULL;
+       http_request_body body;
+       http_request request;
+       
+       if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ls|sa/!z", &meth, &URL, &URL_len, &data, &data_len, &options, &info)) {
+               RETURN_FALSE;
+       }
+       
+       if (info) {
+               zval_dtor(info);
+               array_init(info);
+       }
+       
+       RETVAL_FALSE;
+       
+       http_request_init_ex(&request, NULL, meth, URL);
+       request.body = http_request_body_init_ex(&body, HTTP_REQUEST_BODY_CSTRING, data, data_len, 0);
+       if (SUCCESS == http_request_prepare(&request, options?Z_ARRVAL_P(options):NULL)) {
+               http_request_exec(&request);
+               if (info) {
+                       http_request_info(&request, Z_ARRVAL_P(info));
+               }
+               RETVAL_RESPONSE_OR_BODY(request);
+       }
+       http_request_dtor(&request);
+}
+/* }}} */
+
+/* {{{ no-proto string http_request_body_encode(array fields, array files) */
+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;
+       
+       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 != Curl_getFormData(&data, body.data, &size)) {
+                               RETVAL_FALSE;
+                       } else {
+                               phpstr_init_ex(&rbuf, size, PHPSTR_INIT_PREALLOC);
+                               for (ptr = data; ptr; ptr = ptr->next) {
+                                       if (ptr->type) {
+                                               if ((fdata = file_get_contents(ptr->line, &fsize TSRMLS_CC))) {
+                                                       phpstr_append(&rbuf, fdata, fsize);
+                                                       efree(fdata);
+                                               }
+                                       } else {
+                                               phpstr_append(&rbuf, ptr->line, ptr->length);
+                                       }
+                                       curl_free(ptr->line);
+                               }
+                               curl_free(data);
+                               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 */