/*
- +----------------------------------------------------------------------+
- | PECL :: http |
- +----------------------------------------------------------------------+
- | This source file is subject to version 3.0 of the PHP license, that |
- | is bundled with this package in the file LICENSE, and is available |
- | through the world-wide-web at http://www.php.net/license/3_0.txt. |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
- +----------------------------------------------------------------------+
- | Copyright (c) 2004-2005 Michael Wallner <mike@php.net> |
- +----------------------------------------------------------------------+
+ +--------------------------------------------------------------------+
+ | PECL :: http |
+ +--------------------------------------------------------------------+
+ | Redistribution and use in source and binary forms, with or without |
+ | modification, are permitted provided that the conditions mentioned |
+ | in the accompanying LICENSE file are met. |
+ +--------------------------------------------------------------------+
+ | Copyright (c) 2004-2006, Michael Wallner <mike@php.net> |
+ +--------------------------------------------------------------------+
*/
/* $Id$ */
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-#include "php.h"
+#define HTTP_WANT_CURL
+#include "php_http.h"
#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL)
-#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.h"
+#include "zend_interfaces.h"
+
#include "php_http_api.h"
-#include "php_http_url_api.h"
+#include "php_http_cookie_api.h"
+#include "php_http_exception_object.h"
#include "php_http_message_api.h"
#include "php_http_message_object.h"
-#include "php_http_exception_object.h"
-
-#ifdef PHP_WIN32
-# include <winsock2.h>
-#endif
-#include <curl/curl.h>
-
-ZEND_EXTERN_MODULE_GLOBALS(http);
+#include "php_http_request_api.h"
+#include "php_http_request_object.h"
+#include "php_http_request_pool_api.h"
+#include "php_http_url_api.h"
-#define HTTP_BEGIN_ARGS(method, ret_ref, req_args) HTTP_BEGIN_ARGS_EX(HttpRequest, method, ret_ref, req_args)
-#define HTTP_EMPTY_ARGS(method, ret_ref) HTTP_EMPTY_ARGS_EX(HttpRequest, method, ret_ref)
-#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_BEGIN_ARGS(method, req_args) HTTP_BEGIN_ARGS_EX(HttpRequest, method, 0, req_args)
+#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))
-HTTP_EMPTY_ARGS(__destruct, 0);
-HTTP_BEGIN_ARGS(__construct, 0, 0)
+HTTP_BEGIN_ARGS(__construct, 0)
HTTP_ARG_VAL(url, 0)
HTTP_ARG_VAL(method, 0)
+ HTTP_ARG_VAL(options, 0)
HTTP_END_ARGS;
-HTTP_EMPTY_ARGS(getOptions, 0);
-HTTP_EMPTY_ARGS(unsetOptions, 0);
-HTTP_BEGIN_ARGS(setOptions, 0, 1)
+HTTP_EMPTY_ARGS(getOptions);
+HTTP_BEGIN_ARGS(setOptions, 0)
HTTP_ARG_VAL(options, 0)
HTTP_END_ARGS;
-HTTP_EMPTY_ARGS(getSslOptions, 0);
-HTTP_EMPTY_ARGS(unsetSslOptions, 0);
-HTTP_BEGIN_ARGS(setSslOptions, 0, 1)
+HTTP_EMPTY_ARGS(getSslOptions);
+HTTP_BEGIN_ARGS(setSslOptions, 0)
HTTP_ARG_VAL(ssl_options, 0)
HTTP_END_ARGS;
-HTTP_EMPTY_ARGS(getHeaders, 0);
-HTTP_EMPTY_ARGS(unsetHeaders, 0);
-HTTP_BEGIN_ARGS(addHeaders, 0, 1)
+HTTP_BEGIN_ARGS(addSslOptions, 0)
+ HTTP_ARG_VAL(ssl_optins, 0)
+HTTP_END_ARGS;
+
+HTTP_EMPTY_ARGS(getHeaders);
+HTTP_BEGIN_ARGS(setHeaders, 0)
+ HTTP_ARG_VAL(headers, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(addHeaders, 1)
HTTP_ARG_VAL(headers, 0)
HTTP_END_ARGS;
-HTTP_EMPTY_ARGS(getCookies, 0);
-HTTP_EMPTY_ARGS(unsetCookies, 0);
-HTTP_BEGIN_ARGS(addCookies, 0, 1)
+HTTP_EMPTY_ARGS(getCookies);
+HTTP_BEGIN_ARGS(setCookies, 0)
HTTP_ARG_VAL(cookies, 0)
HTTP_END_ARGS;
-HTTP_EMPTY_ARGS(getUrl, 0);
-HTTP_BEGIN_ARGS(setUrl, 0, 1)
+HTTP_BEGIN_ARGS(addCookies, 1)
+ HTTP_ARG_VAL(cookies, 0)
+HTTP_END_ARGS;
+
+HTTP_EMPTY_ARGS(getUrl);
+HTTP_BEGIN_ARGS(setUrl, 1)
HTTP_ARG_VAL(url, 0)
HTTP_END_ARGS;
-HTTP_EMPTY_ARGS(getMethod, 0);
-HTTP_BEGIN_ARGS(setMethod, 0, 1)
+HTTP_EMPTY_ARGS(getMethod);
+HTTP_BEGIN_ARGS(setMethod, 1)
HTTP_ARG_VAL(request_method, 0)
HTTP_END_ARGS;
-HTTP_EMPTY_ARGS(getContentType, 0);
-HTTP_BEGIN_ARGS(setContentType, 0, 1)
+HTTP_EMPTY_ARGS(getContentType);
+HTTP_BEGIN_ARGS(setContentType, 1)
HTTP_ARG_VAL(content_type, 0)
HTTP_END_ARGS;
-HTTP_EMPTY_ARGS(getQueryData, 0);
-HTTP_EMPTY_ARGS(unsetQueryData, 0);
-HTTP_BEGIN_ARGS(setQueryData, 0, 1)
+HTTP_EMPTY_ARGS(getQueryData);
+HTTP_BEGIN_ARGS(setQueryData, 0)
HTTP_ARG_VAL(query_data, 0)
HTTP_END_ARGS;
-HTTP_BEGIN_ARGS(addQueryData, 0, 1)
+HTTP_BEGIN_ARGS(addQueryData, 1)
HTTP_ARG_VAL(query_data, 0)
HTTP_END_ARGS;
-HTTP_EMPTY_ARGS(getPostFields, 0);
-HTTP_EMPTY_ARGS(unsetPostFields, 0);
-HTTP_BEGIN_ARGS(setPostFields, 0, 1)
+HTTP_EMPTY_ARGS(getPostFields);
+HTTP_BEGIN_ARGS(setPostFields, 0)
HTTP_ARG_VAL(post_fields, 0)
HTTP_END_ARGS;
-HTTP_BEGIN_ARGS(addPostFields, 0, 1)
+HTTP_BEGIN_ARGS(addPostFields, 1)
HTTP_ARG_VAL(post_fields, 0)
HTTP_END_ARGS;
-HTTP_EMPTY_ARGS(getPostFiles, 0);
-HTTP_EMPTY_ARGS(unsetPostFiles, 0);
-HTTP_BEGIN_ARGS(setPostFiles, 0, 1)
+HTTP_EMPTY_ARGS(getPostFiles);
+HTTP_BEGIN_ARGS(setPostFiles, 0)
HTTP_ARG_VAL(post_files, 0)
HTTP_END_ARGS;
-HTTP_BEGIN_ARGS(addPostFile, 0, 2)
+HTTP_BEGIN_ARGS(addPostFile, 2)
HTTP_ARG_VAL(formname, 0)
HTTP_ARG_VAL(filename, 0)
HTTP_ARG_VAL(content_type, 0)
HTTP_END_ARGS;
-HTTP_EMPTY_ARGS(getPutFile, 0);
-HTTP_EMPTY_ARGS(unsetPutFile, 0);
-HTTP_BEGIN_ARGS(setPutFile, 0, 1)
+HTTP_EMPTY_ARGS(getRawPostData);
+HTTP_BEGIN_ARGS(setRawPostData, 0)
+ HTTP_ARG_VAL(raw_post_data, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(addRawPostData, 1)
+ HTTP_ARG_VAL(raw_post_data, 0)
+HTTP_END_ARGS;
+
+HTTP_EMPTY_ARGS(getPutFile);
+HTTP_BEGIN_ARGS(setPutFile, 0)
HTTP_ARG_VAL(filename, 0)
HTTP_END_ARGS;
-HTTP_EMPTY_ARGS(getResponseData, 0);
-HTTP_BEGIN_ARGS(getResponseHeader, 0, 0)
- HTTP_ARG_VAL(name, 0)
+HTTP_EMPTY_ARGS(getPutData);
+HTTP_BEGIN_ARGS(setPutData, 0)
+ HTTP_ARG_VAL(put_data, 0)
+HTTP_END_ARGS;
+
+HTTP_BEGIN_ARGS(addPutData, 1)
+ HTTP_ARG_VAL(put_data, 0)
HTTP_END_ARGS;
-HTTP_BEGIN_ARGS(getResponseCookie, 0, 0)
+HTTP_EMPTY_ARGS(getResponseData);
+HTTP_BEGIN_ARGS(getResponseHeader, 0)
HTTP_ARG_VAL(name, 0)
HTTP_END_ARGS;
-HTTP_EMPTY_ARGS(getResponseBody, 0);
-HTTP_EMPTY_ARGS(getResponseCode, 0);
-HTTP_BEGIN_ARGS(getResponseInfo, 0, 0)
+HTTP_BEGIN_ARGS(getResponseCookies, 0)
+ HTTP_ARG_VAL(flags, 0)
+ HTTP_ARG_VAL(allowed_extras, 0)
+HTTP_END_ARGS;
+
+HTTP_EMPTY_ARGS(getResponseBody);
+HTTP_EMPTY_ARGS(getResponseCode);
+HTTP_EMPTY_ARGS(getResponseStatus);
+HTTP_BEGIN_ARGS(getResponseInfo, 0)
HTTP_ARG_VAL(name, 0)
HTTP_END_ARGS;
-HTTP_EMPTY_ARGS(getResponseMessage, 1);
-HTTP_EMPTY_ARGS(getRequestMessage, 1);
-HTTP_EMPTY_ARGS(getHistory, 1);
-HTTP_EMPTY_ARGS(send, 0);
+HTTP_EMPTY_ARGS(getResponseMessage);
+HTTP_EMPTY_ARGS(getRawResponseMessage);
+HTTP_EMPTY_ARGS(getRequestMessage);
+HTTP_EMPTY_ARGS(getRawRequestMessage);
+HTTP_EMPTY_ARGS(getHistory);
+HTTP_EMPTY_ARGS(clearHistory);
+HTTP_EMPTY_ARGS(send);
-HTTP_BEGIN_ARGS(get, 0, 1)
+HTTP_BEGIN_ARGS(get, 1)
HTTP_ARG_VAL(url, 0)
HTTP_ARG_VAL(options, 0)
HTTP_ARG_VAL(info, 1)
HTTP_END_ARGS;
-HTTP_BEGIN_ARGS(head, 0, 1)
+HTTP_BEGIN_ARGS(head, 1)
HTTP_ARG_VAL(url, 0)
HTTP_ARG_VAL(options, 0)
HTTP_ARG_VAL(info, 1)
HTTP_END_ARGS;
-HTTP_BEGIN_ARGS(postData, 0, 2)
+HTTP_BEGIN_ARGS(postData, 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(postFields, 0, 2)
+HTTP_BEGIN_ARGS(postFields, 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, 0, 2)
+HTTP_BEGIN_ARGS(putFile, 2)
HTTP_ARG_VAL(url, 0)
HTTP_ARG_VAL(file, 0)
HTTP_ARG_VAL(options, 0)
HTTP_ARG_VAL(info, 1)
HTTP_END_ARGS;
-HTTP_BEGIN_ARGS(putStream, 0, 2)
+HTTP_BEGIN_ARGS(putStream, 2)
HTTP_ARG_VAL(url, 0)
HTTP_ARG_VAL(stream, 0)
HTTP_ARG_VAL(options, 0)
HTTP_ARG_VAL(info, 1)
HTTP_END_ARGS;
-HTTP_BEGIN_ARGS(methodRegister, 0, 1)
+HTTP_BEGIN_ARGS(methodRegister, 1)
HTTP_ARG_VAL(method_name, 0)
HTTP_END_ARGS;
-HTTP_BEGIN_ARGS(methodUnregister, 0, 1)
+HTTP_BEGIN_ARGS(methodUnregister, 1)
HTTP_ARG_VAL(method, 0)
HTTP_END_ARGS;
-HTTP_BEGIN_ARGS(methodName, 0, 1)
+HTTP_BEGIN_ARGS(methodName, 1)
HTTP_ARG_VAL(method_id, 0)
HTTP_END_ARGS;
-HTTP_BEGIN_ARGS(methodExists, 0, 1)
+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);
-
+#define OBJ_PROP_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)
- HTTP_REQUEST_ME(__destruct, ZEND_ACC_PUBLIC|ZEND_ACC_DTOR)
HTTP_REQUEST_ME(setOptions, ZEND_ACC_PUBLIC)
HTTP_REQUEST_ME(getOptions, ZEND_ACC_PUBLIC)
- HTTP_REQUEST_ME(unsetOptions, ZEND_ACC_PUBLIC)
HTTP_REQUEST_ME(setSslOptions, ZEND_ACC_PUBLIC)
HTTP_REQUEST_ME(getSslOptions, ZEND_ACC_PUBLIC)
- HTTP_REQUEST_ME(unsetSslOptions, ZEND_ACC_PUBLIC)
+ HTTP_REQUEST_ME(addSslOptions, ZEND_ACC_PUBLIC)
HTTP_REQUEST_ME(addHeaders, ZEND_ACC_PUBLIC)
HTTP_REQUEST_ME(getHeaders, ZEND_ACC_PUBLIC)
- HTTP_REQUEST_ME(unsetHeaders, ZEND_ACC_PUBLIC)
+ HTTP_REQUEST_ME(setHeaders, ZEND_ACC_PUBLIC)
+
HTTP_REQUEST_ME(addCookies, ZEND_ACC_PUBLIC)
HTTP_REQUEST_ME(getCookies, ZEND_ACC_PUBLIC)
- HTTP_REQUEST_ME(unsetCookies, ZEND_ACC_PUBLIC)
+ HTTP_REQUEST_ME(setCookies, ZEND_ACC_PUBLIC)
HTTP_REQUEST_ME(setMethod, ZEND_ACC_PUBLIC)
HTTP_REQUEST_ME(getMethod, ZEND_ACC_PUBLIC)
HTTP_REQUEST_ME(setQueryData, ZEND_ACC_PUBLIC)
HTTP_REQUEST_ME(getQueryData, ZEND_ACC_PUBLIC)
HTTP_REQUEST_ME(addQueryData, ZEND_ACC_PUBLIC)
- HTTP_REQUEST_ME(unsetQueryData, ZEND_ACC_PUBLIC)
HTTP_REQUEST_ME(setPostFields, ZEND_ACC_PUBLIC)
HTTP_REQUEST_ME(getPostFields, ZEND_ACC_PUBLIC)
HTTP_REQUEST_ME(addPostFields, ZEND_ACC_PUBLIC)
- HTTP_REQUEST_ME(unsetPostFields, 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(setPostFiles, ZEND_ACC_PUBLIC)
HTTP_REQUEST_ME(addPostFile, ZEND_ACC_PUBLIC)
HTTP_REQUEST_ME(getPostFiles, ZEND_ACC_PUBLIC)
- HTTP_REQUEST_ME(unsetPostFiles, ZEND_ACC_PUBLIC)
HTTP_REQUEST_ME(setPutFile, ZEND_ACC_PUBLIC)
HTTP_REQUEST_ME(getPutFile, ZEND_ACC_PUBLIC)
- HTTP_REQUEST_ME(unsetPutFile, ZEND_ACC_PUBLIC)
+
+ HTTP_REQUEST_ME(setPutData, ZEND_ACC_PUBLIC)
+ HTTP_REQUEST_ME(getPutData, ZEND_ACC_PUBLIC)
+ HTTP_REQUEST_ME(addPutData, ZEND_ACC_PUBLIC)
HTTP_REQUEST_ME(send, ZEND_ACC_PUBLIC)
HTTP_REQUEST_ME(getResponseData, ZEND_ACC_PUBLIC)
HTTP_REQUEST_ME(getResponseHeader, ZEND_ACC_PUBLIC)
- HTTP_REQUEST_ME(getResponseCookie, ZEND_ACC_PUBLIC)
+ HTTP_REQUEST_ME(getResponseCookies, ZEND_ACC_PUBLIC)
HTTP_REQUEST_ME(getResponseCode, ZEND_ACC_PUBLIC)
+ HTTP_REQUEST_ME(getResponseStatus, ZEND_ACC_PUBLIC)
HTTP_REQUEST_ME(getResponseBody, ZEND_ACC_PUBLIC)
HTTP_REQUEST_ME(getResponseInfo, ZEND_ACC_PUBLIC)
HTTP_REQUEST_ME(getResponseMessage, ZEND_ACC_PUBLIC)
+ HTTP_REQUEST_ME(getRawResponseMessage, ZEND_ACC_PUBLIC)
HTTP_REQUEST_ME(getRequestMessage, ZEND_ACC_PUBLIC)
+ HTTP_REQUEST_ME(getRawRequestMessage, ZEND_ACC_PUBLIC)
HTTP_REQUEST_ME(getHistory, ZEND_ACC_PUBLIC)
+ HTTP_REQUEST_ME(clearHistory, ZEND_ACC_PUBLIC)
HTTP_REQUEST_ALIAS(get, http_get)
HTTP_REQUEST_ALIAS(head, http_head)
HTTP_REQUEST_ALIAS(methodName, http_request_method_name)
HTTP_REQUEST_ALIAS(methodExists, http_request_method_exists)
- {NULL, NULL, NULL}
+ EMPTY_FUNCTION_ENTRY
};
static zend_object_handlers http_request_object_handlers;
-void _http_request_object_init(INIT_FUNC_ARGS)
+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;
+
+ 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 */
- 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);
+ 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 */
- 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);
+ 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 */
- 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);
+ 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 */
- 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);
- HTTP_LONG_CONSTANT("HTTP_AUTH_NTLM", CURLAUTH_NTLM);
-# endif /* LIBCURL_VERSION_NUM */
+ DCL_CONST(long, "METH_ACL", HTTP_ACL);
+
+ /*
+ * HTTP Protocol Version Constants
+ */
+ 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);
+
+ /*
+ * Proxy Type Constants
+ */
+# if HTTP_CURL_VERSION(7,15,2)
+ DCL_CONST(long, "PROXY_SOCKS4", CURLPROXY_SOCKS4);
+# endif
+ DCL_CONST(long, "PROXY_SOCKS5", CURLPROXY_SOCKS5);
+ DCL_CONST(long, "PROXY_HTTP", CURLPROXY_HTTP);
+#endif /* WONKY */
+
+ return SUCCESS;
}
zend_object_value _http_request_object_new(zend_class_entry *ce TSRMLS_DC)
+{
+ return http_request_object_new_ex(ce, NULL, NULL);
+}
+
+zend_object_value _http_request_object_new_ex(zend_class_entry *ce, CURL *ch, http_request_object **ptr TSRMLS_DC)
{
zend_object_value ov;
http_request_object *o;
o = ecalloc(1, sizeof(http_request_object));
o->zo.ce = ce;
- o->ch = curl_easy_init();
- o->pool = NULL;
-
- phpstr_init(&o->history);
- phpstr_init(&o->request);
- phpstr_init_ex(&o->response, HTTP_CURLBUF_SIZE, 0);
+ o->request = http_request_init_ex(NULL, ch, 0, NULL);
+
+ if (ptr) {
+ *ptr = o;
+ }
ALLOC_HASHTABLE(OBJ_PROP(o));
zend_hash_init(OBJ_PROP(o), 0, NULL, ZVAL_PTR_DTOR, 0);
return ov;
}
-static inline void _http_request_object_declare_default_properties(TSRMLS_D)
+zend_object_value _http_request_object_clone_obj(zval *this_ptr TSRMLS_DC)
{
- zend_class_entry *ce = http_request_object_ce;
-
- DCL_PROP_N(PROTECTED, options);
- DCL_PROP_N(PROTECTED, responseInfo);
- DCL_PROP_N(PROTECTED, responseData);
- 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, putFile, "");
-
- DCL_PROP(PUBLIC, bool, recordHistory, 1);
+ 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);
+ if (old_obj->request->ch) {
+ http_curl_init_ex(curl_easy_duphandle(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);
+ 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;
}
void _http_request_object_free(zend_object *object TSRMLS_DC)
zend_hash_destroy(OBJ_PROP(o));
FREE_HASHTABLE(OBJ_PROP(o));
}
- if (o->ch) {
- /* avoid nasty segfaults with already cleaned up callbacks */
- curl_easy_setopt(o->ch, CURLOPT_NOPROGRESS, 1);
- curl_easy_setopt(o->ch, CURLOPT_PROGRESSFUNCTION, NULL);
- curl_easy_setopt(o->ch, CURLOPT_VERBOSE, 0);
- curl_easy_setopt(o->ch, CURLOPT_DEBUGFUNCTION, NULL);
- curl_easy_cleanup(o->ch);
- }
- phpstr_dtor(&o->response);
- phpstr_dtor(&o->request);
- phpstr_dtor(&o->history);
+ http_request_free(&o->request);
efree(o);
}
-STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_ptr, http_request_body *body TSRMLS_DC)
+#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 *meth, *URL, *qdata, *opts;
- char *request_uri;
- STATUS status;
-
- if (!body) {
- return FAILURE;
- }
- if ((!obj->ch) && (!(obj->ch = curl_easy_init()))) {
- http_error(HE_WARNING, HTTP_E_REQUEST, "Could not initilaize curl");
- return FAILURE;
- }
-
- meth = GET_PROP(obj, method);
- URL = GET_PROP(obj, url);
- qdata = GET_PROP(obj, queryData);
- opts = GET_PROP(obj, options);
-
- // HTTP_URI_MAXLEN+1 long char *
- if (!(request_uri = http_absolute_uri_ex(Z_STRVAL_P(URL), Z_STRLEN_P(URL), NULL, 0, NULL, 0, 0))) {
- return FAILURE;
- }
-
- if (Z_STRLEN_P(qdata) && (strlen(request_uri) < HTTP_URI_MAXLEN)) {
- if (!strchr(request_uri, '?')) {
- strcat(request_uri, "?");
+ zval *ctype = GET_PROP(contentType);
+
+ if (Z_STRLEN_P(ctype)) {
+ zval **headers, *opts = GET_PROP(options);
+
+ if ( (Z_TYPE_P(opts) == IS_ARRAY) &&
+ (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))) {
+ 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 */
+ if ((Z_TYPE_PP(ct_header) != IS_STRING) || !Z_STRLEN_PP(ct_header)) {
+ add_assoc_stringl(*headers, "Content-Type", Z_STRVAL_P(ctype), Z_STRLEN_P(ctype), 1);
+ } else {
+ int i, only_space = 1;
+
+ /* check for spaces only */
+ for (i = 0; i < Z_STRLEN_PP(ct_header); ++i) {
+ if (!isspace(Z_STRVAL_PP(ct_header)[i])) {
+ only_space = 0;
+ break;
+ }
+ }
+ if (only_space) {
+ add_assoc_stringl(*headers, "Content-Type", Z_STRVAL_P(ctype), Z_STRLEN_P(ctype), 1);
+ }
+ }
} else {
- strcat(request_uri, "&");
+ zval *headers;
+
+ MAKE_STD_ZVAL(headers);
+ array_init(headers);
+ add_assoc_stringl(headers, "Content-Type", Z_STRVAL_P(ctype), Z_STRLEN_P(ctype), 1);
+ zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "addheaders", NULL, headers);
+ zval_ptr_dtor(&headers);
}
- strncat(request_uri, Z_STRVAL_P(qdata), HTTP_URI_MAXLEN - strlen(request_uri));
}
+}
- switch (Z_LVAL_P(meth))
+STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_ptr TSRMLS_DC)
+{
+ STATUS status = SUCCESS;
+
+ http_request_reset(obj->request);
+ 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)))
{
case HTTP_GET:
case HTTP_HEAD:
- body->type = -1;
- status = http_request_init(obj->ch, Z_LVAL_P(meth), request_uri, NULL, Z_ARRVAL_P(opts));
break;
case HTTP_PUT:
{
- 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_request_init(obj->ch, HTTP_PUT, request_uri, body, Z_ARRVAL_P(opts));
+ zval *put_data = GET_PROP(putData);
+
+ 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 {
- status = FAILURE;
+ 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);
+
+ if (stream && !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;
+ }
}
}
break;
case HTTP_POST:
+ default:
{
- 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, request_uri, body, Z_ARRVAL_P(opts));
+ /* check for raw post data */
+ zval *raw_data = GET_PROP(rawPostData);
+
+ 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);
+ HashTable *fields;
+ HashTable *files;
+
+ fields = (Z_TYPE_P(zfields) == IS_ARRAY) ? Z_ARRVAL_P(zfields) : NULL;
+ files = (Z_TYPE_P(zfiles) == IS_ARRAY) ? Z_ARRVAL_P(zfiles) : NULL;
+
+ if ((fields && zend_hash_num_elements(fields)) || (files && zend_hash_num_elements(files))) {
+ if (!(obj->request->body = http_request_body_fill(obj->request->body, fields, files))) {
+ status = FAILURE;
+ }
+ }
}
}
break;
+ }
- default:
- {
- 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_init(obj->ch, Z_LVAL_P(meth), request_uri, body, Z_ARRVAL_P(opts));
+ if (status == SUCCESS) {
+ zval *qdata = GET_PROP(queryData);
+ zval *options = GET_PROP(options);
+
+ if (Z_STRLEN_P(qdata)) {
+ if (!strchr(obj->request->url, '?')) {
+ strlcat(obj->request->url, "?", HTTP_URL_MAXLEN);
+ } else {
+ strlcat(obj->request->url, "&", HTTP_URL_MAXLEN);
+ }
+ strlcat(obj->request->url, Z_STRVAL_P(qdata), HTTP_URL_MAXLEN);
+ }
+
+ http_request_prepare(obj->request, Z_ARRVAL_P(options));
+
+ /* check if there's a onProgress method and add it as progress callback if one isn't already set */
+ if (zend_hash_exists(&Z_OBJCE_P(getThis())->function_table, "onprogress", sizeof("onprogress"))) {
+ 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)))) {
+ MAKE_STD_ZVAL(pcb);
+ array_init(pcb);
+ ZVAL_ADDREF(getThis());
+ add_next_index_zval(pcb, getThis());
+ add_next_index_stringl(pcb, "onprogress", lenof("onprogress"), 1);
+ http_request_set_progress_callback(obj->request, pcb);
+ zval_ptr_dtor(&pcb);
+ }
}
- break;
}
- /* clean previous response */
- phpstr_dtor(&obj->response);
- /* clean previous request */
- phpstr_dtor(&obj->request);
-
- efree(request_uri);
return status;
}
STATUS _http_request_object_responsehandler(http_request_object *obj, zval *this_ptr TSRMLS_DC)
{
+ STATUS ret;
+ zval *info;
http_message *msg;
-
- phpstr_fix(&obj->request);
- phpstr_fix(&obj->response);
-
- if (msg = http_message_parse(PHPSTR_VAL(&obj->response), PHPSTR_LEN(&obj->response))) {
+
+ /* always fetch info */
+ MAKE_STD_ZVAL(info);
+ array_init(info);
+ http_request_info(obj->request, Z_ARRVAL_P(info));
+ SET_PROP(responseInfo, info);
+ zval_ptr_dtor(&info);
+
+ /* parse response message */
+ phpstr_fix(&obj->request->conv.request);
+ 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 = GET_PROP(obj, responseData),
- *info = GET_PROP(obj, responseInfo),
- *hist = GET_PROP(obj, recordHistory);
-
- /* should we record history? */
- if (Z_TYPE_P(hist) != IS_BOOL) {
- convert_to_boolean_ex(&hist);
- }
- if (Z_LVAL_P(hist)) {
- /* we need to act like a zipper, as we'll receive
- * the requests and the responses in separate chains
- * for redirects
- */
- http_message *response = msg, *request = http_message_parse(PHPSTR_VAL(&obj->request), PHPSTR_LEN(&obj->request));
- http_message *free_msg = request;
-
- do {
- char *message;
- size_t msglen;
-
- http_message_tostring(response, &message, &msglen);
- phpstr_append(&obj->history, message, msglen);
- efree(message);
-
- http_message_tostring(request, &message, &msglen);
- phpstr_append(&obj->history, message, msglen);
- efree(message);
-
- } while ((response = response->parent) && (request = request->parent));
-
- http_message_free(free_msg);
- phpstr_fix(&obj->history);
+ zval *headers, *message, *resp;
+
+ if (zval_is_true(GET_PROP(recordHistory))) {
+ zval *hist, *history = GET_PROP(history);
+ 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));
+
+ MAKE_STD_ZVAL(hist);
+ ZVAL_OBJVAL(hist, http_message_object_new_ex(http_message_object_ce, http_message_interconnect(response, request), NULL), 0);
+ if (Z_TYPE_P(history) == IS_OBJECT) {
+ http_message_object_prepend(hist, history);
+ }
+ SET_PROP(history, hist);
+ zval_ptr_dtor(&hist);
}
- UPD_PROP(obj, long, responseCode, msg->info.response.code);
+ UPD_PROP(long, responseCode, msg->http.info.response.code);
+ UPD_PROP(string, responseStatus, msg->http.info.response.status);
- MAKE_STD_ZVAL(headers)
+ 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 *));
- phpstr_data(PHPSTR(msg), &body, &body_len);
-
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);
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_OBJVAL(message, http_message_object_new_ex(http_message_object_ce, msg, NULL), 0);
+ SET_PROP(responseMessage, message);
zval_ptr_dtor(&message);
- http_request_info(obj->ch, Z_ARRVAL_P(info));
- SET_PROP(obj, responseInfo, info);
+ ret = SUCCESS;
+ } else {
+ /* update properties with empty values*/
+ zval *resp = GET_PROP(responseData), *znull;
+
+ MAKE_STD_ZVAL(znull);
+ ZVAL_NULL(znull);
+ SET_PROP(responseMessage, znull);
+ 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, "");
+
+ /* append request message to history */
+ if (zval_is_true(GET_PROP(recordHistory))) {
+ 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);
+
+ 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);
+ zval_ptr_dtor(&hist);
+ }
+ }
+
+ ret = FAILURE;
+ }
+
+ if (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);
+ zval_ptr_dtor(¶m);
+ }
+
+ return ret;
+}
- return SUCCESS;
+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);
}
- return FAILURE;
+ return ZEND_HASH_APPLY_KEEP;
}
+#define http_request_object_set_options_subr(key, ow, pk) \
+ _http_request_object_set_options_subr(INTERNAL_FUNCTION_PARAM_PASSTHRU, (key), sizeof(key), (ow), (pk))
+static inline void _http_request_object_set_options_subr(INTERNAL_FUNCTION_PARAMETERS, char *key, size_t len, int overwrite, int prettify_keys)
+{
+ zval *old_opts, *new_opts, *opts = NULL, **entry = NULL;
+
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a/!", &opts)) {
+ RETURN_FALSE;
+ }
+
+ MAKE_STD_ZVAL(new_opts);
+ array_init(new_opts);
+ old_opts = GET_PROP(options);
+ if (Z_TYPE_P(old_opts) == IS_ARRAY) {
+ array_copy(old_opts, 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 (overwrite) {
+ zend_hash_clean(Z_ARRVAL_PP(entry));
+ }
+ if (opts && zend_hash_num_elements(Z_ARRVAL_P(opts))) {
+ if (overwrite) {
+ array_copy(opts, *entry);
+ } else {
+ array_merge(opts, *entry);
+ }
+ }
+ } else if (opts) {
+ ZVAL_ADDREF(opts);
+ add_assoc_zval(new_opts, key, opts);
+ }
+ SET_PROP(options, new_opts);
+ zval_ptr_dtor(&new_opts);
+
+ RETURN_TRUE;
+}
+
+#define http_request_object_get_options_subr(key) \
+ _http_request_get_options_subr(INTERNAL_FUNCTION_PARAM_PASSTHRU, (key), sizeof(key))
+static inline void _http_request_get_options_subr(INTERNAL_FUNCTION_PARAMETERS, char *key, size_t len)
+{
+ NO_ARGS;
+
+ IF_RETVAL_USED {
+ zval *opts, **options;
+
+ opts = GET_PROP(options);
+ array_init(return_value);
+
+ if ( (Z_TYPE_P(opts) == IS_ARRAY) &&
+ (SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), key, len, (void *) &options))) {
+ convert_to_array(*options);
+ array_copy(*options, return_value);
+ }
+ }
+}
+
+
/* ### USERLAND ### */
-/* {{{ proto void HttpRequest::__construct([string url[, long request_method = HTTP_GET]])
+/* {{{ proto void HttpRequest::__construct([string url[, int request_method = HTTP_METH_GET[, array options]]])
*
- * Instantiate a new HttpRequest object which can be used to issue HEAD, GET
- * and POST (including posting files) HTTP requests.
+ * 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.
*/
PHP_METHOD(HttpRequest, __construct)
{
char *URL = NULL;
int URL_len;
long meth = -1;
- getObject(http_request_object, obj);
+ zval *options = NULL;
SET_EH_THROW_HTTP();
- if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sl", &URL, &URL_len, &meth)) {
- INIT_PARR(obj, options);
- INIT_PARR(obj, responseInfo);
- INIT_PARR(obj, responseData);
- INIT_PARR(obj, postFields);
- INIT_PARR(obj, postFiles);
-
+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sla", &URL, &URL_len, &meth, &options)) {
if (URL) {
- UPD_PROP(obj, string, url, URL);
+ UPD_STRL(url, URL, URL_len);
}
if (meth > -1) {
- UPD_PROP(obj, long, method, meth);
+ UPD_PROP(long, method, meth);
+ }
+ if (options) {
+ zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "setoptions", NULL, options);
}
}
SET_EH_NORMAL();
}
/* }}} */
-/* {{{ proto void HttpRequest::__destruct()
- *
- * Destroys the HttpRequest object.
- */
-PHP_METHOD(HttpRequest, __destruct)
-{
- getObject(http_request_object, obj);
-
- NO_ARGS;
-
- FREE_PARR(obj, options);
- FREE_PARR(obj, responseInfo);
- FREE_PARR(obj, responseData);
- FREE_PARR(obj, postFields);
- FREE_PARR(obj, postFiles);
-}
-/* }}} */
-
-/* {{{ proto bool HttpRequest::setOptions(array options)
+/* {{{ 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.
*/
PHP_METHOD(HttpRequest, setOptions)
{
char *key = NULL;
ulong idx = 0;
- zval *opts, *old_opts, **opt;
- getObject(http_request_object, obj);
+ HashPosition pos;
+ zval *opts = NULL, *old_opts, *new_opts, *add_opts, **opt;
- if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/", &opts)) {
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a!/", &opts)) {
RETURN_FALSE;
}
-
- old_opts = GET_PROP(obj, options);
-
+
+ MAKE_STD_ZVAL(new_opts);
+ array_init(new_opts);
+
+ if (!opts || !zend_hash_num_elements(Z_ARRVAL_P(opts))) {
+ SET_PROP(options, new_opts);
+ zval_ptr_dtor(&new_opts);
+ RETURN_TRUE;
+ }
+
+ MAKE_STD_ZVAL(add_opts);
+ array_init(add_opts);
/* some options need extra attention -- thus cannot use array_merge() directly */
- FOREACH_KEYVAL(opts, key, idx, opt) {
+ FOREACH_KEYVAL(pos, opts, key, idx, opt) {
if (key) {
if (!strcmp(key, "headers")) {
- zval **headers;
- if (SUCCESS == zend_hash_find(Z_ARRVAL_P(old_opts), "headers", sizeof("headers"), (void **) &headers)) {
- array_merge(*opt, *headers);
- continue;
- }
+ zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "addheaders", NULL, *opt);
} else if (!strcmp(key, "cookies")) {
- zval **cookies;
- if (SUCCESS == zend_hash_find(Z_ARRVAL_P(old_opts), "cookies", sizeof("cookies"), (void **) &cookies)) {
- array_merge(*opt, *cookies);
- continue;
- }
+ zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "addcookies", NULL, *opt);
} else if (!strcmp(key, "ssl")) {
- zval **ssl;
- if (SUCCESS == zend_hash_find(Z_ARRVAL_P(old_opts), "ssl", sizeof("ssl"), (void **) &ssl)) {
- array_merge(*opt, *ssl);
- continue;
- }
- }else if ((!strcasecmp(key, "url")) || (!strcasecmp(key, "uri"))) {
- if (Z_TYPE_PP(opt) != IS_STRING) {
- convert_to_string_ex(opt);
- }
- UPD_PROP(obj, string, url, Z_STRVAL_PP(opt));
- continue;
+ zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "addssloptions", NULL, *opt);
+ } else if ((!strcasecmp(key, "url")) || (!strcasecmp(key, "uri"))) {
+ zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "seturl", NULL, *opt);
} else if (!strcmp(key, "method")) {
- if (Z_TYPE_PP(opt) != IS_LONG) {
- convert_to_long_ex(opt);
- }
- UPD_PROP(obj, long, method, Z_LVAL_PP(opt));
- continue;
+ zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "setmethod", NULL, *opt);
+ } else {
+ ZVAL_ADDREF(*opt);
+ add_assoc_zval(add_opts, key, *opt);
}
-
- zval_add_ref(opt);
- add_assoc_zval(old_opts, key, *opt);
-
/* reset */
key = NULL;
}
}
-
+
+ old_opts = GET_PROP(options);
+ if (Z_TYPE_P(old_opts) == IS_ARRAY) {
+ array_copy(old_opts, new_opts);
+ }
+ array_merge(add_opts, new_opts);
+ SET_PROP(options, new_opts);
+ zval_ptr_dtor(&new_opts);
+ zval_ptr_dtor(&add_opts);
+
RETURN_TRUE;
}
/* }}} */
/* {{{ proto array HttpRequest::getOptions()
*
- * Get current set options.
+ * Get currently set options.
+ *
+ * Returns an associative array containing currently set options.
*/
PHP_METHOD(HttpRequest, getOptions)
{
NO_ARGS;
IF_RETVAL_USED {
- zval *opts;
- getObject(http_request_object, obj);
-
- opts = GET_PROP(obj, options);
- array_init(return_value);
- array_copy(opts, return_value);
+ RETURN_PROP(options);
}
}
/* }}} */
-/* {{{ proto void HttpRequest::unsetOptions()
+/* {{{ proto bool HttpRequest::setSslOptions([array options])
*
- * Unset all options/headers/cookies.
+ * 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.
*/
-PHP_METHOD(HttpRequest, unsetOptions)
+PHP_METHOD(HttpRequest, setSslOptions)
{
- getObject(http_request_object, obj);
-
- NO_ARGS;
-
- FREE_PARR(obj, options);
- INIT_PARR(obj, options);
+ http_request_object_set_options_subr("ssl", 1, 0);
}
/* }}} */
-/* {{{ proto bool HttpRequest::setSslOptions(array options)
+/* {{{ 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.
*/
-PHP_METHOD(HttpRequest, setSslOptions)
+PHP_METHOD(HttpRequest, addSslOptions)
{
- zval *opts, *old_opts, **ssl_options;
- getObject(http_request_object, obj);
-
- if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/", &opts)) {
- RETURN_FALSE;
- }
-
- old_opts = GET_PROP(obj, options);
-
- if (SUCCESS == zend_hash_find(Z_ARRVAL_P(old_opts), "ssl", sizeof("ssl"), (void **) &ssl_options)) {
- array_merge(opts, *ssl_options);
- } else {
- zval_add_ref(&opts);
- add_assoc_zval(old_opts, "ssl", opts);
- }
-
- RETURN_TRUE;
+ http_request_object_set_options_subr("ssl", 0, 0);
}
/* }}} */
/* {{{ proto array HttpRequest::getSslOtpions()
*
* Get previously set SSL options.
+ *
+ * Returns an associative array containing any previously set SSL options.
*/
PHP_METHOD(HttpRequest, getSslOptions)
{
- NO_ARGS;
-
- IF_RETVAL_USED {
- zval *opts, **ssl_options;
- getObject(http_request_object, obj);
-
- opts = GET_PROP(obj, options);
-
- array_init(return_value);
-
- if (SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), "ssl", sizeof("ssl"), (void **) &ssl_options)) {
- array_copy(*ssl_options, return_value);
- }
- }
+ http_request_object_get_options_subr("ssl");
}
/* }}} */
-/* {{{ proto void HttpRequest::unsetSslOptions()
+/* {{{ proto bool HttpRequest::addHeaders(array headers)
*
- * Unset previously set SSL options.
+ * 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.
*/
-PHP_METHOD(HttpRequest, unsetSslOptions)
+PHP_METHOD(HttpRequest, addHeaders)
{
- zval *opts;
- getObject(http_request_object, obj);
-
- NO_ARGS;
-
- opts = GET_PROP(obj, options);
- zend_hash_del(Z_ARRVAL_P(opts), "ssl", sizeof("ssl"));
+ http_request_object_set_options_subr("headers", 0, 1);
}
-/* }}} */
-/* {{{ proto bool HttpRequest::addHeaders(array headers)
+/* {{{ proto bool HttpRequest::setHeaders([array headers])
*
- * Add request header name/value pairs.
+ * 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.
*/
-PHP_METHOD(HttpRequest, addHeaders)
+PHP_METHOD(HttpRequest, setHeaders)
{
- zval *opts, **headers, *new_headers;
- getObject(http_request_object, obj);
-
- if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/", &new_headers)) {
- RETURN_FALSE;
- }
-
- opts = GET_PROP(obj, options);
-
- if (SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), "headers", sizeof("headers"), (void **) &headers)) {
- array_merge(new_headers, *headers);
- } else {
- zval_add_ref(&new_headers);
- add_assoc_zval(opts, "headers", new_headers);
- }
-
- RETURN_TRUE;
+ http_request_object_set_options_subr("headers", 1, 1);
}
/* }}} */
/* {{{ proto array HttpRequest::getHeaders()
*
* Get previously set request headers.
+ *
+ * Returns an associative array containing all currently set headers.
*/
PHP_METHOD(HttpRequest, getHeaders)
{
- NO_ARGS;
-
- IF_RETVAL_USED {
- zval *opts, **headers;
- getObject(http_request_object, obj);
-
- opts = GET_PROP(obj, options);
-
- array_init(return_value);
-
- if (SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), "headers", sizeof("headers"), (void **) &headers)) {
- array_copy(*headers, return_value);
- }
- }
+ http_request_object_get_options_subr("headers");
}
/* }}} */
-/* {{{ proto void HttpRequest::unsetHeaders()
+/* {{{ proto bool HttpRequest::setCookies([array cookies])
*
- * Unset previously set request headers.
+ * 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.
*/
-PHP_METHOD(HttpRequest, unsetHeaders)
+PHP_METHOD(HttpRequest, setCookies)
{
- zval *opts;
- getObject(http_request_object, obj);
-
- NO_ARGS;
-
- opts = GET_PROP(obj, options);
- zend_hash_del(Z_ARRVAL_P(opts), "headers", sizeof("headers"));
+ http_request_object_set_options_subr("cookies", 1, 0);
}
/* }}} */
/* {{{ 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.
*/
PHP_METHOD(HttpRequest, addCookies)
{
- zval *opts, **cookies, *new_cookies;
- getObject(http_request_object, obj);
-
- if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/", &new_cookies)) {
- RETURN_FALSE;
- }
-
- opts = GET_PROP(obj, options);
-
- if (SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), "cookies", sizeof("cookies"), (void **) &cookies)) {
- array_merge(new_cookies, *cookies);
- } else {
- zval_add_ref(&new_cookies);
- add_assoc_zval(opts, "cookies", new_cookies);
- }
-
- RETURN_TRUE;
+ http_request_object_set_options_subr("cookies", 0, 0);
}
/* }}} */
/* {{{ proto array HttpRequest::getCookies()
*
* Get previously set cookies.
+ *
+ * Returns an associative array containing any previously set cookies.
*/
PHP_METHOD(HttpRequest, getCookies)
{
- NO_ARGS;
-
- IF_RETVAL_USED {
- zval *opts, **cookies;
- getObject(http_request_object, obj);
-
- opts = GET_PROP(obj, options);
-
- array_init(return_value);
-
- if (SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), "cookies", sizeof("cookies"), (void **) &cookies)) {
- array_copy(*cookies, return_value);
- }
- }
-}
-/* }}} */
-
-/* {{{ proto void HttpRequest::unsetCookies()
- *
- */
-PHP_METHOD(HttpRequest, unsetCookies)
-{
- zval *opts;
- getObject(http_request_object, obj);
-
- NO_ARGS;
-
- opts = GET_PROP(obj, options);
- zend_hash_del(Z_ARRVAL_P(opts), "cookies", sizeof("cookies"));
+ http_request_object_get_options_subr("cookies");
}
/* }}} */
/* {{{ 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.
*/
PHP_METHOD(HttpRequest, setUrl)
{
char *URL = NULL;
int URL_len;
- getObject(http_request_object, obj);
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &URL, &URL_len)) {
RETURN_FALSE;
}
- UPD_PROP(obj, string, url, URL);
+ UPD_STRL(url, URL, URL_len);
RETURN_TRUE;
}
/* }}} */
/* {{{ proto string HttpRequest::getUrl()
*
* Get the previously set request URL.
+ *
+ * Returns the currently set request url as string.
*/
PHP_METHOD(HttpRequest, getUrl)
{
NO_ARGS;
IF_RETVAL_USED {
- zval *URL;
- getObject(http_request_object, obj);
-
- URL = GET_PROP(obj, url);
- RETURN_STRINGL(Z_STRVAL_P(URL), Z_STRLEN_P(URL), 1);
+ RETURN_PROP(url);
}
}
/* }}} */
-/* {{{ proto bool HttpRequest::setMethod(long request_method)
+/* {{{ proto bool HttpRequest::setMethod(int request_method)
*
- * Set the request methods; one of the <tt>HTTP_HEAD</tt>, <tt>HTTP_GET</tt> or
- * <tt>HTTP_POST</tt> constants.
+ * 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.
*/
PHP_METHOD(HttpRequest, setMethod)
{
long meth;
- getObject(http_request_object, obj);
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &meth)) {
RETURN_FALSE;
}
- UPD_PROP(obj, long, method, meth);
+ UPD_PROP(long, method, meth);
RETURN_TRUE;
}
/* }}} */
-/* {{{ proto long HttpRequest::getMethod()
+/* {{{ proto int HttpRequest::getMethod()
*
* Get the previously set request method.
+ *
+ * Returns the currently set request method.
*/
PHP_METHOD(HttpRequest, getMethod)
{
NO_ARGS;
IF_RETVAL_USED {
- zval *meth;
- getObject(http_request_object, obj);
-
- meth = GET_PROP(obj, method);
- RETURN_LONG(Z_LVAL_P(meth));
+ RETURN_PROP(method);
}
}
/* }}} */
/* {{{ proto bool HttpRequest::setContentType(string content_type)
*
* Set the content type the post request should have.
- * Use this only if you know what you're doing.
+ *
+ * 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.
*/
PHP_METHOD(HttpRequest, setContentType)
{
char *ctype;
int ct_len;
- getObject(http_request_object, obj);
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &ctype, &ct_len)) {
RETURN_FALSE;
}
- if (!strchr(ctype, '/')) {
- http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Content-Type '%s' doesn't seem to contain a primary and a secondary part", ctype);
- RETURN_FALSE;
+ if (ct_len) {
+ HTTP_CHECK_CONTENT_TYPE(ctype, RETURN_FALSE);
}
-
- UPD_PROP(obj, string, contentType, ctype);
+ UPD_STRL(contentType, ctype, ct_len);
RETURN_TRUE;
}
/* }}} */
/* {{{ proto string HttpRequest::getContentType()
*
* Get the previously content type.
+ *
+ * Returns the previously set content type as string.
*/
PHP_METHOD(HttpRequest, getContentType)
{
NO_ARGS;
IF_RETVAL_USED {
- zval *ctype;
- getObject(http_request_object, obj);
-
- ctype = GET_PROP(obj, contentType);
- RETURN_STRINGL(Z_STRVAL_P(ctype), Z_STRLEN_P(ctype), 1);
+ RETURN_PROP(contentType);
}
}
/* }}} */
-/* {{{ proto bool HttpRequest::setQueryData(mixed query_data)
+/* {{{ proto bool HttpRequest::setQueryData([mixed query_data])
*
- * Set the URL query parameters to use.
- * Overwrites previously set query parameters.
+ * 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.
*/
PHP_METHOD(HttpRequest, setQueryData)
{
- zval *qdata;
- char *query_data = NULL;
- getObject(http_request_object, obj);
+ zval *qdata = NULL;
- if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &qdata)) {
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z!", &qdata)) {
RETURN_FALSE;
}
- if ((Z_TYPE_P(qdata) == IS_ARRAY) || (Z_TYPE_P(qdata) == IS_OBJECT)) {
+ if ((!qdata) || Z_TYPE_P(qdata) == IS_NULL) {
+ UPD_STRL(queryData, "", 0);
+ } else if ((Z_TYPE_P(qdata) == IS_ARRAY) || (Z_TYPE_P(qdata) == IS_OBJECT)) {
+ char *query_data = NULL;
+
if (SUCCESS != http_urlencode_hash(HASH_OF(qdata), &query_data)) {
RETURN_FALSE;
}
- UPD_PROP(obj, string, queryData, query_data);
+
+ UPD_PROP(string, queryData, query_data);
efree(query_data);
- RETURN_TRUE;
+ } else {
+ zval *orig = qdata;
+
+ convert_to_string_ex(&qdata);
+ UPD_STRL(queryData, Z_STRVAL_P(qdata), Z_STRLEN_P(qdata));
+ if (orig != qdata) {
+ zval_ptr_dtor(&qdata);
+ }
}
-
- convert_to_string(qdata);
- UPD_PROP(obj, string, queryData, Z_STRVAL_P(qdata));
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.
*/
PHP_METHOD(HttpRequest, getQueryData)
{
NO_ARGS;
IF_RETVAL_USED {
- zval *qdata;
- getObject(http_request_object, obj);
-
- qdata = GET_PROP(obj, queryData);
- RETURN_STRINGL(Z_STRVAL_P(qdata), Z_STRLEN_P(qdata), 1);
+ RETURN_PROP(queryData);
}
}
/* }}} */
/* {{{ proto bool HttpRequest::addQueryData(array query_params)
*
- * Add parameters to the query parameter list.
+ * 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.
*/
PHP_METHOD(HttpRequest, addQueryData)
{
zval *qdata, *old_qdata;
char *query_data = NULL;
- getObject(http_request_object, obj);
+ size_t query_data_len = 0;
- if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a", &qdata)) {
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/", &qdata)) {
RETURN_FALSE;
}
- old_qdata = GET_PROP(obj, queryData);
+ old_qdata = GET_PROP(queryData);
- if (SUCCESS != http_urlencode_hash_ex(HASH_OF(qdata), 1, Z_STRVAL_P(old_qdata), Z_STRLEN_P(old_qdata), &query_data, NULL)) {
+ 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_PROP(obj, string, queryData, query_data);
+ UPD_STRL(queryData, query_data, query_data_len);
efree(query_data);
RETURN_TRUE;
}
/* }}} */
-/* {{{ proto void HttpRequest::unsetQueryData()
- *
- * Clean the query parameters.
- * Affects any request type.
- */
-PHP_METHOD(HttpRequest, unsetQueryData)
-{
- getObject(http_request_object, obj);
-
- NO_ARGS;
-
- UPD_PROP(obj, string, queryData, "");
-}
-/* }}} */
-
/* {{{ proto bool HttpRequest::addPostFields(array post_data)
*
- * Adds POST data entries.
- * Affects only POST requests.
+ * 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.
*/
PHP_METHOD(HttpRequest, addPostFields)
{
- zval *post, *post_data;
- getObject(http_request_object, obj);
+ zval *post_data, *old_post, *new_post;
- if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a", &post_data)) {
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/", &post_data)) {
RETURN_FALSE;
}
- post = GET_PROP(obj, postFields);
- array_merge(post_data, post);
-
+ if (zend_hash_num_elements(Z_ARRVAL_P(post_data))) {
+ MAKE_STD_ZVAL(new_post);
+ array_init(new_post);
+ old_post = GET_PROP(postFields);
+ if (Z_TYPE_P(old_post) == IS_ARRAY) {
+ array_copy(old_post, new_post);
+ }
+ array_merge(post_data, new_post);
+ SET_PROP(postFields, new_post);
+ zval_ptr_dtor(&new_post);
+ }
+
RETURN_TRUE;
}
/* }}} */
-/* {{{ proto bool HttpRequest::setPostFields(array post_data)
+/* {{{ proto bool HttpRequest::setPostFields([array post_data])
*
- * Set the POST data entries.
- * Overwrites previously set POST data.
- * Affects only POST requests.
+ * 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.
*/
PHP_METHOD(HttpRequest, setPostFields)
{
- zval *post, *post_data;
- getObject(http_request_object, obj);
+ zval *post, *post_data = NULL;
- if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a", &post_data)) {
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/!", &post_data)) {
RETURN_FALSE;
}
- post = GET_PROP(obj, postFields);
- zend_hash_clean(Z_ARRVAL_P(post));
- array_copy(post_data, post);
+ MAKE_STD_ZVAL(post);
+ array_init(post);
+ if (post_data && zend_hash_num_elements(Z_ARRVAL_P(post_data))) {
+ array_copy(post_data, post);
+ }
+ SET_PROP(postFields, post);
+ zval_ptr_dtor(&post);
RETURN_TRUE;
}
/* {{{ proto array HttpRequest::getPostFields()
*
* Get previously set POST data.
+ *
+ * Returns the currently set post fields as associative array.
*/
PHP_METHOD(HttpRequest, getPostFields)
{
NO_ARGS;
IF_RETVAL_USED {
- zval *post_data;
- getObject(http_request_object, obj);
+ RETURN_PROP(postFields);
+ }
+}
+/* }}} */
- post_data = GET_PROP(obj, postFields);
- array_init(return_value);
- array_copy(post_data, return_value);
+/* {{{ 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)
+{
+ char *raw_data = NULL;
+ int data_len = 0;
+
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &raw_data, &data_len)) {
+ RETURN_FALSE;
}
+
+ if (!raw_data) {
+ raw_data = "";
+ }
+
+ UPD_STRL(rawPostData, raw_data, data_len);
+ RETURN_TRUE;
}
/* }}} */
-/* {{{ proto void HttpRequest::unsetPostFields()
+/* {{{ proto bool HttpRequest::addRawPostData(string raw_post_data)
*
- * Clean POST data entires.
- * Affects only POST requests.
+ * 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, unsetPostFields)
+PHP_METHOD(HttpRequest, addRawPostData)
{
- zval *post_data;
- getObject(http_request_object, obj);
+ char *raw_data;
+ int data_len;
+
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &raw_data, &data_len)) {
+ RETURN_FALSE;
+ }
+
+ if (data_len) {
+ zval *data = GET_PROP(rawPostData);
+
+ 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);
+ }
+ }
+
+ RETURN_TRUE;
+}
+/* }}} */
+/* {{{ proto string HttpRequest::getRawPostData()
+ *
+ * Get previously set raw post data.
+ *
+ * Returns a string containing the currently set raw post data.
+ */
+PHP_METHOD(HttpRequest, getRawPostData)
+{
NO_ARGS;
-
- post_data = GET_PROP(obj, postFields);
- zend_hash_clean(Z_ARRVAL_P(post_data));
+
+ IF_RETVAL_USED {
+ RETURN_PROP(rawPostData);
+ }
}
/* }}} */
/* {{{ proto bool HttpRequest::addPostFile(string name, string file[, string content_type = "application/x-octetstream"])
*
- * Add a file to the POST request.
- * Affects only POST requests.
+ * 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.
*/
PHP_METHOD(HttpRequest, addPostFile)
{
- zval *files, *entry;
+ zval *entry, *old_post, *new_post;
char *name, *file, *type = NULL;
int name_len, file_len, type_len = 0;
- getObject(http_request_object, obj);
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|s", &name, &name_len, &file, &file_len, &type, &type_len)) {
RETURN_FALSE;
}
if (type_len) {
- if (!strchr(type, '/')) {
- http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Content-Type '%s' doesn't seem to contain a primary and a secondary part", type);
- RETURN_FALSE;
- }
+ HTTP_CHECK_CONTENT_TYPE(type, RETURN_FALSE);
} else {
type = "application/x-octetstream";
type_len = sizeof("application/x-octetstream") - 1;
add_assoc_stringl(entry, "type", type, type_len, 1);
add_assoc_stringl(entry, "file", file, file_len, 1);
- files = GET_PROP(obj, postFiles);
- add_next_index_zval(files, entry);
+ MAKE_STD_ZVAL(new_post);
+ array_init(new_post);
+ old_post = GET_PROP(postFiles);
+ if (Z_TYPE_P(old_post) == IS_ARRAY) {
+ array_copy(old_post, new_post);
+ }
+ add_next_index_zval(new_post, entry);
+ SET_PROP(postFiles, new_post);
+ zval_ptr_dtor(&new_post);
RETURN_TRUE;
}
/* }}} */
-/* {{{ proto bool HttpRequest::setPostFiles(array post_files)
+/* {{{ proto bool HttpRequest::setPostFiles([array post_files])
*
- * Set files to post.
- * Overwrites previously set post files.
- * Affects only POST requests.
+ * 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.
*/
PHP_METHOD(HttpRequest, setPostFiles)
{
- zval *files, *pFiles;
- getObject(http_request_object, obj);
+ zval *files = NULL, *post;
- if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a", &files)) {
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a!/", &files)) {
RETURN_FALSE;
}
- pFiles = GET_PROP(obj, postFiles);
- zend_hash_clean(Z_ARRVAL_P(pFiles));
- array_copy(files, pFiles);
+ MAKE_STD_ZVAL(post);
+ array_init(post);
+ if (files && (Z_TYPE_P(files) == IS_ARRAY)) {
+ array_copy(files, post);
+ }
+ SET_PROP(postFiles, post);
+ zval_ptr_dtor(&post);
RETURN_TRUE;
}
/* {{{ proto array HttpRequest::getPostFiles()
*
* Get all previously added POST files.
+ *
+ * Returns an array containing currently set post files.
*/
PHP_METHOD(HttpRequest, getPostFiles)
{
NO_ARGS;
IF_RETVAL_USED {
- zval *files;
- getObject(http_request_object, obj);
-
- files = GET_PROP(obj, postFiles);
-
- array_init(return_value);
- array_copy(files, return_value);
+ RETURN_PROP(postFiles);
}
}
/* }}} */
-/* {{{ proto void HttpRequest::unsetPostFiles()
- *
- * Unset the POST files list.
- * Affects only POST requests.
- */
-PHP_METHOD(HttpRequest, unsetPostFiles)
-{
- zval *files;
- getObject(http_request_object, obj);
-
- NO_ARGS;
-
- files = GET_PROP(obj, postFiles);
- zend_hash_clean(Z_ARRVAL_P(files));
-}
-/* }}} */
-
-/* {{{ proto bool HttpRequest::SetPutFile(string file)
+/* {{{ proto bool HttpRequest::setPutFile([string file])
*
- * Set file to put.
- * Affects only PUT requests.
+ * 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.
*/
PHP_METHOD(HttpRequest, setPutFile)
{
- char *file;
- int file_len;
- getObject(http_request_object, obj);
+ char *file = "";
+ int file_len = 0;
- if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &file, &file_len)) {
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &file, &file_len)) {
RETURN_FALSE;
}
- UPD_PROP(obj, string, putFile, file);
+ UPD_STRL(putFile, file, file_len);
RETURN_TRUE;
}
/* }}} */
/* {{{ proto string HttpRequest::getPutFile()
*
* Get previously set put file.
+ *
+ * Returns a string containing the path to the currently set put file.
*/
PHP_METHOD(HttpRequest, getPutFile)
{
NO_ARGS;
IF_RETVAL_USED {
- zval *putfile;
- getObject(http_request_object, obj);
+ RETURN_PROP(putFile);
+ }
+}
+/* }}} */
- putfile = GET_PROP(obj, putFile);
- RETVAL_STRINGL(Z_STRVAL_P(putfile), Z_STRLEN_P(putfile), 1);
+/* {{{ 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.
+ */
+PHP_METHOD(HttpRequest, setPutData)
+{
+ char *put_data = NULL;
+ int data_len = 0;
+
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &put_data, &data_len)) {
+ RETURN_FALSE;
+ }
+
+ if (!put_data) {
+ put_data = "";
}
+
+ UPD_STRL(putData, put_data, data_len);
+ RETURN_TRUE;
}
/* }}} */
-/* {{{ proto void HttpRequest::unsetPutFile()
+/* {{{ proto bool HttpRequest::addPutData(string put_data)
*
- * Unset file to put.
+ * 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.
*/
-PHP_METHOD(HttpRequest, unsetPutFile)
+PHP_METHOD(HttpRequest, addPutData)
{
- getObject(http_request_object, obj);
+ char *put_data;
+ int data_len;
+
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &put_data, &data_len)) {
+ RETURN_FALSE;
+ }
+
+ if (data_len) {
+ zval *data = GET_PROP(putData);
+
+ 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);
+ }
+ }
+
+ RETURN_TRUE;
+}
+/* }}} */
+/* {{{ proto string HttpRequest::getPutData()
+ *
+ * Get previously set PUT data.
+ *
+ * Returns a string containing the currently set raw post data.
+ */
+PHP_METHOD(HttpRequest, getPutData)
+{
NO_ARGS;
-
- UPD_PROP(obj, string, putFile, "");
+
+ IF_RETVAL_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.
*/
PHP_METHOD(HttpRequest, getResponseData)
{
NO_ARGS;
IF_RETVAL_USED {
- zval *data;
- getObject(http_request_object, obj);
-
- data = GET_PROP(obj, responseData);
- array_init(return_value);
- array_copy(data, return_value);
+ RETURN_PROP(responseData);
}
}
/* }}} */
/* {{{ 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.
*/
PHP_METHOD(HttpRequest, getResponseHeader)
{
zval *data, **headers, **header;
char *header_name = NULL;
int header_len = 0;
- getObject(http_request_object, obj);
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &header_name, &header_len)) {
RETURN_FALSE;
}
- data = GET_PROP(obj, responseData);
- if (SUCCESS != zend_hash_find(Z_ARRVAL_P(data), "headers", sizeof("headers"), (void **) &headers)) {
- RETURN_FALSE;
- }
-
- if (!header_len || !header_name) {
- array_init(return_value);
- array_copy(*headers, return_value);
- } else if (SUCCESS == zend_hash_find(Z_ARRVAL_PP(headers), pretty_key(header_name, header_len, 1, 1), header_len + 1, (void **) &header)) {
- RETURN_STRINGL(Z_STRVAL_PP(header), Z_STRLEN_PP(header), 1);
+ 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;
+ }
} else {
- RETURN_FALSE;
+ RETVAL_FALSE;
}
}
}
/* }}} */
-/* {{{ proto array HttpRequest::getResponseCookie([string name])
+/* {{{ 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.
*/
-PHP_METHOD(HttpRequest, getResponseCookie)
+PHP_METHOD(HttpRequest, getResponseCookies)
{
IF_RETVAL_USED {
- zval *data, **headers;
- char *cookie_name = NULL;
- int cookie_len = 0;
- getObject(http_request_object, obj);
+ long flags = 0;
+ zval *allowed_extras_array = NULL, *data, **headers;
- if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &cookie_name, &cookie_len)) {
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|la", &flags, &allowed_extras_array)) {
RETURN_FALSE;
}
- array_init(return_value);
-
- data = GET_PROP(obj, responseData);
- if (SUCCESS == zend_hash_find(Z_ARRVAL_P(data), "headers", sizeof("headers"), (void **) &headers)) {
+ 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)) {
+ int i = 0;
ulong idx = 0;
- char *key = NULL;
- zval **header = NULL;
+ char *key = NULL, **allowed_extras = NULL;
+ zval **header = NULL, **entry = NULL;
+ HashPosition pos, pos1, pos2;
+
+ array_init(return_value);
- FOREACH_HASH_KEYVAL(Z_ARRVAL_PP(headers), key, idx, header) {
+ 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);
+ }
+ }
+
+ FOREACH_HASH_KEYVAL(pos1, Z_ARRVAL_PP(headers), key, idx, header) {
if (key && !strcasecmp(key, "Set-Cookie")) {
- /* several cookies? */
+ http_cookie_list list;
+
if (Z_TYPE_PP(header) == IS_ARRAY) {
- zval **cookie;
-
- FOREACH_HASH_VAL(Z_ARRVAL_PP(header), cookie) {
- zval *cookie_hash;
- MAKE_STD_ZVAL(cookie_hash);
- array_init(cookie_hash);
-
- if (SUCCESS == http_parse_cookie(Z_STRVAL_PP(cookie), Z_ARRVAL_P(cookie_hash))) {
- if (!cookie_len) {
- add_next_index_zval(return_value, cookie_hash);
- } else {
- zval **name;
-
- if ( (SUCCESS == zend_hash_find(Z_ARRVAL_P(cookie_hash), "name", sizeof("name"), (void **) &name)) &&
- (!strcmp(Z_STRVAL_PP(name), cookie_name))) {
- add_next_index_zval(return_value, cookie_hash);
- return; /* <<< FOUND >>> */
- } else {
- zval_dtor(cookie_hash);
- efree(cookie_hash);
- }
- }
- } else {
- zval_dtor(cookie_hash);
- efree(cookie_hash);
+ zval **single_header;
+
+ 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)) {
+ 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(single_header);
}
} else {
- zval *cookie_hash;
- MAKE_STD_ZVAL(cookie_hash);
- array_init(cookie_hash);
-
- if (SUCCESS == http_parse_cookie(Z_STRVAL_PP(header), Z_ARRVAL_P(cookie_hash))) {
- if (!cookie_len) {
- add_next_index_zval(return_value, cookie_hash);
- } else {
- zval **name;
-
- if ( (SUCCESS == zend_hash_find(Z_ARRVAL_P(cookie_hash), "name", sizeof("name"), (void **) &name)) &&
- (!strcmp(Z_STRVAL_PP(name), cookie_name))) {
- add_next_index_zval(return_value, cookie_hash);
- } else {
- zval_dtor(cookie_hash);
- efree(cookie_hash);
- }
- }
- } else {
- zval_dtor(cookie_hash);
- efree(cookie_hash);
+ 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(header);
}
- break;
}
/* reset key */
key = NULL;
}
+
+ if (allowed_extras) {
+ for (i = 0; allowed_extras[i]; ++i) {
+ efree(allowed_extras[i]);
+ }
+ efree(allowed_extras);
+ }
+ } else {
+ 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.
*/
PHP_METHOD(HttpRequest, getResponseBody)
{
NO_ARGS;
IF_RETVAL_USED {
- zval *data, **body;
- getObject(http_request_object, obj);
-
- data = GET_PROP(obj, responseData);
- if (SUCCESS == zend_hash_find(Z_ARRVAL_P(data), "body", sizeof("body"), (void **) &body)) {
- RETURN_STRINGL(Z_STRVAL_PP(body), Z_STRLEN_PP(body), 1);
+ zval **body;
+ zval *data = GET_PROP(responseData);
+
+ 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);
} else {
RETURN_FALSE;
}
/* {{{ 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.
*/
PHP_METHOD(HttpRequest, getResponseCode)
{
NO_ARGS;
IF_RETVAL_USED {
- zval *code;
- getObject(http_request_object, obj);
+ RETURN_PROP(responseCode);
+ }
+}
+/* }}} */
- code = GET_PROP(obj, responseCode);
- RETURN_LONG(Z_LVAL_P(code));
+/* {{{ 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.
+ */
+PHP_METHOD(HttpRequest, getResponseStatus)
+{
+ NO_ARGS;
+
+ IF_RETVAL_USED {
+ RETURN_PROP(responseStatus);
}
}
/* }}} */
-/* {{{ proto array HttpRequest::getResponseInfo([string name])
+/* {{{ 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.
*/
PHP_METHOD(HttpRequest, getResponseInfo)
{
zval *info, **infop;
char *info_name = NULL;
int info_len = 0;
- getObject(http_request_object, obj);
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &info_name, &info_len)) {
RETURN_FALSE;
}
- info = GET_PROP(obj, responseInfo);
+ info = GET_PROP(responseInfo);
+
+ 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)) {
- RETURN_ZVAL(*infop, 1, ZVAL_PTR_DTOR);
+ 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);
RETURN_FALSE;
}
} else {
- array_init(return_value);
- array_copy(info, return_value);
+ RETURN_ZVAL(info, 1, 0);
}
}
}
/* {{{ proto HttpMessage HttpRequest::getResponseMessage()
*
- * Get the full response as HttpMessage object.
+ * 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, HttpRuntimeException.
*/
PHP_METHOD(HttpRequest, getResponseMessage)
{
- NO_ARGS;
-
- IF_RETVAL_USED {
+ NO_ARGS {
zval *message;
- getObject(http_request_object, obj);
SET_EH_THROW_HTTP();
- message = GET_PROP(obj, responseMessage);
+ message = GET_PROP(responseMessage);
if (Z_TYPE_P(message) == IS_OBJECT) {
- RETVAL_OBJECT(message);
+ RETVAL_OBJECT(message, 1);
} else {
- RETVAL_NULL();
+ http_error(HE_WARNING, HTTP_E_RUNTIME, "HttpRequest does not contain a response message");
}
SET_EH_NORMAL();
}
/* {{{ 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.
*/
PHP_METHOD(HttpRequest, getRequestMessage)
{
getObject(http_request_object, obj);
SET_EH_THROW_HTTP();
- if (msg = http_message_parse(PHPSTR_VAL(&obj->request), PHPSTR_LEN(&obj->request))) {
- RETVAL_OBJVAL(http_message_object_from_msg(msg));
+ if ((msg = http_message_parse(PHPSTR_VAL(&obj->request->conv.request), PHPSTR_LEN(&obj->request->conv.request)))) {
+ RETVAL_OBJVAL(http_message_object_new_ex(http_message_object_ce, msg, NULL), 0);
}
SET_EH_NORMAL();
}
}
/* }}} */
-PHP_METHOD(HttpRequest, getHistory)
+/* {{{ proto string HttpRequest::getRawRequestMessage()
+ *
+ * Get sent HTTP message.
+ *
+ * Returns an HttpMessage in a form of a string
+ */
+PHP_METHOD(HttpRequest, getRawRequestMessage)
{
NO_ARGS;
IF_RETVAL_USED {
- http_message *msg;
getObject(http_request_object, obj);
+ RETURN_PHPSTR_DUP(&obj->request->conv.request);
+ }
+}
+/* }}} */
+
+/* {{{ proto string HttpRequest::getRawResponseMessage()
+ *
+ * Get the entire HTTP response.
+ *
+ * Returns the complete web server response, including the headers in a form of a string.
+ */
+PHP_METHOD(HttpRequest, getRawResponseMessage)
+{
+ NO_ARGS;
+
+ IF_RETVAL_USED {
+ getObject(http_request_object, obj);
+
+ RETURN_PHPSTR_DUP(&obj->request->conv.response);
+ }
+}
+/* }}} */
+
+/* {{{ 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.
+ */
+PHP_METHOD(HttpRequest, getHistory)
+{
+ NO_ARGS;
+
+ IF_RETVAL_USED {
+ zval *hist;
+
SET_EH_THROW_HTTP();
- if (msg = http_message_parse(PHPSTR_VAL(&obj->history), PHPSTR_LEN(&obj->history))) {
- RETVAL_OBJVAL(http_message_object_from_msg(msg));
+ hist = GET_PROP(history);
+ if (Z_TYPE_P(hist) == IS_OBJECT) {
+ RETVAL_OBJECT(hist, 1);
+ } else {
+ http_error(HE_WARNING, HTTP_E_RUNTIME, "The history is empty");
}
SET_EH_NORMAL();
}
}
+/* }}} */
+
+/* {{{ proto void HttpRequest::clearHistory()
+ *
+ * Clear the history.
+ */
+PHP_METHOD(HttpRequest, clearHistory)
+{
+ NO_ARGS {
+ zval *hist;
+
+ MAKE_STD_ZVAL(hist);
+ ZVAL_NULL(hist);
+ SET_PROP(history, hist);
+ zval_ptr_dtor(&hist);
+ }
+}
+/* }}} */
-/* {{{ proto bool HttpRequest::send()
+/* {{{ 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:
* <pre>
* <?php
- * $r = new HttpRequest('http://example.com/feed.rss', HTTP_GET);
+ * $r = new HttpRequest('http://example.com/feed.rss', HttpRequest::METH_GET);
* $r->setOptions(array('lastmodified' => filemtime('local.rss')));
* $r->addQueryData(array('category' => 3));
* try {
* POST example:
* <pre>
* <?php
- * $r = new HttpRequest('http://example.com/form.php', HTTP_POST);
+ * $r = new HttpRequest('http://example.com/form.php', HttpRequest::METH_POST);
* $r->setOptions(array('cookies' => array('lang' => 'de')));
- * $r->addpostFields(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();
+ * try {
+ * echo $r->send()->getBody();
+ * } catch (HttpException $ex) {
+ * echo $ex;
* }
* ?>
* </pre>
*/
PHP_METHOD(HttpRequest, send)
{
- STATUS status = FAILURE;
- http_request_body body = {0, NULL, 0};
getObject(http_request_object, obj);
NO_ARGS;
SET_EH_THROW_HTTP();
+ RETVAL_FALSE;
+
if (obj->pool) {
http_error(HE_WARNING, HTTP_E_RUNTIME, "Cannot perform HttpRequest::send() while attached to an HttpRequestPool");
- SET_EH_NORMAL();
- RETURN_FALSE;
- }
-
- if (SUCCESS == (status = http_request_object_requesthandler(obj, getThis(), &body))) {
- status = http_request_exec(obj->ch, NULL, &obj->response, &obj->request);
- }
- http_request_body_dtor(&body);
-
- /* final data handling */
- if (SUCCESS == status) {
- status = http_request_object_responsehandler(obj, getThis());
+ } 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);
+ }
}
SET_EH_NORMAL();
- RETURN_SUCCESS(status);
}
/* }}} */
projects / m6w6 / ext-http / blobdiff