- remove hackish UPLOADDATA code

[m6w6/ext-http] / http_request_object.c

diff --git a/http_request_object.c b/http_request_object.c
index 1cc8df566c0589f5d386b57dd7125bf0b22f070c..1c99c8c215e90231fc8a5c17634db91bf7bc8e1b 100644 (file)
--- a/http_request_object.c
+++ b/http_request_object.c
@@ -156,7 +156,7 @@ zend_object_value _http_request_object_new(zend_class_entry *ce TSRMLS_DC)
        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);
 
@@ -208,7 +208,7 @@ void _http_request_object_free(zend_object *object TSRMLS_DC)
 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) {
@@ -283,7 +283,7 @@ STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_
                        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;
        }