#endif
#include "php.h"
+#include "php_streams.h"
+
#include "php_http.h"
#include "php_http_std_defs.h"
#include "php_http_api.h"
#include "php_http_cache_api.h"
-#include "php_http_curl_api.h"
+#include "php_http_request_api.h"
#include "php_http_date_api.h"
#include "php_http_headers_api.h"
#include "php_http_message_api.h"
INIT_PARR(obj, options);
INIT_PARR(obj, responseInfo);
INIT_PARR(obj, responseData);
- INIT_PARR(obj, postData);
+ INIT_PARR(obj, postFields);
INIT_PARR(obj, postFiles);
if (URL) {
FREE_PARR(obj, options);
FREE_PARR(obj, responseInfo);
FREE_PARR(obj, responseData);
- FREE_PARR(obj, postData);
+ FREE_PARR(obj, postFields);
FREE_PARR(obj, postFiles);
}
/* }}} */
}
/* }}} */
-/* {{{ proto bool HttpRequest::addPostData(array post_data)
+/* {{{ proto bool HttpRequest::addPostFields(array post_data)
*
* Adds POST data entries.
* Affects only POST requests.
*/
-PHP_METHOD(HttpRequest, addPostData)
+PHP_METHOD(HttpRequest, addPostFields)
{
zval *post, *post_data;
getObject(http_request_object, obj);
RETURN_FALSE;
}
- post = GET_PROP(obj, postData);
+ post = GET_PROP(obj, postFields);
array_merge(post_data, post);
RETURN_TRUE;
}
/* }}} */
-/* {{{ proto bool HttpRequest::setPostData(array post_data)
+/* {{{ proto bool HttpRequest::setPostFields(array post_data)
*
* Set the POST data entries.
* Overwrites previously set POST data.
* Affects only POST requests.
*/
-PHP_METHOD(HttpRequest, setPostData)
+PHP_METHOD(HttpRequest, setPostFields)
{
zval *post, *post_data;
getObject(http_request_object, obj);
RETURN_FALSE;
}
- post = GET_PROP(obj, postData);
+ post = GET_PROP(obj, postFields);
zend_hash_clean(Z_ARRVAL_P(post));
array_copy(post_data, post);
}
/* }}}*/
-/* {{{ proto array HttpRequest::getPostData()
+/* {{{ proto array HttpRequest::getPostFields()
*
* Get previously set POST data.
*/
-PHP_METHOD(HttpRequest, getPostData)
+PHP_METHOD(HttpRequest, getPostFields)
{
zval *post_data;
getObject(http_request_object, obj);
NO_ARGS;
- post_data = GET_PROP(obj, postData);
+ post_data = GET_PROP(obj, postFields);
array_init(return_value);
array_copy(post_data, return_value);
}
/* }}} */
-/* {{{ proto void HttpRequest::unsetPostData()
+/* {{{ proto void HttpRequest::unsetPostFields()
*
* Clean POST data entires.
* Affects only POST requests.
*/
-PHP_METHOD(HttpRequest, unsetPostData)
+PHP_METHOD(HttpRequest, unsetPostFields)
{
zval *post_data;
getObject(http_request_object, obj);
NO_ARGS;
- post_data = GET_PROP(obj, postData);
+ post_data = GET_PROP(obj, postFields);
zend_hash_clean(Z_ARRVAL_P(post_data));
}
/* }}} */
* <?php
* $r = new HttpRequest('http://example.com/form.php', HTTP_POST);
* $r->setOptions(array('cookies' => array('lang' => 'de')));
- * $r->addPostData(array('user' => 'mike', 'pass' => 's3c|r3t'));
+ * $r->addpostFields(array('user' => 'mike', 'pass' => 's3c|r3t'));
* $r->addPostFile('image', 'profile.jpg', 'image/jpeg');
* if ($r->send()) {
* echo $r->getResponseBody();
switch (Z_LVAL_P(meth))
{
case HTTP_GET:
- status = http_get_ex(obj->ch, request_uri, Z_ARRVAL_P(opts), Z_ARRVAL_P(info), &obj->response);
+ case HTTP_HEAD:
+ status = http_request_ex(obj->ch, Z_LVAL_P(meth), request_uri, NULL, Z_ARRVAL_P(opts), Z_ARRVAL_P(info), &obj->response);
break;
- case HTTP_HEAD:
- status = http_head_ex(obj->ch, request_uri, Z_ARRVAL_P(opts), Z_ARRVAL_P(info), &obj->response);
+ case HTTP_PUT:
+ {
+ http_request_body body;
+ php_stream *stream;
+ php_stream_statbuf ssb;
+ zval *file = GET_PROP(obj, putFile);
+
+ if ( (stream = php_stream_open_wrapper(Z_STRVAL_P(file), , "rb", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL)) &&
+ !php_stream_stat(stream, &ssb)) {
+ body.type = HTTP_REQUEST_BODY_UPLOADFILE;
+ body.data = stream;
+ body.size = ssb.sb.st_size;
+
+ status = http_put_ex(obj->ch, request_uri, &body, Z_ARRVAL_P(opts), Z_ARRVAL_P(info), &obj->response);
+ http_request_body_dtor(&body);
+ } else {
+ status = FAILURE;
+ }
+ }
break;
case HTTP_POST:
- {
- zval *post_files, *post_data;
-
- post_files = GET_PROP(obj, postFiles);
- post_data = GET_PROP(obj, postData);
-
- if (!zend_hash_num_elements(Z_ARRVAL_P(post_files))) {
-
- /* urlencoded post */
- status = http_post_array_ex(obj->ch, request_uri, Z_ARRVAL_P(post_data), Z_ARRVAL_P(opts), Z_ARRVAL_P(info), &obj->response);
-
- } else {
-
- /*
- * multipart post
- */
- char *key = NULL;
- long idx;
- zval **data;
- struct curl_httppost *http_post_data[2] = {NULL, NULL};
-
- /* normal data */
- FOREACH_KEYVAL(post_data, key, idx, data) {
- if (key) {
- convert_to_string_ex(data);
- curl_formadd(&http_post_data[0], &http_post_data[1],
- CURLFORM_COPYNAME, key,
- CURLFORM_COPYCONTENTS, Z_STRVAL_PP(data),
- CURLFORM_CONTENTSLENGTH, Z_STRLEN_PP(data),
- CURLFORM_END
- );
-
- /* reset */
- key = NULL;
- }
- }
-
- /* file data */
- FOREACH_VAL(post_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)) {
-
- curl_formadd(&http_post_data[0], &http_post_data[1],
- CURLFORM_COPYNAME, Z_STRVAL_PP(name),
- CURLFORM_FILE, Z_STRVAL_PP(file),
- CURLFORM_CONTENTTYPE, Z_STRVAL_PP(type),
- CURLFORM_END
- );
- }
- }
+ {
+ http_request_body body;
+ zval *fields = GET_PROP(obj, postFields), *files = GET_PROP(obj, postFiles);
- status = http_post_curldata_ex(obj->ch, request_uri, http_post_data[0], Z_ARRVAL_P(opts), Z_ARRVAL_P(info), &obj->response);
- curl_formfree(http_post_data[0]);
- }
+ if (SUCCESS == (status = http_request_body_fill(&body, Z_ARRVAL_P(fields), Z_ARRVAL_P(files)))) {
+ status = http_post_ex(obj->ch, request_uri, &body, Z_ARRVAL_P(opts), Z_ARRVAL_P(info), &obj->response);
+ http_request_body_dtor(&body);
}
+ }
break;
default:
+ {
+ http_request_body body;
+ zval *post = GET_PROP(obj, postData);
+
+ body.type = HTTP_REQUEST_BODY_CSTRING;
+ body.data = Z_STRVAL_P(post);
+ body.size = Z_STRLEN_P(post);
+
+ status = http_request_ex(obj->ch, Z_LVAL_P(meth), request_uri, &body, Z_ARRVAL_P(opts), Z_ARRVAL_P(info), &obj->response);
+ }
break;
}
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/
-