| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-2006, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-2007, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
#include "php_http_url_api.h"
#include "php_http_request_body_api.h"
-#if defined(HAVE_CURL_GETFORMDATA) && !defined(HAVE_CURL_FORMGET)
-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);
-
-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;
-}
-
-static int curl_formget(struct FormData *post, phpstr *str TSRMLS_DC)
-{
- int fgc_error = 0;
- char *fdata;
- size_t fsize;
- struct FormData *next, *pptr = post;
-
- while (pptr) {
- next = pptr->next;
-
- if (!fgc_error) {
- if (pptr->type) {
- if ((fdata = file_get_contents(pptr->line, &fsize TSRMLS_CC))) {
- phpstr_append(str, fdata, fsize);
- efree(fdata);
- } else {
- fgc_error = 1;
- }
- } else {
- phpstr_append(str, pptr->line, pptr->length);
- }
- }
-
- curl_free(pptr->line);
- curl_free(pptr);
- pptr = next;
- }
-
- return fgc_error;
-}
-#endif
-
-
/* {{{ http_request_body *http_request_body_new() */
PHP_HTTP_API http_request_body *_http_request_body_init_ex(http_request_body *body, int type, void *data, size_t size, zend_bool free ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC)
{
PHP_HTTP_API http_request_body *_http_request_body_fill(http_request_body *body, HashTable *fields, HashTable *files ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC)
{
if (files && (zend_hash_num_elements(files) > 0)) {
- char *key = NULL;
- ulong idx;
- zval **data;
+ HashKey key = initHashKey(0);
+ zval **data_ptr;
HashPosition pos;
struct curl_httppost *http_post_data[2] = {NULL, NULL};
/* normal data */
if (fields) {
- FOREACH_HASH_KEYVAL(pos, fields, key, idx, data) {
- if (key) {
+ FOREACH_HASH_KEYVAL(pos, fields, key, data_ptr) {
+ if (key.type == HASH_KEY_IS_STRING) {
CURLcode err;
- zval *orig = *data;
+ zval *data = http_zsep(IS_STRING, *data_ptr);
- convert_to_string_ex(data);
err = curl_formadd(&http_post_data[0], &http_post_data[1],
- CURLFORM_COPYNAME, key,
- CURLFORM_COPYCONTENTS, Z_STRVAL_PP(data),
- CURLFORM_CONTENTSLENGTH, (long) Z_STRLEN_PP(data),
+ CURLFORM_COPYNAME, key.str,
+ CURLFORM_COPYCONTENTS, Z_STRVAL_P(data),
+ CURLFORM_CONTENTSLENGTH, (long) Z_STRLEN_P(data),
CURLFORM_END
);
- if (orig != *data) {
- zval_ptr_dtor(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]);
return NULL;
}
-
- /* reset */
- key = NULL;
}
}
}
/* file data */
- FOREACH_HASH_VAL(pos, files, data) {
- zval **file, **type, **name;
+ FOREACH_HASH_VAL(pos, files, data_ptr) {
+ zval **file_ptr, **type_ptr, **name_ptr;
- if (Z_TYPE_PP(data) != IS_ARRAY) {
+ if (Z_TYPE_PP(data_ptr) != 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)) {
+ } else if ( SUCCESS != zend_hash_find(Z_ARRVAL_PP(data_ptr), "name", sizeof("name"), (void *) &name_ptr) ||
+ SUCCESS != zend_hash_find(Z_ARRVAL_PP(data_ptr), "type", sizeof("type"), (void *) &type_ptr) ||
+ SUCCESS != zend_hash_find(Z_ARRVAL_PP(data_ptr), "file", sizeof("file"), (void *) &file_ptr)) {
http_error(HE_NOTICE, HTTP_E_INVALID_PARAM, "Post file array entry misses either 'name', 'type' or 'file' entry");
} else {
CURLcode err;
const char *path;
- zval *ofile = *file, *otype = *type, *oname = *name;
-
- convert_to_string_ex(file);
- convert_to_string_ex(type);
- convert_to_string_ex(name);
+ zval *file = http_zsep(IS_STRING, *file_ptr);
+ zval *type = http_zsep(IS_STRING, *type_ptr);
+ zval *name = http_zsep(IS_STRING, *name_ptr);
- HTTP_CHECK_OPEN_BASEDIR(Z_STRVAL_PP(file), curl_formfree(http_post_data[0]); return NULL);
+ HTTP_CHECK_OPEN_BASEDIR(Z_STRVAL_P(file), curl_formfree(http_post_data[0]); return NULL);
/* this is blatant but should be sufficient for most cases */
- if (strncasecmp(Z_STRVAL_PP(file), "file://", lenof("file://"))) {
- path = Z_STRVAL_PP(file);
+ if (strncasecmp(Z_STRVAL_P(file), "file://", lenof("file://"))) {
+ path = Z_STRVAL_P(file);
} else {
- path = Z_STRVAL_PP(file) + lenof("file://");
+ path = Z_STRVAL_P(file) + lenof("file://");
}
err = curl_formadd(&http_post_data[0], &http_post_data[1],
- CURLFORM_COPYNAME, Z_STRVAL_PP(name),
+ CURLFORM_COPYNAME, Z_STRVAL_P(name),
CURLFORM_FILE, path,
- CURLFORM_CONTENTTYPE, Z_STRVAL_PP(type),
+ CURLFORM_CONTENTTYPE, Z_STRVAL_P(type),
CURLFORM_END
);
- if (ofile != *file) zval_ptr_dtor(file);
- if (otype != *type) zval_ptr_dtor(type);
- if (oname != *name) zval_ptr_dtor(name);
+ zval_ptr_dtor(&file);
+ zval_ptr_dtor(&type);
+ zval_ptr_dtor(&name);
if (CURLE_OK != err) {
http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Could not encode post files: %s", curl_easy_strerror(err));
switch (body->type) {
case HTTP_REQUEST_BODY_CURLPOST:
{
-#if defined(HAVE_CURL_FORMGET)
+#ifdef HAVE_CURL_FORMGET
phpstr str;
phpstr_init_ex(&str, 0x8000, 0);
*len = PHPSTR_LEN(&str);
return SUCCESS;
}
-#elif defined(HAVE_CURL_GETFORMDATA)
- struct FormData *data;
- curl_off_t size;
-
- if (!Curl_getFormData(&data, body->data, &size)) {
- phpstr str;
-
- phpstr_init_ex(&str, (size_t) size, 0);
- if (curl_formget(data, &str TSRMLS_CC)) {
- phpstr_dtor(&str);
- } else {
- phpstr_fix(&str);
- *buf = PHPSTR_VAL(&str);
- *len = PHPSTR_LEN(&len);
- return SUCCESS;
- }
- }
#endif
break;
}
projects / m6w6 / ext-http / blobdiff