X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_object.c;h=09c43a56ae1a527ef59df29fe07057930e601f79;hp=c5fd2936b76688d74f0e1ed7e3e3bd2b969b8e88;hb=b1ace11a9604ffcc496d32827aa66a2ba99db5ff;hpb=64616c6675baf9dd168a7e2763e3124db0219921 diff --git a/http_request_object.c b/http_request_object.c index c5fd293..09c43a5 100644 --- a/http_request_object.c +++ b/http_request_object.c @@ -6,7 +6,7 @@ | modification, are permitted provided that the conditions mentioned | | in the accompanying LICENSE file are met. | +--------------------------------------------------------------------+ - | Copyright (c) 2004-2006, Michael Wallner | + | Copyright (c) 2004-2007, Michael Wallner | +--------------------------------------------------------------------+ */ @@ -33,6 +33,7 @@ #define HTTP_EMPTY_ARGS(method) HTTP_EMPTY_ARGS_EX(HttpRequest, method, 0) #define HTTP_REQUEST_ME(method, visibility) PHP_ME(HttpRequest, method, HTTP_ARGS(HttpRequest, method), visibility) #define HTTP_REQUEST_ALIAS(method, func) HTTP_STATIC_ME_ALIAS(method, func, HTTP_ARGS(HttpRequest, method)) +#define HTTP_REQUEST_MALIAS(me, al, vis) ZEND_FENTRY(me, ZEND_MN(HttpRequest_##al), HTTP_ARGS(HttpRequest, al), vis) HTTP_BEGIN_ARGS(__construct, 0) HTTP_ARG_VAL(url, 0) @@ -40,6 +41,13 @@ HTTP_BEGIN_ARGS(__construct, 0) HTTP_ARG_VAL(options, 0) HTTP_END_ARGS; +HTTP_BEGIN_ARGS(factory, 0) + HTTP_ARG_VAL(url, 0) + HTTP_ARG_VAL(method, 0) + HTTP_ARG_VAL(options, 0) + HTTP_ARG_VAL(class_name, 0) +HTTP_END_ARGS; + HTTP_EMPTY_ARGS(getOptions); HTTP_BEGIN_ARGS(setOptions, 0) HTTP_ARG_VAL(options, 0) @@ -72,6 +80,12 @@ HTTP_BEGIN_ARGS(addCookies, 1) HTTP_ARG_VAL(cookies, 0) HTTP_END_ARGS; +HTTP_EMPTY_ARGS(enableCookies); +HTTP_BEGIN_ARGS(resetCookies, 0) + HTTP_ARG_VAL(session_only, 0) +HTTP_END_ARGS; +HTTP_EMPTY_ARGS(flushCookies); + HTTP_EMPTY_ARGS(getUrl); HTTP_BEGIN_ARGS(setUrl, 1) HTTP_ARG_VAL(url, 0) @@ -116,13 +130,13 @@ HTTP_BEGIN_ARGS(addPostFile, 2) HTTP_ARG_VAL(content_type, 0) HTTP_END_ARGS; -HTTP_EMPTY_ARGS(getRawPostData); -HTTP_BEGIN_ARGS(setRawPostData, 0) - HTTP_ARG_VAL(raw_post_data, 0) +HTTP_EMPTY_ARGS(getBody); +HTTP_BEGIN_ARGS(setBody, 0) + HTTP_ARG_VAL(request_body_data, 0) HTTP_END_ARGS; -HTTP_BEGIN_ARGS(addRawPostData, 1) - HTTP_ARG_VAL(raw_post_data, 0) +HTTP_BEGIN_ARGS(addBody, 1) + HTTP_ARG_VAL(request_body_data, 0) HTTP_END_ARGS; HTTP_EMPTY_ARGS(getPutFile); @@ -190,6 +204,13 @@ HTTP_BEGIN_ARGS(postFields, 2) HTTP_ARG_VAL(info, 1) HTTP_END_ARGS; +HTTP_BEGIN_ARGS(putData, 2) + HTTP_ARG_VAL(url, 0) + HTTP_ARG_VAL(data, 0) + HTTP_ARG_VAL(options, 0) + HTTP_ARG_VAL(info, 1) +HTTP_END_ARGS; + HTTP_BEGIN_ARGS(putFile, 2) HTTP_ARG_VAL(url, 0) HTTP_ARG_VAL(file, 0) @@ -220,10 +241,14 @@ HTTP_BEGIN_ARGS(methodExists, 1) HTTP_ARG_VAL(method, 0) HTTP_END_ARGS; -#define http_request_object_declare_default_properties() _http_request_object_declare_default_properties(TSRMLS_C) -static inline void _http_request_object_declare_default_properties(TSRMLS_D); +#ifdef HAVE_CURL_FORMGET +HTTP_BEGIN_ARGS(encodeBody, 2) + HTTP_ARG_VAL(fields, 0) + HTTP_ARG_VAL(files, 0) +HTTP_END_ARGS; +#endif -#define OBJ_PROP_CE http_request_object_ce +#define THIS_CE http_request_object_ce zend_class_entry *http_request_object_ce; zend_function_entry http_request_object_fe[] = { HTTP_REQUEST_ME(__construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) @@ -242,6 +267,10 @@ zend_function_entry http_request_object_fe[] = { HTTP_REQUEST_ME(getCookies, ZEND_ACC_PUBLIC) HTTP_REQUEST_ME(setCookies, ZEND_ACC_PUBLIC) + HTTP_REQUEST_ME(enableCookies, ZEND_ACC_PUBLIC) + HTTP_REQUEST_ME(resetCookies, ZEND_ACC_PUBLIC) + HTTP_REQUEST_ME(flushCookies, ZEND_ACC_PUBLIC) + HTTP_REQUEST_ME(setMethod, ZEND_ACC_PUBLIC) HTTP_REQUEST_ME(getMethod, ZEND_ACC_PUBLIC) @@ -259,9 +288,12 @@ zend_function_entry http_request_object_fe[] = { HTTP_REQUEST_ME(getPostFields, ZEND_ACC_PUBLIC) HTTP_REQUEST_ME(addPostFields, ZEND_ACC_PUBLIC) - HTTP_REQUEST_ME(setRawPostData, ZEND_ACC_PUBLIC) - HTTP_REQUEST_ME(getRawPostData, ZEND_ACC_PUBLIC) - HTTP_REQUEST_ME(addRawPostData, ZEND_ACC_PUBLIC) + HTTP_REQUEST_ME(setBody, ZEND_ACC_PUBLIC) + HTTP_REQUEST_ME(getBody, ZEND_ACC_PUBLIC) + HTTP_REQUEST_ME(addBody, ZEND_ACC_PUBLIC) + HTTP_REQUEST_MALIAS(setRawPostData, setBody, ZEND_ACC_PUBLIC|ZEND_ACC_DEPRECATED) + HTTP_REQUEST_MALIAS(getRawPostData, getBody, ZEND_ACC_PUBLIC|ZEND_ACC_DEPRECATED) + HTTP_REQUEST_MALIAS(addRawPostData, addBody, ZEND_ACC_PUBLIC|ZEND_ACC_DEPRECATED) HTTP_REQUEST_ME(setPostFiles, ZEND_ACC_PUBLIC) HTTP_REQUEST_ME(addPostFile, ZEND_ACC_PUBLIC) @@ -290,10 +322,13 @@ zend_function_entry http_request_object_fe[] = { HTTP_REQUEST_ME(getHistory, ZEND_ACC_PUBLIC) HTTP_REQUEST_ME(clearHistory, ZEND_ACC_PUBLIC) + HTTP_REQUEST_ME(factory, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) + HTTP_REQUEST_ALIAS(get, http_get) HTTP_REQUEST_ALIAS(head, http_head) HTTP_REQUEST_ALIAS(postData, http_post_data) HTTP_REQUEST_ALIAS(postFields, http_post_fields) + HTTP_REQUEST_ALIAS(putData, http_put_data) HTTP_REQUEST_ALIAS(putFile, http_put_file) HTTP_REQUEST_ALIAS(putStream, http_put_stream) @@ -301,7 +336,9 @@ zend_function_entry http_request_object_fe[] = { HTTP_REQUEST_ALIAS(methodUnregister, http_request_method_unregister) HTTP_REQUEST_ALIAS(methodName, http_request_method_name) HTTP_REQUEST_ALIAS(methodExists, http_request_method_exists) - +#ifdef HAVE_CURL_FORMGET + HTTP_REQUEST_ALIAS(encodeBody, http_request_body_encode) +#endif EMPTY_FUNCTION_ENTRY }; static zend_object_handlers http_request_object_handlers; @@ -310,6 +347,112 @@ PHP_MINIT_FUNCTION(http_request_object) { HTTP_REGISTER_CLASS_EX(HttpRequest, http_request_object, NULL, 0); http_request_object_handlers.clone_obj = _http_request_object_clone_obj; + + zend_declare_property_null(THIS_CE, ZEND_STRS("options")-1, ZEND_ACC_PRIVATE TSRMLS_CC); + zend_declare_property_null(THIS_CE, ZEND_STRS("postFields")-1, ZEND_ACC_PRIVATE TSRMLS_CC); + zend_declare_property_null(THIS_CE, ZEND_STRS("postFiles")-1, ZEND_ACC_PRIVATE TSRMLS_CC); + zend_declare_property_null(THIS_CE, ZEND_STRS("responseInfo")-1, ZEND_ACC_PRIVATE TSRMLS_CC); + zend_declare_property_null(THIS_CE, ZEND_STRS("responseMessage")-1, ZEND_ACC_PRIVATE TSRMLS_CC); + zend_declare_property_long(THIS_CE, ZEND_STRS("responseCode")-1, 0, ZEND_ACC_PRIVATE TSRMLS_CC); + zend_declare_property_string(THIS_CE, ZEND_STRS("responseStatus")-1, "", ZEND_ACC_PRIVATE TSRMLS_CC); + zend_declare_property_long(THIS_CE, ZEND_STRS("method")-1, HTTP_GET, ZEND_ACC_PRIVATE TSRMLS_CC); + zend_declare_property_string(THIS_CE, ZEND_STRS("url")-1, "", ZEND_ACC_PRIVATE TSRMLS_CC); + zend_declare_property_string(THIS_CE, ZEND_STRS("contentType")-1, "", ZEND_ACC_PRIVATE TSRMLS_CC); + zend_declare_property_string(THIS_CE, ZEND_STRS("requestBody")-1, "", ZEND_ACC_PRIVATE TSRMLS_CC); + zend_declare_property_string(THIS_CE, ZEND_STRS("queryData")-1, "", ZEND_ACC_PRIVATE TSRMLS_CC); + zend_declare_property_string(THIS_CE, ZEND_STRS("putFile")-1, "", ZEND_ACC_PRIVATE TSRMLS_CC); + zend_declare_property_string(THIS_CE, ZEND_STRS("putData")-1, "", ZEND_ACC_PRIVATE TSRMLS_CC); + zend_declare_property_null(THIS_CE, ZEND_STRS("history")-1, ZEND_ACC_PRIVATE TSRMLS_CC); + zend_declare_property_bool(THIS_CE, ZEND_STRS("recordHistory")-1, 0, ZEND_ACC_PUBLIC TSRMLS_CC); + +#ifndef WONKY + /* + * Request Method Constants + */ + /* HTTP/1.1 */ + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_GET")-1, HTTP_GET TSRMLS_CC); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_HEAD")-1, HTTP_HEAD TSRMLS_CC); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_POST")-1, HTTP_POST TSRMLS_CC); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_PUT")-1, HTTP_PUT TSRMLS_CC); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_DELETE")-1, HTTP_DELETE TSRMLS_CC); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_OPTIONS")-1, HTTP_OPTIONS TSRMLS_CC); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_TRACE")-1, HTTP_TRACE TSRMLS_CC); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_CONNECT")-1, HTTP_CONNECT TSRMLS_CC); + /* WebDAV - RFC 2518 */ + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_PROPFIND")-1, HTTP_PROPFIND TSRMLS_CC); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_PROPPATCH")-1, HTTP_PROPPATCH TSRMLS_CC); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_MKCOL")-1, HTTP_MKCOL TSRMLS_CC); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_COPY")-1, HTTP_COPY TSRMLS_CC); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_MOVE")-1, HTTP_MOVE TSRMLS_CC); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_LOCK")-1, HTTP_LOCK TSRMLS_CC); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_UNLOCK")-1, HTTP_UNLOCK TSRMLS_CC); + /* WebDAV Versioning - RFC 3253 */ + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_VERSION_CONTROL")-1, HTTP_VERSION_CONTROL TSRMLS_CC); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_REPORT")-1, HTTP_REPORT TSRMLS_CC); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_CHECKOUT")-1, HTTP_CHECKOUT TSRMLS_CC); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_CHECKIN")-1, HTTP_CHECKIN TSRMLS_CC); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_UNCHECKOUT")-1, HTTP_UNCHECKOUT TSRMLS_CC); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_MKWORKSPACE")-1, HTTP_MKWORKSPACE TSRMLS_CC); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_UPDATE")-1, HTTP_UPDATE TSRMLS_CC); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_LABEL")-1, HTTP_LABEL TSRMLS_CC); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_MERGE")-1, HTTP_MERGE TSRMLS_CC); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_BASELINE_CONTROL")-1, HTTP_BASELINE_CONTROL TSRMLS_CC); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_MKACTIVITY")-1, HTTP_MKACTIVITY TSRMLS_CC); + /* WebDAV Access Control - RFC 3744 */ + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_ACL")-1, HTTP_ACL TSRMLS_CC); + + /* + * HTTP Protocol Version Constants + */ + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("VERSION_1_0")-1, CURL_HTTP_VERSION_1_0 TSRMLS_CC); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("VERSION_1_1")-1, CURL_HTTP_VERSION_1_1 TSRMLS_CC); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("VERSION_NONE")-1, CURL_HTTP_VERSION_NONE TSRMLS_CC); /* to be removed */ + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("VERSION_ANY")-1, CURL_HTTP_VERSION_NONE TSRMLS_CC); + + /* + * SSL Version Constants + */ + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("SSL_VERSION_TLSv1")-1, CURL_SSLVERSION_TLSv1 TSRMLS_CC); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("SSL_VERSION_SSLv2")-1, CURL_SSLVERSION_SSLv2 TSRMLS_CC); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("SSL_VERSION_SSLv3")-1, CURL_SSLVERSION_SSLv3 TSRMLS_CC); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("SSL_VERSION_ANY")-1, CURL_SSLVERSION_DEFAULT TSRMLS_CC); + + /* + * DNS IPvX resolving + */ + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("IPRESOLVE_V4")-1, CURL_IPRESOLVE_V4 TSRMLS_CC); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("IPRESOLVE_V6")-1, CURL_IPRESOLVE_V6 TSRMLS_CC); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("IPRESOLVE_ANY")-1, CURL_IPRESOLVE_WHATEVER TSRMLS_CC); + + /* + * Auth Constants + */ + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("AUTH_BASIC")-1, CURLAUTH_BASIC TSRMLS_CC); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("AUTH_DIGEST")-1, CURLAUTH_DIGEST TSRMLS_CC); +#if HTTP_CURL_VERSION(7,19,3) + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("AUTH_DIGEST_IE")-1, CURLAUTH_DIGEST_IE TSRMLS_CC); +#endif + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("AUTH_NTLM")-1, CURLAUTH_NTLM TSRMLS_CC); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("AUTH_GSSNEG")-1, CURLAUTH_GSSNEGOTIATE TSRMLS_CC); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("AUTH_ANY")-1, CURLAUTH_ANY TSRMLS_CC); + + /* + * Proxy Type Constants + */ +# if HTTP_CURL_VERSION(7,15,2) + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("PROXY_SOCKS4")-1, CURLPROXY_SOCKS4 TSRMLS_CC); +# endif +#if HTTP_CURL_VERSION(7,18,0) + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("PROXY_SOCKS4A")-1, CURLPROXY_SOCKS5 TSRMLS_CC); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("PROXY_SOCKS5_HOSTNAME")-1, CURLPROXY_SOCKS5 TSRMLS_CC); +#endif + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("PROXY_SOCKS5")-1, CURLPROXY_SOCKS5 TSRMLS_CC); + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("PROXY_HTTP")-1, CURLPROXY_HTTP TSRMLS_CC); +# if HTTP_CURL_VERSION(7,19,4) + zend_declare_class_constant_long(THIS_CE, ZEND_STRS("PROXY_HTTP_1_0")-1, CURLPROXY_HTTP_1_0 TSRMLS_CC); +# endif +#endif /* WONKY */ + return SUCCESS; } @@ -332,7 +475,7 @@ zend_object_value _http_request_object_new_ex(zend_class_entry *ce, CURL *ch, ht } ALLOC_HASHTABLE(OBJ_PROP(o)); - zend_hash_init(OBJ_PROP(o), 0, NULL, ZVAL_PTR_DTOR, 0); + zend_hash_init(OBJ_PROP(o), zend_hash_num_elements(&ce->default_properties), NULL, ZVAL_PTR_DTOR, 0); zend_hash_copy(OBJ_PROP(o), &ce->default_properties, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); ov.handle = putObject(http_request_object, o); @@ -343,124 +486,45 @@ zend_object_value _http_request_object_new_ex(zend_class_entry *ce, CURL *ch, ht zend_object_value _http_request_object_clone_obj(zval *this_ptr TSRMLS_DC) { - zend_object *old_zo; zend_object_value new_ov; http_request_object *new_obj; getObject(http_request_object, old_obj); - old_zo = zend_objects_get_address(this_ptr TSRMLS_CC); - new_ov = http_request_object_new_ex(old_zo->ce, NULL, &new_obj); + new_ov = http_request_object_new_ex(old_obj->zo.ce, NULL, &new_obj); if (old_obj->request->ch) { - http_curl_init_ex(curl_easy_duphandle(old_obj->request->ch), new_obj->request); + http_curl_init_ex(http_curl_copy(old_obj->request->ch), new_obj->request); } - zend_objects_clone_members(&new_obj->zo, new_ov, old_zo, Z_OBJ_HANDLE_P(this_ptr) TSRMLS_CC); + zend_objects_clone_members(&new_obj->zo, new_ov, &old_obj->zo, Z_OBJ_HANDLE_P(this_ptr) TSRMLS_CC); phpstr_append(&new_obj->request->conv.request, old_obj->request->conv.request.data, old_obj->request->conv.request.used); phpstr_append(&new_obj->request->conv.response, old_obj->request->conv.response.data, old_obj->request->conv.response.used); return new_ov; } -static inline void _http_request_object_declare_default_properties(TSRMLS_D) -{ - zend_class_entry *ce = http_request_object_ce; - - DCL_PROP_N(PRIVATE, options); - DCL_PROP_N(PRIVATE, postFields); - DCL_PROP_N(PRIVATE, postFiles); - DCL_PROP_N(PRIVATE, responseInfo); - DCL_PROP_N(PRIVATE, responseData); - DCL_PROP_N(PRIVATE, responseMessage); - DCL_PROP(PRIVATE, long, responseCode, 0); - DCL_PROP(PRIVATE, string, responseStatus, ""); - DCL_PROP(PRIVATE, long, method, HTTP_GET); - DCL_PROP(PRIVATE, string, url, ""); - DCL_PROP(PRIVATE, string, contentType, ""); - DCL_PROP(PRIVATE, string, rawPostData, ""); - DCL_PROP(PRIVATE, string, queryData, ""); - DCL_PROP(PRIVATE, string, putFile, ""); - DCL_PROP(PRIVATE, string, putData, ""); - DCL_PROP_N(PRIVATE, history); - DCL_PROP(PUBLIC, bool, recordHistory, 0); - -#ifndef WONKY - /* - * Request Method Constants - */ - /* HTTP/1.1 */ - DCL_CONST(long, "METH_GET", HTTP_GET); - DCL_CONST(long, "METH_HEAD", HTTP_HEAD); - DCL_CONST(long, "METH_POST", HTTP_POST); - DCL_CONST(long, "METH_PUT", HTTP_PUT); - DCL_CONST(long, "METH_DELETE", HTTP_DELETE); - DCL_CONST(long, "METH_OPTIONS", HTTP_OPTIONS); - DCL_CONST(long, "METH_TRACE", HTTP_TRACE); - DCL_CONST(long, "METH_CONNECT", HTTP_CONNECT); - /* WebDAV - RFC 2518 */ - DCL_CONST(long, "METH_PROPFIND", HTTP_PROPFIND); - DCL_CONST(long, "METH_PROPPATCH", HTTP_PROPPATCH); - DCL_CONST(long, "METH_MKCOL", HTTP_MKCOL); - DCL_CONST(long, "METH_COPY", HTTP_COPY); - DCL_CONST(long, "METH_MOVE", HTTP_MOVE); - DCL_CONST(long, "METH_LOCK", HTTP_LOCK); - DCL_CONST(long, "METH_UNLOCK", HTTP_UNLOCK); - /* WebDAV Versioning - RFC 3253 */ - DCL_CONST(long, "METH_VERSION_CONTROL", HTTP_VERSION_CONTROL); - DCL_CONST(long, "METH_REPORT", HTTP_REPORT); - DCL_CONST(long, "METH_CHECKOUT", HTTP_CHECKOUT); - DCL_CONST(long, "METH_CHECKIN", HTTP_CHECKIN); - DCL_CONST(long, "METH_UNCHECKOUT", HTTP_UNCHECKOUT); - DCL_CONST(long, "METH_MKWORKSPACE", HTTP_MKWORKSPACE); - DCL_CONST(long, "METH_UPDATE", HTTP_UPDATE); - DCL_CONST(long, "METH_LABEL", HTTP_LABEL); - DCL_CONST(long, "METH_MERGE", HTTP_MERGE); - DCL_CONST(long, "METH_BASELINE_CONTROL", HTTP_BASELINE_CONTROL); - DCL_CONST(long, "METH_MKACTIVITY", HTTP_MKACTIVITY); - /* WebDAV Access Control - RFC 3744 */ - DCL_CONST(long, "METH_ACL", HTTP_ACL); - - /* cURL HTTP protocol versions */ - DCL_CONST(long, "VERSION_1_0", CURL_HTTP_VERSION_1_0); - DCL_CONST(long, "VERSION_1_1", CURL_HTTP_VERSION_1_1); - DCL_CONST(long, "VERSION_NONE", CURL_HTTP_VERSION_NONE); - - /* - * Auth Constants - */ - DCL_CONST(long, "AUTH_BASIC", CURLAUTH_BASIC); - DCL_CONST(long, "AUTH_DIGEST", CURLAUTH_DIGEST); - DCL_CONST(long, "AUTH_NTLM", CURLAUTH_NTLM); - DCL_CONST(long, "AUTH_ANY", CURLAUTH_ANY); -#endif /* WONKY */ -} - void _http_request_object_free(zend_object *object TSRMLS_DC) { http_request_object *o = (http_request_object *) object; - if (OBJ_PROP(o)) { - zend_hash_destroy(OBJ_PROP(o)); - FREE_HASHTABLE(OBJ_PROP(o)); - } http_request_free(&o->request); - efree(o); + freeObject(o); } #define http_request_object_check_request_content_type(t) _http_request_object_check_request_content_type((t) TSRMLS_CC) static inline void _http_request_object_check_request_content_type(zval *this_ptr TSRMLS_DC) { - zval *ctype = GET_PROP(contentType); + zval *ctype = zend_read_property(THIS_CE, getThis(), ZEND_STRS("contentType")-1, 0 TSRMLS_CC); if (Z_STRLEN_P(ctype)) { - zval **headers, *opts = GET_PROP(options); + zval **headers, *opts = zend_read_property(THIS_CE, getThis(), ZEND_STRS("options")-1, 0 TSRMLS_CC); if ( (Z_TYPE_P(opts) == IS_ARRAY) && - (SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), "headers", sizeof("headers"), (void **) &headers)) && + (SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), "headers", sizeof("headers"), (void *) &headers)) && (Z_TYPE_PP(headers) == IS_ARRAY)) { zval **ct_header; /* only override if not already set */ - if ((SUCCESS != zend_hash_find(Z_ARRVAL_PP(headers), "Content-Type", sizeof("Content-Type"), (void **) &ct_header))) { + if ((SUCCESS != zend_hash_find(Z_ARRVAL_PP(headers), "Content-Type", sizeof("Content-Type"), (void *) &ct_header))) { add_assoc_stringl(*headers, "Content-Type", Z_STRVAL_P(ctype), Z_STRLEN_P(ctype), 1); } else /* or not a string, zero length string or a string of spaces */ @@ -471,7 +535,7 @@ static inline void _http_request_object_check_request_content_type(zval *this_pt /* check for spaces only */ for (i = 0; i < Z_STRLEN_PP(ct_header); ++i) { - if (!isspace(Z_STRVAL_PP(ct_header)[i])) { + if (!HTTP_IS_CTYPE(space, Z_STRVAL_PP(ct_header)[i])) { only_space = 0; break; } @@ -495,51 +559,57 @@ static inline void _http_request_object_check_request_content_type(zval *this_pt STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_ptr TSRMLS_DC) { STATUS status = SUCCESS; + char *url = http_absolute_url(Z_STRVAL_P(zend_read_property(THIS_CE, getThis(), ZEND_STRS("url")-1, 0 TSRMLS_CC))); + if (!url) { + return FAILURE; + } + http_request_reset(obj->request); + obj->request->url = url; HTTP_CHECK_CURL_INIT(obj->request->ch, http_curl_init(obj->request), return FAILURE); - obj->request->url = http_absolute_url(Z_STRVAL_P(GET_PROP(url))); - - switch (obj->request->meth = Z_LVAL_P(GET_PROP(method))) + switch (obj->request->meth = Z_LVAL_P(zend_read_property(THIS_CE, getThis(), ZEND_STRS("method")-1, 0 TSRMLS_CC))) { case HTTP_GET: case HTTP_HEAD: - break; + break; case HTTP_PUT: { - zval *put_data = GET_PROP(putData); + zval *put_file = zend_read_property(THIS_CE, getThis(), ZEND_STRS("putFile")-1, 0 TSRMLS_CC); http_request_object_check_request_content_type(getThis()); - if (Z_STRLEN_P(put_data)) { - obj->request->body = http_request_body_init_ex(obj->request->body, HTTP_REQUEST_BODY_CSTRING, - estrndup(Z_STRVAL_P(put_data), Z_STRLEN_P(put_data)), Z_STRLEN_P(put_data), 1); - } else { + + if (Z_STRLEN_P(put_file)) { php_stream_statbuf ssb; - php_stream *stream = php_stream_open_wrapper_ex(Z_STRVAL_P(GET_PROP(putFile)), "rb", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL, HTTP_DEFAULT_STREAM_CONTEXT); + php_stream *stream = php_stream_open_wrapper_ex(Z_STRVAL_P(put_file), "rb", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL, HTTP_DEFAULT_STREAM_CONTEXT); - if (stream && !php_stream_stat(stream, &ssb)) { + if (stream && SUCCESS == php_stream_stat(stream, &ssb)) { obj->request->body = http_request_body_init_ex(obj->request->body, HTTP_REQUEST_BODY_UPLOADFILE, stream, ssb.sb.st_size, 1); } else { status = FAILURE; } + } else { + zval *put_data = zend_read_property(THIS_CE, getThis(), ZEND_STRS("putData")-1, 0 TSRMLS_CC); + obj->request->body = http_request_body_init_ex(obj->request->body, HTTP_REQUEST_BODY_CSTRING, + estrndup(Z_STRVAL_P(put_data), Z_STRLEN_P(put_data)), Z_STRLEN_P(put_data), 1); } + break; } - break; case HTTP_POST: default: { - /* check for raw post data */ - zval *raw_data = GET_PROP(rawPostData); + /* check for raw request body */ + zval *raw_data = zend_read_property(THIS_CE, getThis(), ZEND_STRS("requestBody")-1, 0 TSRMLS_CC); if (Z_STRLEN_P(raw_data)) { http_request_object_check_request_content_type(getThis()); obj->request->body = http_request_body_init_ex(obj->request->body, HTTP_REQUEST_BODY_CSTRING, estrndup(Z_STRVAL_P(raw_data), Z_STRLEN_P(raw_data)), Z_STRLEN_P(raw_data), 1); } else { - zval *zfields = GET_PROP(postFields), *zfiles = GET_PROP(postFiles); + zval *zfields = zend_read_property(THIS_CE, getThis(), ZEND_STRS("postFields")-1, 0 TSRMLS_CC), *zfiles = zend_read_property(THIS_CE, getThis(), ZEND_STRS("postFiles")-1, 0 TSRMLS_CC); HashTable *fields; HashTable *files; @@ -552,13 +622,13 @@ STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_ } } } + break; } - break; } if (status == SUCCESS) { - zval *qdata = GET_PROP(queryData); - zval *options = GET_PROP(options); + zval *qdata = zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryData")-1, 0 TSRMLS_CC); + zval *options = zend_read_property(THIS_CE, getThis(), ZEND_STRS("options")-1, 0 TSRMLS_CC); if (Z_STRLEN_P(qdata)) { if (!strchr(obj->request->url, '?')) { @@ -576,8 +646,8 @@ STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_ zval **entry, *pcb; if ( (Z_TYPE_P(options) != IS_ARRAY) - || (SUCCESS != zend_hash_find(Z_ARRVAL_P(options), "onprogress", sizeof("onprogress"), (void **) &entry) - || (!zval_is_true(*entry)))) { + || (SUCCESS != zend_hash_find(Z_ARRVAL_P(options), "onprogress", sizeof("onprogress"), (void *) &entry) + || (!IS_CALLABLE(*entry, 0, NULL)))) { MAKE_STD_ZVAL(pcb); array_init(pcb); ZVAL_ADDREF(getThis()); @@ -602,7 +672,7 @@ STATUS _http_request_object_responsehandler(http_request_object *obj, zval *this MAKE_STD_ZVAL(info); array_init(info); http_request_info(obj->request, Z_ARRVAL_P(info)); - SET_PROP(responseInfo, info); + zend_update_property(THIS_CE, getThis(), ZEND_STRS("responseInfo")-1, info TSRMLS_CC); zval_ptr_dtor(&info); /* parse response message */ @@ -610,12 +680,10 @@ STATUS _http_request_object_responsehandler(http_request_object *obj, zval *this phpstr_fix(&obj->request->conv.response); if ((msg = http_message_parse(PHPSTR_VAL(&obj->request->conv.response), PHPSTR_LEN(&obj->request->conv.response)))) { - char *body; - size_t body_len; - zval *headers, *message, *resp; + zval *message; - if (zval_is_true(GET_PROP(recordHistory))) { - zval *hist, *history = GET_PROP(history); + if (i_zend_is_true(zend_read_property(THIS_CE, getThis(), ZEND_STRS("recordHistory")-1, 0 TSRMLS_CC))) { + zval *hist, *history = zend_read_property(THIS_CE, getThis(), ZEND_STRS("history")-1, 0 TSRMLS_CC); http_message *response = http_message_parse(PHPSTR_VAL(&obj->request->conv.response), PHPSTR_LEN(&obj->request->conv.response)); http_message *request = http_message_parse(PHPSTR_VAL(&obj->request->conv.request), PHPSTR_LEN(&obj->request->conv.request)); @@ -624,59 +692,44 @@ STATUS _http_request_object_responsehandler(http_request_object *obj, zval *this if (Z_TYPE_P(history) == IS_OBJECT) { http_message_object_prepend(hist, history); } - SET_PROP(history, hist); + zend_update_property(THIS_CE, getThis(), ZEND_STRS("history")-1, hist TSRMLS_CC); zval_ptr_dtor(&hist); } - UPD_PROP(long, responseCode, msg->http.info.response.code); - UPD_PROP(string, responseStatus, msg->http.info.response.status); - - MAKE_STD_ZVAL(resp); - array_init(resp); - MAKE_STD_ZVAL(headers); - array_init(headers); - zend_hash_copy(Z_ARRVAL_P(headers), &msg->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); - add_assoc_zval(resp, "headers", headers); - phpstr_data(PHPSTR(msg), &body, &body_len); - add_assoc_stringl(resp, "body", body, body_len, 0); - SET_PROP(responseData, resp); - zval_ptr_dtor(&resp); + zend_update_property_long(THIS_CE, getThis(), ZEND_STRS("responseCode")-1, msg->http.info.response.code TSRMLS_CC); + zend_update_property_string(THIS_CE, getThis(), ZEND_STRS("responseStatus")-1, STR_PTR(msg->http.info.response.status) TSRMLS_CC); MAKE_STD_ZVAL(message); ZVAL_OBJVAL(message, http_message_object_new_ex(http_message_object_ce, msg, NULL), 0); - SET_PROP(responseMessage, message); + zend_update_property(THIS_CE, getThis(), ZEND_STRS("responseMessage")-1, message TSRMLS_CC); zval_ptr_dtor(&message); ret = SUCCESS; } else { /* update properties with empty values*/ - zval *resp = GET_PROP(responseData), *znull; + zval *znull; MAKE_STD_ZVAL(znull); ZVAL_NULL(znull); - SET_PROP(responseMessage, znull); + zend_update_property(THIS_CE, getThis(), ZEND_STRS("responseMessage")-1, znull TSRMLS_CC); zval_ptr_dtor(&znull); - if (Z_TYPE_P(resp) == IS_ARRAY) { - zend_hash_clean(Z_ARRVAL_P(resp)); - } - - UPD_PROP(long, responseCode, 0); - UPD_PROP(string, responseStatus, ""); + zend_update_property_long(THIS_CE, getThis(), ZEND_STRS("responseCode")-1, 0 TSRMLS_CC); + zend_update_property_string(THIS_CE, getThis(), ZEND_STRS("responseStatus")-1, "" TSRMLS_CC); /* append request message to history */ - if (zval_is_true(GET_PROP(recordHistory))) { + if (i_zend_is_true(zend_read_property(THIS_CE, getThis(), ZEND_STRS("recordHistory")-1, 0 TSRMLS_CC))) { http_message *request; if ((request = http_message_parse(PHPSTR_VAL(&obj->request->conv.request), PHPSTR_LEN(&obj->request->conv.request)))) { - zval *hist, *history = GET_PROP(history); + zval *hist, *history = zend_read_property(THIS_CE, getThis(), ZEND_STRS("history")-1, 0 TSRMLS_CC); MAKE_STD_ZVAL(hist); ZVAL_OBJVAL(hist, http_message_object_new_ex(http_message_object_ce, request, NULL), 0); if (Z_TYPE_P(history) == IS_OBJECT) { http_message_object_prepend(hist, history); } - SET_PROP(history, hist); + zend_update_property(THIS_CE, getThis(), ZEND_STRS("history")-1, hist TSRMLS_CC); zval_ptr_dtor(&hist); } } @@ -684,12 +737,16 @@ STATUS _http_request_object_responsehandler(http_request_object *obj, zval *this ret = FAILURE; } - if (zend_hash_exists(&Z_OBJCE_P(getThis())->function_table, "onfinish", sizeof("onfinish"))) { + http_request_set_progress_callback(obj->request, NULL); + + if (!EG(exception) && zend_hash_exists(&Z_OBJCE_P(getThis())->function_table, "onfinish", sizeof("onfinish"))) { zval *param; MAKE_STD_ZVAL(param); ZVAL_BOOL(param, ret == SUCCESS); - zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "onfinish", NULL, param); + with_error_handling(EH_NORMAL, NULL) { + zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "onfinish", NULL, param); + } end_error_handling(); zval_ptr_dtor(¶m); } @@ -698,8 +755,8 @@ STATUS _http_request_object_responsehandler(http_request_object *obj, zval *this static int apply_pretty_key(void *pDest, int num_args, va_list args, zend_hash_key *hash_key) { - if (hash_key->nKeyLength > 1) { - hash_key->h = zend_get_hash_value(pretty_key(hash_key->arKey, hash_key->nKeyLength - 1, 1, 0), hash_key->nKeyLength); + if (hash_key->arKey && hash_key->nKeyLength > 1) { + hash_key->h = zend_hash_func(pretty_key(hash_key->arKey, hash_key->nKeyLength - 1, 1, 0), hash_key->nKeyLength); } return ZEND_HASH_APPLY_KEEP; } @@ -716,30 +773,30 @@ static inline void _http_request_object_set_options_subr(INTERNAL_FUNCTION_PARAM MAKE_STD_ZVAL(new_opts); array_init(new_opts); - old_opts = GET_PROP(options); + old_opts = zend_read_property(THIS_CE, getThis(), ZEND_STRS("options")-1, 0 TSRMLS_CC); if (Z_TYPE_P(old_opts) == IS_ARRAY) { - array_copy(old_opts, new_opts); + array_copy(Z_ARRVAL_P(old_opts), Z_ARRVAL_P(new_opts)); } - if (prettify_keys && opts) { - zend_hash_apply_with_arguments(Z_ARRVAL_P(opts), apply_pretty_key, 0); - } - if (SUCCESS == zend_hash_find(Z_ARRVAL_P(new_opts), key, len, (void **) &entry)) { + if (SUCCESS == zend_hash_find(Z_ARRVAL_P(new_opts), key, len, (void *) &entry)) { if (overwrite) { zend_hash_clean(Z_ARRVAL_PP(entry)); } if (opts && zend_hash_num_elements(Z_ARRVAL_P(opts))) { if (overwrite) { - array_copy(opts, *entry); + array_copy(Z_ARRVAL_P(opts), Z_ARRVAL_PP(entry)); } else { - array_merge(opts, *entry); + array_join(Z_ARRVAL_P(opts), Z_ARRVAL_PP(entry), 0, prettify_keys ? ARRAY_JOIN_PRETTIFY : 0); } } } else if (opts) { + if (prettify_keys) { + zend_hash_apply_with_arguments(Z_ARRVAL_P(opts) HTTP_ZAPI_HASH_TSRMLS_CC, apply_pretty_key, 0, NULL); + } ZVAL_ADDREF(opts); - add_assoc_zval(new_opts, key, opts); + add_assoc_zval_ex(new_opts, key, len, opts); } - SET_PROP(options, new_opts); + zend_update_property(THIS_CE, getThis(), ZEND_STRS("options")-1, new_opts TSRMLS_CC); zval_ptr_dtor(&new_opts); RETURN_TRUE; @@ -751,16 +808,16 @@ static inline void _http_request_get_options_subr(INTERNAL_FUNCTION_PARAMETERS, { NO_ARGS; - IF_RETVAL_USED { + if (return_value_used) { zval *opts, **options; - opts = GET_PROP(options); + opts = zend_read_property(THIS_CE, getThis(), ZEND_STRS("options")-1, 0 TSRMLS_CC); array_init(return_value); if ( (Z_TYPE_P(opts) == IS_ARRAY) && - (SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), key, len, (void **) &options))) { + (SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), key, len, (void *) &options))) { convert_to_array(*options); - array_copy(*options, return_value); + array_copy(Z_ARRVAL_PP(options), Z_ARRVAL_P(return_value)); } } } @@ -769,16 +826,7 @@ static inline void _http_request_get_options_subr(INTERNAL_FUNCTION_PARAMETERS, /* ### USERLAND ### */ /* {{{ proto void HttpRequest::__construct([string url[, int request_method = HTTP_METH_GET[, array options]]]) - * - * Instantiate a new HttpRequest object. - * - * Accepts a string as optional parameter containing the target request url. - * Additionally accepts an optional int parameter specifying the request method - * to use and an associative array as optional third parameter which will be - * passed to HttpRequest::setOptions(). - * - * Throws HttpException. - */ + Create a new HttpRequest object instance. */ PHP_METHOD(HttpRequest, __construct) { char *URL = NULL; @@ -787,12 +835,41 @@ PHP_METHOD(HttpRequest, __construct) zval *options = NULL; SET_EH_THROW_HTTP(); - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sla", &URL, &URL_len, &meth, &options)) { + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sla!", &URL, &URL_len, &meth, &options)) { + if (URL) { + zend_update_property_stringl(THIS_CE, getThis(), ZEND_STRS("url")-1, URL, URL_len TSRMLS_CC); + } + if (meth > -1) { + zend_update_property_long(THIS_CE, getThis(), ZEND_STRS("method")-1, meth TSRMLS_CC); + } + if (options) { + zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "setoptions", NULL, options); + } + } + SET_EH_NORMAL(); +} +/* }}} */ + +/* {{{ proto HttpRequest HttpRequest::factory([string url[, int request_method HTTP_METH_GET[, array options[, string class_name = "HttpRequest"]]]]) + Create a new HttpRequest object instance. */ +PHP_METHOD(HttpRequest, factory) +{ + char *cn = NULL, *URL = NULL; + int cl = 0, URL_len = 0; + long meth = -1; + zval *options = NULL; + zend_object_value ov; + + SET_EH_THROW_HTTP(); + if ( SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sla!s", &URL, &URL_len, &meth, &options, &cn, &cl) && + SUCCESS == http_object_new(&ov, cn, cl, _http_request_object_new_ex, http_request_object_ce, NULL, NULL)) { + RETVAL_OBJVAL(ov, 0); + getThis() = return_value; if (URL) { - UPD_STRL(url, URL, URL_len); + zend_update_property_stringl(THIS_CE, getThis(), ZEND_STRS("url")-1, URL, URL_len TSRMLS_CC); } if (meth > -1) { - UPD_PROP(long, method, meth); + zend_update_property_long(THIS_CE, getThis(), ZEND_STRS("method")-1, meth TSRMLS_CC); } if (options) { zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "setoptions", NULL, options); @@ -803,19 +880,10 @@ PHP_METHOD(HttpRequest, __construct) /* }}} */ /* {{{ proto bool HttpRequest::setOptions([array options]) - * - * Set the request options to use. See http_get() for a full list of available options. - * - * Accepts an array as optional parameters, which values will overwrite the - * currently set request options. If the parameter is empty or omitted, - * the options of the HttpRequest object will be reset. - * - * Returns TRUE on success, or FALSE on failure. - */ + Set the request options to use. See http_get() for a full list of available options. */ PHP_METHOD(HttpRequest, setOptions) { - char *key = NULL; - ulong idx = 0; + HashKey key = initHashKey(0); HashPosition pos; zval *opts = NULL, *old_opts, *new_opts, *add_opts, **opt; @@ -827,7 +895,7 @@ PHP_METHOD(HttpRequest, setOptions) array_init(new_opts); if (!opts || !zend_hash_num_elements(Z_ARRVAL_P(opts))) { - SET_PROP(options, new_opts); + zend_update_property(THIS_CE, getThis(), ZEND_STRS("options")-1, new_opts TSRMLS_CC); zval_ptr_dtor(&new_opts); RETURN_TRUE; } @@ -835,33 +903,50 @@ PHP_METHOD(HttpRequest, setOptions) MAKE_STD_ZVAL(add_opts); array_init(add_opts); /* some options need extra attention -- thus cannot use array_merge() directly */ - FOREACH_KEYVAL(pos, opts, key, idx, opt) { - if (key) { - if (!strcmp(key, "headers")) { + FOREACH_KEYVAL(pos, opts, key, opt) { + if (key.type == HASH_KEY_IS_STRING) { +#define KEYMATCH(k, s) ((sizeof(s)==k.len) && !strcasecmp(k.str, s)) + if (KEYMATCH(key, "headers")) { zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "addheaders", NULL, *opt); - } else if (!strcmp(key, "cookies")) { + } else if (KEYMATCH(key, "cookies")) { zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "addcookies", NULL, *opt); - } else if (!strcmp(key, "ssl")) { + } else if (KEYMATCH(key, "ssl")) { zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "addssloptions", NULL, *opt); - } else if ((!strcasecmp(key, "url")) || (!strcasecmp(key, "uri"))) { + } else if (KEYMATCH(key, "url") || KEYMATCH(key, "uri")) { zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "seturl", NULL, *opt); - } else if (!strcmp(key, "method")) { + } else if (KEYMATCH(key, "method")) { zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "setmethod", NULL, *opt); + } else if (KEYMATCH(key, "flushcookies")) { + getObject(http_request_object, obj); + if (i_zend_is_true(*opt)) { + http_request_flush_cookies(obj->request); + } + } else if (KEYMATCH(key, "resetcookies")) { + getObject(http_request_object, obj); + http_request_reset_cookies(obj->request, (zend_bool) i_zend_is_true(*opt)); + } else if (KEYMATCH(key, "enablecookies")) { + getObject(http_request_object, obj); + http_request_enable_cookies(obj->request); + } else if (KEYMATCH(key, "recordHistory")) { + zend_update_property(THIS_CE, getThis(), ZEND_STRS("recordHistory")-1, *opt TSRMLS_CC); + } else if (Z_TYPE_PP(opt) == IS_NULL) { + old_opts = zend_read_property(THIS_CE, getThis(), ZEND_STRS("options")-1, 0 TSRMLS_CC); + if (Z_TYPE_P(old_opts) == IS_ARRAY) { + zend_hash_del(Z_ARRVAL_P(old_opts), key.str, key.len); + } } else { ZVAL_ADDREF(*opt); - add_assoc_zval(add_opts, key, *opt); + add_assoc_zval_ex(add_opts, key.str, key.len, *opt); } - /* reset */ - key = NULL; } } - old_opts = GET_PROP(options); + old_opts = zend_read_property(THIS_CE, getThis(), ZEND_STRS("options")-1, 0 TSRMLS_CC); if (Z_TYPE_P(old_opts) == IS_ARRAY) { - array_copy(old_opts, new_opts); + array_copy(Z_ARRVAL_P(old_opts), Z_ARRVAL_P(new_opts)); } - array_merge(add_opts, new_opts); - SET_PROP(options, new_opts); + array_join(Z_ARRVAL_P(add_opts), Z_ARRVAL_P(new_opts), 0, 0); + zend_update_property(THIS_CE, getThis(), ZEND_STRS("options")-1, new_opts TSRMLS_CC); zval_ptr_dtor(&new_opts); zval_ptr_dtor(&add_opts); @@ -870,30 +955,19 @@ PHP_METHOD(HttpRequest, setOptions) /* }}} */ /* {{{ proto array HttpRequest::getOptions() - * - * Get currently set options. - * - * Returns an associative array containing currently set options. - */ + Get currently set options. */ PHP_METHOD(HttpRequest, getOptions) { NO_ARGS; - IF_RETVAL_USED { + if (return_value_used) { RETURN_PROP(options); } } /* }}} */ /* {{{ proto bool HttpRequest::setSslOptions([array options]) - * - * Set SSL options. - * - * Accepts an associative array as parameter containing any SSL specific options. - * If the parameter is empty or omitted, the SSL options will be reset. - * - * Returns TRUE on success, or FALSE on failure. - */ + Set SSL options. */ PHP_METHOD(HttpRequest, setSslOptions) { http_request_object_set_options_subr("ssl", 1, 0); @@ -901,13 +975,7 @@ PHP_METHOD(HttpRequest, setSslOptions) /* }}} */ /* {{{ proto bool HttpRequest::addSslOptions(array options) - * - * Set additional SSL options. - * - * Expects an associative array as parameter containing additional SSL specific options. - * - * Returns TRUE on success, or FALSE on failure. - */ + Set additional SSL options. */ PHP_METHOD(HttpRequest, addSslOptions) { http_request_object_set_options_subr("ssl", 0, 0); @@ -915,11 +983,7 @@ PHP_METHOD(HttpRequest, addSslOptions) /* }}} */ /* {{{ proto array HttpRequest::getSslOtpions() - * - * Get previously set SSL options. - * - * Returns an associative array containing any previously set SSL options. - */ + Get previously set SSL options. */ PHP_METHOD(HttpRequest, getSslOptions) { http_request_object_get_options_subr("ssl"); @@ -927,28 +991,14 @@ PHP_METHOD(HttpRequest, getSslOptions) /* }}} */ /* {{{ proto bool HttpRequest::addHeaders(array headers) - * - * Add request header name/value pairs. - * - * Expects an associative array as parameter containing additional header - * name/value pairs. - * - * Returns TRUE on success, or FALSE on failure. - */ + Add request header name/value pairs. */ PHP_METHOD(HttpRequest, addHeaders) { http_request_object_set_options_subr("headers", 0, 1); } /* {{{ proto bool HttpRequest::setHeaders([array headers]) - * - * Set request header name/value pairs. - * - * Accepts an associative array as parameter containing header name/value pairs. - * If the parameter is empty or omitted, all previously set headers will be unset. - * - * Returns TRUE on success, or FALSE on failure. - */ + Set request header name/value pairs. */ PHP_METHOD(HttpRequest, setHeaders) { http_request_object_set_options_subr("headers", 1, 1); @@ -956,11 +1006,7 @@ PHP_METHOD(HttpRequest, setHeaders) /* }}} */ /* {{{ proto array HttpRequest::getHeaders() - * - * Get previously set request headers. - * - * Returns an associative array containing all currently set headers. - */ + Get previously set request headers. */ PHP_METHOD(HttpRequest, getHeaders) { http_request_object_get_options_subr("headers"); @@ -968,14 +1014,7 @@ PHP_METHOD(HttpRequest, getHeaders) /* }}} */ /* {{{ proto bool HttpRequest::setCookies([array cookies]) - * - * Set cookies. - * - * Accepts an associative array as parameter containing cookie name/value pairs. - * If the parameter is empty or omitted, all previously set cookies will be unset. - * - * Returns TRUE on success, or FALSE on failure. - */ + Set cookies. */ PHP_METHOD(HttpRequest, setCookies) { http_request_object_set_options_subr("cookies", 1, 0); @@ -983,14 +1022,7 @@ PHP_METHOD(HttpRequest, setCookies) /* }}} */ /* {{{ proto bool HttpRequest::addCookies(array cookies) - * - * Add cookies. - * - * Expects an associative array as parameter containing any cookie name/value - * pairs to add. - * - * Returns TRUE on success, or FALSE on failure. - */ + Add cookies. */ PHP_METHOD(HttpRequest, addCookies) { http_request_object_set_options_subr("cookies", 0, 0); @@ -998,25 +1030,52 @@ PHP_METHOD(HttpRequest, addCookies) /* }}} */ /* {{{ proto array HttpRequest::getCookies() - * - * Get previously set cookies. - * - * Returns an associative array containing any previously set cookies. - */ + Get previously set cookies. */ PHP_METHOD(HttpRequest, getCookies) { http_request_object_get_options_subr("cookies"); } /* }}} */ +/* {{{ proto bool HttpRequest::enableCookies() + Enable automatic sending of received cookies. Note that customly set cookies will be sent anyway. */ +PHP_METHOD(HttpRequest, enableCookies) +{ + NO_ARGS { + getObject(http_request_object, obj); + RETURN_SUCCESS(http_request_enable_cookies(obj->request)); + } + +} +/* }}} */ + +/* {{{ proto bool HttpRequest::resetCookies([bool session_only = FALSE]) + Reset all automatically received/sent cookies. Note that customly set cookies are not affected. */ +PHP_METHOD(HttpRequest, resetCookies) +{ + zend_bool session_only = 0; + getObject(http_request_object, obj); + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &session_only)) { + RETURN_FALSE; + } + RETURN_SUCCESS(http_request_reset_cookies(obj->request, session_only)); +} +/* }}} */ + +/* {{{ proto bool HttpRequest::flushCookies() + Flush internal cookies to the cookiestore file */ +PHP_METHOD(HttpRequest, flushCookies) +{ + NO_ARGS { + getObject(http_request_object, obj); + RETURN_SUCCESS(http_request_flush_cookies(obj->request)); + } +} +/* }}} */ + /* {{{ proto bool HttpRequest::setUrl(string url) - * - * Set the request URL. - * - * Expects a string as parameter specifying the request url. - * - * Returns TRUE on success, or FALSE on failure. - */ + Set the request URL. */ PHP_METHOD(HttpRequest, setUrl) { char *URL = NULL; @@ -1026,36 +1085,25 @@ PHP_METHOD(HttpRequest, setUrl) RETURN_FALSE; } - UPD_STRL(url, URL, URL_len); + zend_update_property_stringl(THIS_CE, getThis(), ZEND_STRS("url")-1, URL, URL_len TSRMLS_CC); RETURN_TRUE; } /* }}} */ /* {{{ proto string HttpRequest::getUrl() - * - * Get the previously set request URL. - * - * Returns the currently set request url as string. - */ + Get the previously set request URL. */ PHP_METHOD(HttpRequest, getUrl) { NO_ARGS; - IF_RETVAL_USED { + if (return_value_used) { RETURN_PROP(url); } } /* }}} */ /* {{{ proto bool HttpRequest::setMethod(int request_method) - * - * Set the request method. - * - * Expects an int as parameter specifying the request method to use. - * In PHP 5.1+ HttpRequest::METH_*, otherwise the HTTP_METH_* constants can be used. - * - * Returns TRUE on success, or FALSE on failure. - */ + Set the request method. */ PHP_METHOD(HttpRequest, setMethod) { long meth; @@ -1064,37 +1112,25 @@ PHP_METHOD(HttpRequest, setMethod) RETURN_FALSE; } - UPD_PROP(long, method, meth); + zend_update_property_long(THIS_CE, getThis(), ZEND_STRS("method")-1, meth TSRMLS_CC); RETURN_TRUE; } /* }}} */ /* {{{ proto int HttpRequest::getMethod() - * - * Get the previously set request method. - * - * Returns the currently set request method. - */ + Get the previously set request method. */ PHP_METHOD(HttpRequest, getMethod) { NO_ARGS; - IF_RETVAL_USED { + if (return_value_used) { RETURN_PROP(method); } } /* }}} */ /* {{{ proto bool HttpRequest::setContentType(string content_type) - * - * Set the content type the post request should have. - * - * Expects a string as parameters containing the content type of the request - * (primary/secondary). - * - * Returns TRUE on success, or FALSE if the content type does not seem to - * contain a primary and a secondary part. - */ + Set the content type the post request should have. */ PHP_METHOD(HttpRequest, setContentType) { char *ctype; @@ -1107,38 +1143,25 @@ PHP_METHOD(HttpRequest, setContentType) if (ct_len) { HTTP_CHECK_CONTENT_TYPE(ctype, RETURN_FALSE); } - UPD_STRL(contentType, ctype, ct_len); + zend_update_property_stringl(THIS_CE, getThis(), ZEND_STRS("contentType")-1, ctype, ct_len TSRMLS_CC); RETURN_TRUE; } /* }}} */ /* {{{ proto string HttpRequest::getContentType() - * - * Get the previously content type. - * - * Returns the previously set content type as string. - */ + Get the previously content type. */ PHP_METHOD(HttpRequest, getContentType) { NO_ARGS; - IF_RETVAL_USED { + if (return_value_used) { RETURN_PROP(contentType); } } /* }}} */ /* {{{ proto bool HttpRequest::setQueryData([mixed query_data]) - * - * Set the URL query parameters to use, overwriting previously set query parameters. - * Affects any request types. - * - * Accepts a string or associative array parameter containing the pre-encoded - * query string or to be encoded query fields. If the parameter is empty or - * omitted, the query data will be unset. - * - * Returns TRUE on success, or FALSE on failure. - */ + Set the URL query parameters to use, overwriting previously set query parameters. */ PHP_METHOD(HttpRequest, setQueryData) { zval *qdata = NULL; @@ -1148,7 +1171,7 @@ PHP_METHOD(HttpRequest, setQueryData) } if ((!qdata) || Z_TYPE_P(qdata) == IS_NULL) { - UPD_STRL(queryData, "", 0); + zend_update_property_stringl(THIS_CE, getThis(), ZEND_STRS("queryData")-1, "", 0 TSRMLS_CC); } else if ((Z_TYPE_P(qdata) == IS_ARRAY) || (Z_TYPE_P(qdata) == IS_OBJECT)) { char *query_data = NULL; @@ -1156,46 +1179,32 @@ PHP_METHOD(HttpRequest, setQueryData) RETURN_FALSE; } - UPD_PROP(string, queryData, query_data); + zend_update_property_string(THIS_CE, getThis(), ZEND_STRS("queryData")-1, query_data TSRMLS_CC); efree(query_data); } else { - zval *orig = qdata; + zval *data = http_zsep(IS_STRING, qdata); - convert_to_string_ex(&qdata); - UPD_STRL(queryData, Z_STRVAL_P(qdata), Z_STRLEN_P(qdata)); - if (orig != qdata) { - zval_ptr_dtor(&qdata); - } + zend_update_property_stringl(THIS_CE, getThis(), ZEND_STRS("queryData")-1, Z_STRVAL_P(data), Z_STRLEN_P(data) TSRMLS_CC); + zval_ptr_dtor(&data); } RETURN_TRUE; } /* }}} */ /* {{{ proto string HttpRequest::getQueryData() - * - * Get the current query data in form of an urlencoded query string. - * - * Returns a string containing the urlencoded query. - */ + Get the current query data in form of an urlencoded query string. */ PHP_METHOD(HttpRequest, getQueryData) { NO_ARGS; - IF_RETVAL_USED { + if (return_value_used) { RETURN_PROP(queryData); } } /* }}} */ /* {{{ proto bool HttpRequest::addQueryData(array query_params) - * - * Add parameters to the query parameter list, leaving previously set unchanged. - * Affects any request type. - * - * Expects an associative array as parameter containing the query fields to add. - * - * Returns TRUE on success, or FALSE on failure. - */ + Add parameters to the query parameter list, leaving previously set unchanged. */ PHP_METHOD(HttpRequest, addQueryData) { zval *qdata, *old_qdata; @@ -1206,13 +1215,13 @@ PHP_METHOD(HttpRequest, addQueryData) RETURN_FALSE; } - old_qdata = GET_PROP(queryData); + old_qdata = zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryData")-1, 0 TSRMLS_CC); if (SUCCESS != http_urlencode_hash_ex(HASH_OF(qdata), 1, Z_STRVAL_P(old_qdata), Z_STRLEN_P(old_qdata), &query_data, &query_data_len)) { RETURN_FALSE; } - UPD_STRL(queryData, query_data, query_data_len); + zend_update_property_stringl(THIS_CE, getThis(), ZEND_STRS("queryData")-1, query_data, query_data_len TSRMLS_CC); efree(query_data); RETURN_TRUE; @@ -1220,15 +1229,7 @@ PHP_METHOD(HttpRequest, addQueryData) /* }}} */ /* {{{ proto bool HttpRequest::addPostFields(array post_data) - * - * Adds POST data entries, leaving previously set unchanged, unless a - * post entry with the same name already exists. - * Affects only POST and custom requests. - * - * Expects an associative array as parameter containing the post fields. - * - * Returns TRUE on success, or FALSE on failure. - */ + Adds POST data entries, leaving previously set unchanged, unless a post entry with the same name already exists. */ PHP_METHOD(HttpRequest, addPostFields) { zval *post_data, *old_post, *new_post; @@ -1240,12 +1241,12 @@ PHP_METHOD(HttpRequest, addPostFields) if (zend_hash_num_elements(Z_ARRVAL_P(post_data))) { MAKE_STD_ZVAL(new_post); array_init(new_post); - old_post = GET_PROP(postFields); + old_post = zend_read_property(THIS_CE, getThis(), ZEND_STRS("postFields")-1, 0 TSRMLS_CC); if (Z_TYPE_P(old_post) == IS_ARRAY) { - array_copy(old_post, new_post); + array_copy(Z_ARRVAL_P(old_post), Z_ARRVAL_P(new_post)); } - array_merge(post_data, new_post); - SET_PROP(postFields, new_post); + array_join(Z_ARRVAL_P(post_data), Z_ARRVAL_P(new_post), 0, 0); + zend_update_property(THIS_CE, getThis(), ZEND_STRS("postFields")-1, new_post TSRMLS_CC); zval_ptr_dtor(&new_post); } @@ -1254,15 +1255,7 @@ PHP_METHOD(HttpRequest, addPostFields) /* }}} */ /* {{{ proto bool HttpRequest::setPostFields([array post_data]) - * - * Set the POST data entries, overwriting previously set POST data. - * Affects only POST and custom requests. - * - * Accepts an associative array as parameter containing the post fields. - * If the parameter is empty or omitted, the post data will be unset. - * - * Returns TRUE on success, or FALSE on failure. - */ + Set the POST data entries, overwriting previously set POST data. */ PHP_METHOD(HttpRequest, setPostFields) { zval *post, *post_data = NULL; @@ -1274,9 +1267,9 @@ PHP_METHOD(HttpRequest, setPostFields) MAKE_STD_ZVAL(post); array_init(post); if (post_data && zend_hash_num_elements(Z_ARRVAL_P(post_data))) { - array_copy(post_data, post); + array_copy(Z_ARRVAL_P(post_data), Z_ARRVAL_P(post)); } - SET_PROP(postFields, post); + zend_update_property(THIS_CE, getThis(), ZEND_STRS("postFields")-1, post TSRMLS_CC); zval_ptr_dtor(&post); RETURN_TRUE; @@ -1284,34 +1277,20 @@ PHP_METHOD(HttpRequest, setPostFields) /* }}}*/ /* {{{ proto array HttpRequest::getPostFields() - * - * Get previously set POST data. - * - * Returns the currently set post fields as associative array. - */ + Get previously set POST data. */ PHP_METHOD(HttpRequest, getPostFields) { NO_ARGS; - IF_RETVAL_USED { + if (return_value_used) { RETURN_PROP(postFields); } } /* }}} */ -/* {{{ proto bool HttpRequest::setRawPostData([string raw_post_data]) - * - * Set raw post data to send, overwriting previously set raw post data. Don't - * forget to specify a content type. Affects only POST and custom requests. - * Only either post fields or raw post data can be used for each request. - * Raw post data has higher precedence and will be used even if post fields - * are set. - * - * Accepts a string as parameter containing the *raw* post data. - * - * Returns TRUE on success, or FALSE on failure. - */ -PHP_METHOD(HttpRequest, setRawPostData) +/* {{{ proto bool HttpRequest::setBody([string request_body_data]) + Set request body to send, overwriting previously set request body. Don't forget to specify a content type. */ +PHP_METHOD(HttpRequest, setBody) { char *raw_data = NULL; int data_len = 0; @@ -1324,21 +1303,14 @@ PHP_METHOD(HttpRequest, setRawPostData) raw_data = ""; } - UPD_STRL(rawPostData, raw_data, data_len); + zend_update_property_stringl(THIS_CE, getThis(), ZEND_STRS("requestBody")-1, raw_data, data_len TSRMLS_CC); RETURN_TRUE; } /* }}} */ -/* {{{ proto bool HttpRequest::addRawPostData(string raw_post_data) - * - * Add raw post data, leaving previously set raw post data unchanged. - * Affects only POST and custom requests. - * - * Expects a string as parameter containing the raw post data to concatenate. - * - * Returns TRUE on success, or FALSE on failure. - */ -PHP_METHOD(HttpRequest, addRawPostData) +/* {{{ proto bool HttpRequest::addBody(string request_body_data) + Add request body data, leaving previously set request body data unchanged. */ +PHP_METHOD(HttpRequest, addBody) { char *raw_data; int data_len; @@ -1348,14 +1320,14 @@ PHP_METHOD(HttpRequest, addRawPostData) } if (data_len) { - zval *data = GET_PROP(rawPostData); + zval *data = zend_read_property(THIS_CE, getThis(), ZEND_STRS("requestBody")-1, 0 TSRMLS_CC); if (Z_STRLEN_P(data)) { Z_STRVAL_P(data) = erealloc(Z_STRVAL_P(data), (Z_STRLEN_P(data) += data_len) + 1); Z_STRVAL_P(data)[Z_STRLEN_P(data)] = '\0'; memcpy(Z_STRVAL_P(data) + Z_STRLEN_P(data) - data_len, raw_data, data_len); } else { - UPD_STRL(putData, raw_data, data_len); + zend_update_property_stringl(THIS_CE, getThis(), ZEND_STRS("requestBody")-1, raw_data, data_len TSRMLS_CC); } } @@ -1363,35 +1335,20 @@ PHP_METHOD(HttpRequest, addRawPostData) } /* }}} */ -/* {{{ proto string HttpRequest::getRawPostData() - * - * Get previously set raw post data. - * - * Returns a string containing the currently set raw post data. - */ -PHP_METHOD(HttpRequest, getRawPostData) +/* {{{ proto string HttpRequest::getBody() + Get previously set request body data. */ +PHP_METHOD(HttpRequest, getBody) { NO_ARGS; - IF_RETVAL_USED { - RETURN_PROP(rawPostData); + if (return_value_used) { + RETURN_PROP(requestBody); } } /* }}} */ /* {{{ proto bool HttpRequest::addPostFile(string name, string file[, string content_type = "application/x-octetstream"]) - * - * Add a file to the POST request, leaving previously set files unchanged. - * Affects only POST and custom requests. Cannot be used with raw post data. - * - * Expects a string parameter containing the form element name, and a string - * paremeter containing the path to the file which should be uploaded. - * Additionally accepts an optional string parameter which should contain - * the content type of the file. - * - * Returns TRUE on success, or FALSE if the content type seems not to contain a - * primary and a secondary content type part. - */ + Add a file to the POST request, leaving previously set files unchanged. */ PHP_METHOD(HttpRequest, addPostFile) { zval *entry, *old_post, *new_post; @@ -1418,12 +1375,12 @@ PHP_METHOD(HttpRequest, addPostFile) MAKE_STD_ZVAL(new_post); array_init(new_post); - old_post = GET_PROP(postFiles); + old_post = zend_read_property(THIS_CE, getThis(), ZEND_STRS("postFiles")-1, 0 TSRMLS_CC); if (Z_TYPE_P(old_post) == IS_ARRAY) { - array_copy(old_post, new_post); + array_copy(Z_ARRVAL_P(old_post), Z_ARRVAL_P(new_post)); } add_next_index_zval(new_post, entry); - SET_PROP(postFiles, new_post); + zend_update_property(THIS_CE, getThis(), ZEND_STRS("postFiles")-1, new_post TSRMLS_CC); zval_ptr_dtor(&new_post); RETURN_TRUE; @@ -1431,16 +1388,7 @@ PHP_METHOD(HttpRequest, addPostFile) /* }}} */ /* {{{ proto bool HttpRequest::setPostFiles([array post_files]) - * - * Set files to post, overwriting previously set post files. - * Affects only POST and requests. Cannot be used with raw post data. - * - * Accepts an array containing the files to post. Each entry should be an - * associative array with "name", "file" and "type" keys. If the parameter - * is empty or omitted the post files will be unset. - * - * Returns TRUE on success, or FALSE on failure. - */ + Set files to post, overwriting previously set post files. */ PHP_METHOD(HttpRequest, setPostFiles) { zval *files = NULL, *post; @@ -1452,9 +1400,9 @@ PHP_METHOD(HttpRequest, setPostFiles) MAKE_STD_ZVAL(post); array_init(post); if (files && (Z_TYPE_P(files) == IS_ARRAY)) { - array_copy(files, post); + array_copy(Z_ARRVAL_P(files), Z_ARRVAL_P(post)); } - SET_PROP(postFiles, post); + zend_update_property(THIS_CE, getThis(), ZEND_STRS("postFiles")-1, post TSRMLS_CC); zval_ptr_dtor(&post); RETURN_TRUE; @@ -1462,30 +1410,19 @@ PHP_METHOD(HttpRequest, setPostFiles) /* }}} */ /* {{{ proto array HttpRequest::getPostFiles() - * - * Get all previously added POST files. - * - * Returns an array containing currently set post files. - */ + Get all previously added POST files. */ PHP_METHOD(HttpRequest, getPostFiles) { NO_ARGS; - IF_RETVAL_USED { + if (return_value_used) { RETURN_PROP(postFiles); } } /* }}} */ /* {{{ proto bool HttpRequest::setPutFile([string file]) - * - * Set file to put. Affects only PUT requests. - * - * Accepts a string as parameter referencing the path to file. - * If the parameter is empty or omitted the put file will be unset. - * - * Returns TRUE on success, or FALSE on failure. - */ + Set file to put. Affects only PUT requests. */ PHP_METHOD(HttpRequest, setPutFile) { char *file = ""; @@ -1495,39 +1432,25 @@ PHP_METHOD(HttpRequest, setPutFile) RETURN_FALSE; } - UPD_STRL(putFile, file, file_len); + zend_update_property_stringl(THIS_CE, getThis(), ZEND_STRS("putFile")-1, file, file_len TSRMLS_CC); RETURN_TRUE; } /* }}} */ /* {{{ proto string HttpRequest::getPutFile() - * - * Get previously set put file. - * - * Returns a string containing the path to the currently set put file. - */ + Get previously set put file. */ PHP_METHOD(HttpRequest, getPutFile) { NO_ARGS; - IF_RETVAL_USED { + if (return_value_used) { RETURN_PROP(putFile); } } /* }}} */ /* {{{ proto bool HttpRequest::setPutData([string put_data]) - * - * Set PUT data to send, overwriting previously set PUT data. - * Affects only PUT requests. - * Only either PUT data or PUT file can be used for each request. - * PUT data has higher precedence and will be used even if a PUT - * file is set. - * - * Accepts a string as parameter containing the data to upload. - * - * Returns TRUE on success, or FALSE on failure. - */ + Set PUT data to send, overwriting previously set PUT data. */ PHP_METHOD(HttpRequest, setPutData) { char *put_data = NULL; @@ -1541,20 +1464,13 @@ PHP_METHOD(HttpRequest, setPutData) put_data = ""; } - UPD_STRL(putData, put_data, data_len); + zend_update_property_stringl(THIS_CE, getThis(), ZEND_STRS("putData")-1, put_data, data_len TSRMLS_CC); RETURN_TRUE; } /* }}} */ /* {{{ proto bool HttpRequest::addPutData(string put_data) - * - * Add PUT data, leaving previously set PUT data unchanged. - * Affects only PUT requests. - * - * Expects a string as parameter containing the data to concatenate. - * - * Returns TRUE on success, or FALSE on failure. - */ + Add PUT data, leaving previously set PUT data unchanged. */ PHP_METHOD(HttpRequest, addPutData) { char *put_data; @@ -1565,14 +1481,14 @@ PHP_METHOD(HttpRequest, addPutData) } if (data_len) { - zval *data = GET_PROP(putData); + zval *data = zend_read_property(THIS_CE, getThis(), ZEND_STRS("putData")-1, 0 TSRMLS_CC); if (Z_STRLEN_P(data)) { Z_STRVAL_P(data) = erealloc(Z_STRVAL_P(data), (Z_STRLEN_P(data) += data_len) + 1); Z_STRVAL_P(data)[Z_STRLEN_P(data)] = '\0'; memcpy(Z_STRVAL_P(data) + Z_STRLEN_P(data) - data_len, put_data, data_len); } else { - UPD_STRL(putData, put_data, data_len); + zend_update_property_stringl(THIS_CE, getThis(), ZEND_STRS("putData")-1, put_data, data_len TSRMLS_CC); } } @@ -1581,136 +1497,129 @@ PHP_METHOD(HttpRequest, addPutData) /* }}} */ /* {{{ proto string HttpRequest::getPutData() - * - * Get previously set PUT data. - * - * Returns a string containing the currently set raw post data. - */ + Get previously set PUT data. */ PHP_METHOD(HttpRequest, getPutData) { NO_ARGS; - IF_RETVAL_USED { + if (return_value_used) { RETURN_PROP(putData); } } /* }}} */ /* {{{ proto array HttpRequest::getResponseData() - * - * Get all response data after the request has been sent. - * - * Returns an associative array with the key "headers" containing an associative - * array holding all response headers, as well as the key "body" containing a - * string with the response body. - * - * If redirects were allowed and several responses were received, the data - * references the last received response. - */ + Get all response data after the request has been sent. */ PHP_METHOD(HttpRequest, getResponseData) { NO_ARGS; - IF_RETVAL_USED { - RETURN_PROP(responseData); + if (return_value_used) { + char *body; + size_t body_len; + zval *headers, *message = zend_read_property(THIS_CE, getThis(), ZEND_STRS("responseMessage")-1, 0 TSRMLS_CC); + + if (Z_TYPE_P(message) == IS_OBJECT) { + getObjectEx(http_message_object, msg, message); + + array_init(return_value); + + MAKE_STD_ZVAL(headers); + array_init(headers); + zend_hash_copy(Z_ARRVAL_P(headers), &msg->message->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); + add_assoc_zval(return_value, "headers", headers); + + phpstr_data(PHPSTR(msg->message), &body, &body_len); + add_assoc_stringl(return_value, "body", body, body_len, 0); + } } } /* }}} */ /* {{{ proto mixed HttpRequest::getResponseHeader([string name]) - * - * Get response header(s) after the request has been sent. - * - * Accepts an string as optional parameter specifying a certain header to read. - * If the parameter is empty or omitted all response headers will be returned. - * - * Returns either a string with the value of the header matching name if requested, - * FALSE on failure, or an associative array containing all response headers. - * - * If redirects were allowed and several responses were received, the data - * references the last received response. - */ + Get response header(s) after the request has been sent. */ PHP_METHOD(HttpRequest, getResponseHeader) { - IF_RETVAL_USED { - zval *data, **headers, **header; + if (return_value_used) { + zval *header; char *header_name = NULL; int header_len = 0; - if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &header_name, &header_len)) { - RETURN_FALSE; - } - - data = GET_PROP(responseData); - if ( (Z_TYPE_P(data) == IS_ARRAY) && - (SUCCESS == zend_hash_find(Z_ARRVAL_P(data), "headers", sizeof("headers"), (void **) &headers)) && - (Z_TYPE_PP(headers) == IS_ARRAY)) { - if (!header_len || !header_name) { - RETVAL_ZVAL(*headers, 1, 0); - } else if (SUCCESS == zend_hash_find(Z_ARRVAL_PP(headers), pretty_key(header_name, header_len, 1, 1), header_len + 1, (void **) &header)) { - RETVAL_ZVAL(*header, 1, 0); - } else { - RETVAL_FALSE; + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &header_name, &header_len)) { + zval *message = zend_read_property(THIS_CE, getThis(), ZEND_STRS("responseMessage")-1, 0 TSRMLS_CC); + + if (Z_TYPE_P(message) == IS_OBJECT) { + getObjectEx(http_message_object, msg, message); + + if (header_len) { + if ((header = http_message_header_ex(msg->message, pretty_key(header_name, header_len, 1, 1), header_len + 1, 0))) { + RETURN_ZVAL(header, 1, 1); + } + } else { + array_init(return_value); + zend_hash_copy(Z_ARRVAL_P(return_value), &msg->message->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); + return; + } } - } else { - RETVAL_FALSE; } + RETURN_FALSE; } } /* }}} */ /* {{{ proto array HttpRequest::getResponseCookies([int flags[, array allowed_extras]]) - * - * Get response cookie(s) after the request has been sent. - * - * Returns an array of stdClass objects like http_parse_cookie would return. - * - * If redirects were allowed and several responses were received, the data - * references the last received response. - */ + Get response cookie(s) after the request has been sent. */ PHP_METHOD(HttpRequest, getResponseCookies) { - IF_RETVAL_USED { + if (return_value_used) { long flags = 0; - zval *allowed_extras_array = NULL, *data, **headers; - - if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|la", &flags, &allowed_extras_array)) { - RETURN_FALSE; - } - - data = GET_PROP(responseData); - if ( (Z_TYPE_P(data) == IS_ARRAY) && - (SUCCESS == zend_hash_find(Z_ARRVAL_P(data), "headers", sizeof("headers"), (void **) &headers)) && - (Z_TYPE_PP(headers) == IS_ARRAY)) { + zval *allowed_extras_array = NULL; + + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|la!", &flags, &allowed_extras_array)) { int i = 0; - ulong idx = 0; - char *key = NULL, **allowed_extras = NULL; - zval **header = NULL, **entry = NULL; + HashKey key = initHashKey(0); + char **allowed_extras = NULL; + zval **header = NULL, **entry = NULL, *message = zend_read_property(THIS_CE, getThis(), ZEND_STRS("responseMessage")-1, 0 TSRMLS_CC); HashPosition pos, pos1, pos2; - array_init(return_value); - - if (allowed_extras_array) { - allowed_extras = ecalloc(zend_hash_num_elements(Z_ARRVAL_P(allowed_extras_array)) + 1, sizeof(char *)); - FOREACH_VAL(pos, allowed_extras_array, entry) { - ZVAL_ADDREF(*entry); - convert_to_string_ex(entry); - allowed_extras[i++] = estrndup(Z_STRVAL_PP(entry), Z_STRLEN_PP(entry)); - zval_ptr_dtor(entry); + if (Z_TYPE_P(message) == IS_OBJECT) { + getObjectEx(http_message_object, msg, message); + + array_init(return_value); + + if (allowed_extras_array) { + allowed_extras = ecalloc(zend_hash_num_elements(Z_ARRVAL_P(allowed_extras_array)) + 1, sizeof(char *)); + FOREACH_VAL(pos, allowed_extras_array, entry) { + zval *data = http_zsep(IS_STRING, *entry); + allowed_extras[i++] = estrndup(Z_STRVAL_P(data), Z_STRLEN_P(data)); + zval_ptr_dtor(&data); + } } - } - - FOREACH_HASH_KEYVAL(pos1, Z_ARRVAL_PP(headers), key, idx, header) { - if (key && !strcasecmp(key, "Set-Cookie")) { - http_cookie_list list; - - if (Z_TYPE_PP(header) == IS_ARRAY) { - zval **single_header; + + FOREACH_HASH_KEYVAL(pos1, &msg->message->hdrs, key, header) { + if (key.type == HASH_KEY_IS_STRING && !strcasecmp(key.str, "Set-Cookie")) { + http_cookie_list list; - FOREACH_VAL(pos2, *header, single_header) { - ZVAL_ADDREF(*single_header); - convert_to_string_ex(single_header); - if (http_parse_cookie_ex(&list, Z_STRVAL_PP(single_header), flags, allowed_extras)) { + if (Z_TYPE_PP(header) == IS_ARRAY) { + zval **single_header; + + FOREACH_VAL(pos2, *header, single_header) { + zval *data = http_zsep(IS_STRING, *single_header); + + if (http_parse_cookie_ex(&list, Z_STRVAL_P(data), flags, allowed_extras)) { + zval *cookie; + + MAKE_STD_ZVAL(cookie); + object_init(cookie); + http_cookie_list_tostruct(&list, cookie); + add_next_index_zval(return_value, cookie); + http_cookie_list_dtor(&list); + } + zval_ptr_dtor(&data); + } + } else { + zval *data = http_zsep(IS_STRING, *header); + if (http_parse_cookie_ex(&list, Z_STRVAL_P(data), flags, allowed_extras)) { zval *cookie; MAKE_STD_ZVAL(cookie); @@ -1719,60 +1628,38 @@ PHP_METHOD(HttpRequest, getResponseCookies) add_next_index_zval(return_value, cookie); http_cookie_list_dtor(&list); } - zval_ptr_dtor(single_header); - } - } else { - ZVAL_ADDREF(*header); - convert_to_string_ex(header); - if (http_parse_cookie_ex(&list, Z_STRVAL_PP(header), flags, allowed_extras)) { - zval *cookie; - - MAKE_STD_ZVAL(cookie); - object_init(cookie); - http_cookie_list_tostruct(&list, cookie); - add_next_index_zval(return_value, cookie); - http_cookie_list_dtor(&list); + zval_ptr_dtor(&data); } - zval_ptr_dtor(header); } } - /* reset key */ - key = NULL; - } - - if (allowed_extras) { - for (i = 0; allowed_extras[i]; ++i) { - efree(allowed_extras[i]); + + if (allowed_extras) { + for (i = 0; allowed_extras[i]; ++i) { + efree(allowed_extras[i]); + } + efree(allowed_extras); } - efree(allowed_extras); + + return; } - } else { - RETURN_FALSE; } + RETURN_FALSE; } } /* }}} */ /* {{{ proto string HttpRequest::getResponseBody() - * - * Get the response body after the request has been sent. - * - * Returns a string containing the response body. - * - * If redirects were allowed and several responses were received, the data - * references the last received response. - */ + Get the response body after the request has been sent. */ PHP_METHOD(HttpRequest, getResponseBody) { NO_ARGS; - IF_RETVAL_USED { - zval **body; - zval *data = GET_PROP(responseData); + if (return_value_used) { + zval *message = zend_read_property(THIS_CE, getThis(), ZEND_STRS("responseMessage")-1, 0 TSRMLS_CC); - if ( (Z_TYPE_P(data) == IS_ARRAY) && - (SUCCESS == zend_hash_find(Z_ARRVAL_P(data), "body", sizeof("body"), (void **) &body))) { - RETURN_ZVAL(*body, 1, 0); + if (Z_TYPE_P(message) == IS_OBJECT) { + getObjectEx(http_message_object, msg, message); + RETURN_PHPSTR_DUP(&msg->message->body); } else { RETURN_FALSE; } @@ -1781,59 +1668,34 @@ PHP_METHOD(HttpRequest, getResponseBody) /* }}} */ /* {{{ proto int HttpRequest::getResponseCode() - * - * Get the response code after the request has been sent. - * - * Returns an int representing the response code. - * - * If redirects were allowed and several responses were received, the data - * references the last received response. - */ + Get the response code after the request has been sent. */ PHP_METHOD(HttpRequest, getResponseCode) { NO_ARGS; - IF_RETVAL_USED { + if (return_value_used) { RETURN_PROP(responseCode); } } /* }}} */ /* {{{ proto string HttpRequest::getResponseStatus() - * - * Get the response status (i.e. the string after the response code) after the message has been sent. - * - * Returns a string containing the response status text. - */ + Get the response status (i.e. the string after the response code) after the message has been sent. */ PHP_METHOD(HttpRequest, getResponseStatus) { NO_ARGS; - IF_RETVAL_USED { + if (return_value_used) { RETURN_PROP(responseStatus); } } /* }}} */ /* {{{ proto mixed HttpRequest::getResponseInfo([string name]) - * - * Get response info after the request has been sent. - * See http_get() for a full list of returned info. - * - * Accepts a string as optional parameter specifying the info to read. - * If the parameter is empty or omitted, an associative array containing - * all available info will be returned. - * - * Returns either a scalar containing the value of the info matching name if - * requested, FALSE on failure, or an associative array containing all - * available info. - * - * If redirects were allowed and several responses were received, the data - * references the last received response. - */ + Get response info after the request has been sent. */ PHP_METHOD(HttpRequest, getResponseInfo) { - IF_RETVAL_USED { + if (return_value_used) { zval *info, **infop; char *info_name = NULL; int info_len = 0; @@ -1842,14 +1704,14 @@ PHP_METHOD(HttpRequest, getResponseInfo) RETURN_FALSE; } - info = GET_PROP(responseInfo); + info = zend_read_property(THIS_CE, getThis(), ZEND_STRS("responseInfo")-1, 0 TSRMLS_CC); if (Z_TYPE_P(info) != IS_ARRAY) { RETURN_FALSE; } if (info_len && info_name) { - if (SUCCESS == zend_hash_find(Z_ARRVAL_P(info), pretty_key(info_name, info_len, 0, 0), info_len + 1, (void **) &infop)) { + if (SUCCESS == zend_hash_find(Z_ARRVAL_P(info), pretty_key(info_name, info_len, 0, 0), info_len + 1, (void *) &infop)) { RETURN_ZVAL(*infop, 1, 0); } else { http_error_ex(HE_NOTICE, HTTP_E_INVALID_PARAM, "Could not find response info named %s", info_name); @@ -1863,31 +1725,18 @@ PHP_METHOD(HttpRequest, getResponseInfo) /* }}}*/ /* {{{ proto HttpMessage HttpRequest::getResponseMessage() - * - * Get the full response as HttpMessage object after the request has been sent. - * - * Returns an HttpMessage object of the response. - * - * If redirects were allowed and several responses were received, the data - * references the last received response. Use HttpMessage::getParentMessage() - * to access the data of previously received responses within this request - * cycle. - * - * Throws HttpException. - */ + Get the full response as HttpMessage object after the request has been sent. */ PHP_METHOD(HttpRequest, getResponseMessage) { - NO_ARGS; - - IF_RETVAL_USED { + NO_ARGS { zval *message; SET_EH_THROW_HTTP(); - message = GET_PROP(responseMessage); + message = zend_read_property(THIS_CE, getThis(), ZEND_STRS("responseMessage")-1, 0 TSRMLS_CC); if (Z_TYPE_P(message) == IS_OBJECT) { RETVAL_OBJECT(message, 1); } else { - RETVAL_NULL(); + http_error(HE_WARNING, HTTP_E_RUNTIME, "HttpRequest does not contain a response message"); } SET_EH_NORMAL(); } @@ -1895,28 +1744,12 @@ PHP_METHOD(HttpRequest, getResponseMessage) /* }}} */ /* {{{ proto HttpMessage HttpRequest::getRequestMessage() - * - * Get sent HTTP message. - * - * Returns an HttpMessage object representing the sent request. - * - * If redirects were allowed and several responses were received, the data - * references the last received response. Use HttpMessage::getParentMessage() - * to access the data of previously sent requests within this request - * cycle. - * - * Note that the internal request message is immutable, that means that the - * request message received through HttpRequest::getRequestMessage() will - * always look the same for the same request, regardless of any changes you - * may have made to the returned object. - * - * Throws HttpMalformedHeadersException, HttpEncodingException. - */ + Get sent HTTP message. */ PHP_METHOD(HttpRequest, getRequestMessage) { NO_ARGS; - IF_RETVAL_USED { + if (return_value_used) { http_message *msg; getObject(http_request_object, obj); @@ -1930,17 +1763,12 @@ PHP_METHOD(HttpRequest, getRequestMessage) /* }}} */ /* {{{ proto string HttpRequest::getRawRequestMessage() - * - * Get sent HTTP message. - * - * Returns an HttpMessage in a form of a string - * - */ + Get sent HTTP message. */ PHP_METHOD(HttpRequest, getRawRequestMessage) { NO_ARGS; - IF_RETVAL_USED { + if (return_value_used) { getObject(http_request_object, obj); RETURN_PHPSTR_DUP(&obj->request->conv.request); @@ -1949,17 +1777,12 @@ PHP_METHOD(HttpRequest, getRawRequestMessage) /* }}} */ /* {{{ proto string HttpRequest::getRawResponseMessage() - * - * Get the entire HTTP response. - * - * Returns the complete web server response, including the headers in a form of a string. - * - */ + Get the entire HTTP response. */ PHP_METHOD(HttpRequest, getRawResponseMessage) { NO_ARGS; - IF_RETVAL_USED { + if (return_value_used) { getObject(http_request_object, obj); RETURN_PHPSTR_DUP(&obj->request->conv.response); @@ -1968,29 +1791,16 @@ PHP_METHOD(HttpRequest, getRawResponseMessage) /* }}} */ /* {{{ proto HttpMessage HttpRequest::getHistory() - * - * Get all sent requests and received responses as an HttpMessage object. - * - * If you want to record history, set the instance variable - * HttpRequest::$recordHistory to TRUE. - * - * Returns an HttpMessage object representing the complete request/response - * history. - * - * The object references the last received response, use HttpMessage::getParentMessage() - * to access the data of previously sent requests and received responses. - * - * Throws HttpRuntimeException. - */ + Get all sent requests and received responses as an HttpMessage object. */ PHP_METHOD(HttpRequest, getHistory) { NO_ARGS; - IF_RETVAL_USED { + if (return_value_used) { zval *hist; SET_EH_THROW_HTTP(); - hist = GET_PROP(history); + hist = zend_read_property(THIS_CE, getThis(), ZEND_STRS("history")-1, 0 TSRMLS_CC); if (Z_TYPE_P(hist) == IS_OBJECT) { RETVAL_OBJECT(hist, 1); } else { @@ -2002,9 +1812,7 @@ PHP_METHOD(HttpRequest, getHistory) /* }}} */ /* {{{ proto void HttpRequest::clearHistory() - * - * Clear the history. - */ + Clear the history. */ PHP_METHOD(HttpRequest, clearHistory) { NO_ARGS { @@ -2012,57 +1820,14 @@ PHP_METHOD(HttpRequest, clearHistory) MAKE_STD_ZVAL(hist); ZVAL_NULL(hist); - SET_PROP(history, hist); + zend_update_property(THIS_CE, getThis(), ZEND_STRS("history")-1, hist TSRMLS_CC); zval_ptr_dtor(&hist); } } /* }}} */ /* {{{ proto HttpMessage HttpRequest::send() - * - * Send the HTTP request. - * - * Returns the received response as HttpMessage object. - * - * NOTE: While an exception may be thrown, the transfer could have succeeded - * at least partially, so you might want to check the return values of various - * HttpRequest::getResponse*() methods. - * - * Throws HttpRuntimeException, HttpRequestException, - * HttpMalformedHeaderException, HttpEncodingException. - * - * GET example: - * 
- * setOptions(array('lastmodified' => filemtime('local.rss')));
- * $r->addQueryData(array('category' => 3));
- * try {
- *     $r->send();
- *     if ($r->getResponseCode() == 200) {
- *         file_put_contents('local.rss', $r->getResponseBody());
- *    }
- * } catch (HttpException $ex) {
- *     echo $ex;
- * }
- * ?>
- *
- * - * POST example: - * 
- * setOptions(array('cookies' => array('lang' => 'de')));
- * $r->addPostFields(array('user' => 'mike', 'pass' => 's3c|r3t'));
- * $r->addPostFile('image', 'profile.jpg', 'image/jpeg');
- * try {
- *     echo $r->send()->getBody();
- * } catch (HttpException $ex) {
- *     echo $ex;
- * }
- * ?>
- *
- */ + Send the HTTP request. */ PHP_METHOD(HttpRequest, send) { getObject(http_request_object, obj); @@ -2078,7 +1843,7 @@ PHP_METHOD(HttpRequest, send) } else if (SUCCESS == http_request_object_requesthandler(obj, getThis())) { http_request_exec(obj->request); if (SUCCESS == http_request_object_responsehandler(obj, getThis())) { - RETVAL_OBJECT(GET_PROP(responseMessage), 1); + RETVAL_OBJECT(zend_read_property(THIS_CE, getThis(), ZEND_STRS("responseMessage")-1, 0 TSRMLS_CC), 1); } }