#include "php_http_std_defs.h"
#include "php_http_request_object.h"
#include "php_http_request_api.h"
+#include "php_http_request_pool_api.h"
#include "php_http_api.h"
#include "php_http_url_api.h"
#include "php_http_message_api.h"
o = ecalloc(1, sizeof(http_request_object));
o->zo.ce = ce;
o->ch = curl_easy_init();
- o->attached = 0;
+ o->pool = NULL;
phpstr_init_ex(&o->response, HTTP_CURLBUF_SIZE, 0);
STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_ptr, http_request_body *body TSRMLS_DC)
{
zval *meth, *URL, *qdata, *opts;
- char *request_uri, *uri;
+ char *request_uri;
STATUS status;
if (!body) {
}
strncat(request_uri, Z_STRVAL_P(qdata), HTTP_URI_MAXLEN - strlen(request_uri));
}
-
- uri = http_request_copystr(request_uri);
- efree(request_uri);
switch (Z_LVAL_P(meth))
{
case HTTP_GET:
case HTTP_HEAD:
body->type = -1;
- status = http_request_init(obj->ch, Z_LVAL_P(meth), uri, NULL, Z_ARRVAL_P(opts), &obj->response);
+ status = http_request_init(obj->ch, Z_LVAL_P(meth), request_uri, NULL, Z_ARRVAL_P(opts), &obj->response);
break;
case HTTP_PUT:
body->data = stream;
body->size = ssb.sb.st_size;
- status = http_request_init(obj->ch, HTTP_PUT, uri, body, Z_ARRVAL_P(opts), &obj->response);
+ status = http_request_init(obj->ch, HTTP_PUT, request_uri, body, Z_ARRVAL_P(opts), &obj->response);
} else {
status = FAILURE;
}
zval *fields = GET_PROP(obj, postFields), *files = GET_PROP(obj, postFiles);
if (SUCCESS == (status = http_request_body_fill(body, Z_ARRVAL_P(fields), Z_ARRVAL_P(files)))) {
- status = http_request_init(obj->ch, HTTP_POST, uri, body, Z_ARRVAL_P(opts), &obj->response);
+ status = http_request_init(obj->ch, HTTP_POST, request_uri, body, Z_ARRVAL_P(opts), &obj->response);
}
}
break;
body->data = Z_STRVAL_P(post);
body->size = Z_STRLEN_P(post);
- status = http_request_init(obj->ch, Z_LVAL_P(meth), uri, body, Z_ARRVAL_P(opts), &obj->response);
+ status = http_request_init(obj->ch, Z_LVAL_P(meth), request_uri, body, Z_ARRVAL_P(opts), &obj->response);
}
break;
}
+ efree(request_uri);
return status;
}
-STATUS _http_request_object_responsehandler(http_request_object *obj, zval *this_ptr, HashTable *info TSRMLS_DC)
+STATUS _http_request_object_responsehandler(http_request_object *obj, zval *this_ptr TSRMLS_DC)
{
http_message *msg;
-
+
phpstr_fix(&obj->response);
if (msg = http_message_parse(PHPSTR_VAL(&obj->response), PHPSTR_LEN(&obj->response))) {
char *body;
size_t body_len;
- zval *headers, *message = GET_PROP(obj, responseMessage), *resp = GET_PROP(obj, responseData);
+ zval *headers, *message, *resp = GET_PROP(obj, responseData), *info = GET_PROP(obj, responseInfo);
UPD_PROP(obj, long, responseCode, msg->info.response.code);
add_assoc_zval(resp, "headers", headers);
add_assoc_stringl(resp, "body", body, body_len, 0);
- //zval_dtor(&message);
- Z_TYPE_P(message) = IS_OBJECT;
+ MAKE_STD_ZVAL(message);
+ message->type = IS_OBJECT;
+ message->is_ref = 1;
message->value.obj = http_message_object_from_msg(msg);
SET_PROP(obj, responseMessage, message);
+ zval_ptr_dtor(&message);
- if (info) {
- http_request_info(obj->ch, info);
- }
+ http_request_info(obj->ch, Z_ARRVAL_P(info));
+ SET_PROP(obj, responseInfo, info);
return SUCCESS;
}