#include "php_http_std_defs.h"
#include "php_http_request_object.h"
+#include "php_http_request_api.h"
#ifdef ZEND_ENGINE_2
#ifdef HTTP_HAVE_CURL
PHP_ME(HttpRequest, addQueryData, NULL, ZEND_ACC_PUBLIC)
PHP_ME(HttpRequest, unsetQueryData, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpRequest, setPostData, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpRequest, getPostData, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpRequest, addPostData, NULL, ZEND_ACC_PUBLIC)
- PHP_ME(HttpRequest, unsetPostData, NULL, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpRequest, setPostFields, NULL, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpRequest, getPostFields, NULL, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpRequest, addPostFields, NULL, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpRequest, unsetPostFields, NULL, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpRequest, setPostFiles, NULL, ZEND_ACC_PUBLIC)
PHP_ME(HttpRequest, addPostFile, NULL, ZEND_ACC_PUBLIC)
PHP_ME(HttpRequest, getPostFiles, NULL, ZEND_ACC_PUBLIC)
PHP_ME(HttpRequest, unsetPostFiles, NULL, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpRequest, setPutFile, NULL, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpRequest, getPutFile, NULL, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpRequest, unsetPutFile, NULL, ZEND_ACC_PUBLIC)
+
PHP_ME(HttpRequest, send, NULL, ZEND_ACC_PUBLIC)
PHP_ME(HttpRequest, getResponseData, NULL, ZEND_ACC_PUBLIC)
PHP_ME(HttpRequest, getResponseCode, NULL, ZEND_ACC_PUBLIC)
PHP_ME(HttpRequest, getResponseBody, NULL, ZEND_ACC_PUBLIC)
PHP_ME(HttpRequest, getResponseInfo, NULL, ZEND_ACC_PUBLIC)
+ PHP_ME(HttpRequest, getResponseMessage, NULL, ZEND_ACC_PUBLIC)
{NULL, NULL, NULL}
};
void _http_request_object_init(INIT_FUNC_ARGS)
{
HTTP_REGISTER_CLASS_EX(HttpRequest, http_request_object, NULL, 0);
+
+ /* HTTP/1.1 */
HTTP_LONG_CONSTANT("HTTP_GET", HTTP_GET);
HTTP_LONG_CONSTANT("HTTP_HEAD", HTTP_HEAD);
HTTP_LONG_CONSTANT("HTTP_POST", HTTP_POST);
+ HTTP_LONG_CONSTANT("HTTP_PUT", HTTP_PUT);
+ HTTP_LONG_CONSTANT("HTTP_DELETE", HTTP_DELETE);
+ HTTP_LONG_CONSTANT("HTTP_OPTIONS", HTTP_OPTIONS);
+ HTTP_LONG_CONSTANT("HTTP_TRACE", HTTP_TRACE);
+ HTTP_LONG_CONSTANT("HTTP_CONNECT", HTTP_CONNECT);
+ /* WebDAV - RFC 2518 */
+ HTTP_LONG_CONSTANT("HTTP_PROPFIND", HTTP_PROPFIND);
+ HTTP_LONG_CONSTANT("HTTP_PROPPATCH", HTTP_PROPPATCH);
+ HTTP_LONG_CONSTANT("HTTP_MKCOL", HTTP_MKCOL);
+ HTTP_LONG_CONSTANT("HTTP_COPY", HTTP_COPY);
+ HTTP_LONG_CONSTANT("HTTP_MOVE", HTTP_MOVE);
+ HTTP_LONG_CONSTANT("HTTP_LOCK", HTTP_LOCK);
+ HTTP_LONG_CONSTANT("HTTP_UNLOCK", HTTP_UNLOCK);
+ /* WebDAV Versioning - RFC 3253 */
+ HTTP_LONG_CONSTANT("HTTP_VERSION_CONTROL", HTTP_VERSION_CONTROL);
+ HTTP_LONG_CONSTANT("HTTP_REPORT", HTTP_REPORT);
+ HTTP_LONG_CONSTANT("HTTP_CHECKOUT", HTTP_CHECKOUT);
+ HTTP_LONG_CONSTANT("HTTP_CHECKIN", HTTP_CHECKIN);
+ HTTP_LONG_CONSTANT("HTTP_UNCHECKOUT", HTTP_UNCHECKOUT);
+ HTTP_LONG_CONSTANT("HTTP_MKWORKSPACE", HTTP_MKWORKSPACE);
+ HTTP_LONG_CONSTANT("HTTP_UPDATE", HTTP_UPDATE);
+ HTTP_LONG_CONSTANT("HTTP_LABEL", HTTP_LABEL);
+ HTTP_LONG_CONSTANT("HTTP_MERGE", HTTP_MERGE);
+ HTTP_LONG_CONSTANT("HTTP_BASELINE_CONTROL", HTTP_BASELINE_CONTROL);
+ HTTP_LONG_CONSTANT("HTTP_MKACTIVITY", HTTP_MKACTIVITY);
+ /* WebDAV Access Control - RFC 3744 */
+ HTTP_LONG_CONSTANT("HTTP_ACL", HTTP_ACL);
+
+
# if LIBCURL_VERSION_NUM >= 0x070a05
HTTP_LONG_CONSTANT("HTTP_AUTH_BASIC", CURLAUTH_BASIC);
HTTP_LONG_CONSTANT("HTTP_AUTH_DIGEST", CURLAUTH_DIGEST);
o->zo.ce = ce;
o->ch = curl_easy_init();
+ phpstr_init_ex(&o->response, HTTP_CURLBUF_SIZE, 0);
+
ALLOC_HASHTABLE(OBJ_PROP(o));
zend_hash_init(OBJ_PROP(o), 0, NULL, ZVAL_PTR_DTOR, 0);
zend_hash_copy(OBJ_PROP(o), &ce->default_properties, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
DCL_PROP_N(PROTECTED, options);
DCL_PROP_N(PROTECTED, responseInfo);
DCL_PROP_N(PROTECTED, responseData);
- DCL_PROP_N(PROTECTED, postData);
+ DCL_PROP_N(PROTECTED, responseCode);
+ DCL_PROP_N(PROTECTED, responseMessage);
+ DCL_PROP_N(PROTECTED, postFields);
DCL_PROP_N(PROTECTED, postFiles);
DCL_PROP(PROTECTED, long, method, HTTP_GET);
DCL_PROP(PROTECTED, string, url, "");
DCL_PROP(PROTECTED, string, contentType, "");
DCL_PROP(PROTECTED, string, queryData, "");
- DCL_PROP(PROTECTED, string, postData, "");
+ DCL_PROP(PROTECTED, string, putFile, "");
}
void _http_request_object_free(zend_object *object TSRMLS_DC)
}
if (o->ch) {
curl_easy_cleanup(o->ch);
- o->ch = NULL;
}
+ phpstr_dtor(&o->response);
efree(o);
}