X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=http_request_object.c;h=c3efaa904fe9282d2d3072ff18559974fe900e5f;hb=13d7acf7fe8b82162815e2047c9aedc9a149a3ae;hp=7b1d82bec99ac92b1c4d3a909bea9d8f87a041af;hpb=dd579c42c06ebfe26ea2ff8ee6106a22d27e3340;p=m6w6%2Fext-http

diff --git a/http_request_object.c b/http_request_object.c
index 7b1d82b..c3efaa9 100644
--- a/http_request_object.c
+++ b/http_request_object.c
@@ -23,6 +23,8 @@
 
 #if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL)
 
+#include "zend_interfaces.h"
+
 #include "php_http_std_defs.h"
 #include "php_http_request_object.h"
 #include "php_http_request_api.h"
@@ -52,6 +54,7 @@ HTTP_EMPTY_ARGS(__destruct, 0);
 HTTP_BEGIN_ARGS(__construct, 0, 0)
 	HTTP_ARG_VAL(url, 0)
 	HTTP_ARG_VAL(method, 0)
+	HTTP_ARG_VAL(options, 0)
 HTTP_END_ARGS;
 
 HTTP_EMPTY_ARGS(getOptions, 0);
@@ -219,6 +222,8 @@ 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 http_request_object_clone_obj _http_request_object_clone_obj
+static inline zend_object_value _http_request_object_clone_obj(zval *object TSRMLS_DC);
 
 zend_class_entry *http_request_object_ce;
 zend_function_entry http_request_object_fe[] = {
@@ -295,9 +300,11 @@ zend_function_entry http_request_object_fe[] = {
 };
 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 = NULL;
+	return SUCCESS;
 }
 
 zend_object_value _http_request_object_new(zend_class_entry *ce TSRMLS_DC)
@@ -501,13 +508,13 @@ STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_
 	if (status == SUCCESS) {
 		zval *qdata = convert_to_type_ex(IS_STRING, GET_PROP(obj, queryData));
 		
-		if (Z_STRLEN_P(qdata) && (strlen(request_uri) < HTTP_URI_MAXLEN)) {
+		if (Z_STRLEN_P(qdata)) {
 			if (!strchr(request_uri, '?')) {
-				strcat(request_uri, "?");
+				strlcat(request_uri, "?", HTTP_URI_MAXLEN);
 			} else {
-				strcat(request_uri, "&");
+				strlcat(request_uri, "&", HTTP_URI_MAXLEN);
 			}
-			strncat(request_uri, Z_STRVAL_P(qdata), HTTP_URI_MAXLEN - strlen(request_uri));
+			strlcat(request_uri, Z_STRVAL_P(qdata), HTTP_URI_MAXLEN);
 		}
 		
 		status = http_request_init(obj->ch, Z_LVAL_P(meth), request_uri, body, Z_ARRVAL_P(GET_PROP(obj, options)));
@@ -646,13 +653,14 @@ static inline void _http_request_get_options_subr(INTERNAL_FUNCTION_PARAMETERS,
 
 /* ### USERLAND ### */
 
-/* {{{ proto void HttpRequest::__construct([string url[, int request_method = HTTP_METH_GET]])
+/* {{{ 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.
  * Additianally accepts an optional int parameter specifying the request method
- * to use.
+ * to use and an associative array as optional third parameter which will be
+ * passed to HttpRequest::setOptions(). 
  * 
  * Throws HttpException.
  */
@@ -661,10 +669,11 @@ PHP_METHOD(HttpRequest, __construct)
 	char *URL = NULL;
 	int URL_len;
 	long meth = -1;
+	zval *options = NULL;
 	getObject(http_request_object, obj);
 
 	SET_EH_THROW_HTTP();
-	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sl", &URL, &URL_len, &meth)) {
+	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sla", &URL, &URL_len, &meth, &options)) {
 		INIT_PARR(obj, options);
 		INIT_PARR(obj, responseInfo);
 		INIT_PARR(obj, responseData);
@@ -677,6 +686,9 @@ PHP_METHOD(HttpRequest, __construct)
 		if (meth > -1) {
 			UPD_PROP(obj, long, method, meth);
 		}
+		if (options) {
+			zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "setoptions", NULL, options);
+		}
 	}
 	SET_EH_NORMAL();
 }
@@ -717,7 +729,7 @@ PHP_METHOD(HttpRequest, setOptions)
 	zval *opts = NULL, *old_opts, **opt;
 	getObject(http_request_object, obj);
 
-	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;
 	}
 	
@@ -734,7 +746,7 @@ PHP_METHOD(HttpRequest, setOptions)
 			if (!strcmp(key, "headers")) {
 				zval **headers;
 				if (SUCCESS == zend_hash_find(Z_ARRVAL_P(old_opts), "headers", sizeof("headers"), (void **) &headers)) {
-					convert_to_array(*opt);
+					convert_to_array_ex(opt);
 					convert_to_array(*headers);
 					array_merge(*opt, *headers);
 					continue;
@@ -742,7 +754,7 @@ PHP_METHOD(HttpRequest, setOptions)
 			} else if (!strcmp(key, "cookies")) {
 				zval **cookies;
 				if (SUCCESS == zend_hash_find(Z_ARRVAL_P(old_opts), "cookies", sizeof("cookies"), (void **) &cookies)) {
-					convert_to_array(*opt);
+					convert_to_array_ex(opt);
 					convert_to_array(*cookies);
 					array_merge(*opt, *cookies);
 					continue;
@@ -750,7 +762,7 @@ PHP_METHOD(HttpRequest, setOptions)
 			} else if (!strcmp(key, "ssl")) {
 				zval **ssl;
 				if (SUCCESS == zend_hash_find(Z_ARRVAL_P(old_opts), "ssl", sizeof("ssl"), (void **) &ssl)) {
-					convert_to_array(*opt);
+					convert_to_array_ex(opt);
 					convert_to_array(*ssl);
 					array_merge(*opt, *ssl);
 					continue;