From: Michael Wallner <mike@php.net>
Date: Thu, 19 Jan 2012 08:55:12 +0000 (+0000)
Subject: add http\Url::mod(mixed $new_url[, int flags])
X-Git-Tag: DEV_2-before-client~66
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=1e674ad6a7e867b1b4d04db098b59981fe3f011d;p=m6w6%2Fext-http

add http\Url::mod(mixed $new_url[, int flags])
---

diff --git a/php_http_url.c b/php_http_url.c
index b55b7d7..4a5d20d 100644
--- a/php_http_url.c
+++ b/php_http_url.c
@@ -442,9 +442,15 @@ PHP_HTTP_BEGIN_ARGS(__construct, 0)
 PHP_HTTP_END_ARGS;
 PHP_HTTP_EMPTY_ARGS(toString);
 
+PHP_HTTP_BEGIN_ARGS(mod, 1)
+	PHP_HTTP_ARG_VAL(more_url_parts, 0)
+	PHP_HTTP_ARG_VAL(flags, 0)
+PHP_HTTP_END_ARGS;
+
 zend_class_entry *php_http_url_class_entry;
 zend_function_entry php_http_url_method_entry[] = {
 	PHP_HTTP_URL_ME(__construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+	PHP_HTTP_URL_ME(mod, ZEND_ACC_PUBLIC)
 	PHP_HTTP_URL_ME(toString, ZEND_ACC_PUBLIC)
 	ZEND_MALIAS(HttpUrl, __toString, toString, PHP_HTTP_ARGS(HttpUrl, toString), ZEND_ACC_PUBLIC)
 	EMPTY_FUNCTION_ENTRY
@@ -515,6 +521,48 @@ PHP_METHOD(HttpUrl, __construct)
 	} end_error_handling();
 }
 
+PHP_METHOD(HttpUrl, mod)
+{
+	zval *new_url = NULL;
+	long flags = PHP_HTTP_URL_JOIN_PATH | PHP_HTTP_URL_JOIN_QUERY;
+
+	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z!|l", &new_url, &flags)) {
+		php_url *res_purl, *new_purl = NULL, *old_purl = NULL;
+
+		if (new_url) {
+			switch (Z_TYPE_P(new_url)) {
+				case IS_OBJECT:
+				case IS_ARRAY:
+					new_purl = php_http_url_from_struct(NULL, HASH_OF(new_url) TSRMLS_CC);
+					break;
+				default: {
+					zval *cpy = php_http_ztyp(IS_STRING, new_url);
+
+					new_purl = php_url_parse(Z_STRVAL_P(new_url));
+					zval_ptr_dtor(&cpy);
+					break;
+				}
+			}
+			if (!new_purl) {
+				return;
+			}
+		}
+
+		if ((old_purl = php_http_url_from_struct(NULL, HASH_OF(getThis()) TSRMLS_CC))) {
+			php_http_url(flags, old_purl, new_purl, &res_purl, NULL, NULL TSRMLS_CC);
+
+			Z_OBJVAL_P(return_value) = zend_objects_clone_obj(getThis() TSRMLS_CC);
+			php_http_url_to_struct(res_purl, return_value TSRMLS_CC);
+
+			php_url_free(res_purl);
+			php_url_free(old_purl);
+		}
+		if (new_purl) {
+			php_url_free(new_purl);
+		}
+	}
+}
+
 PHP_METHOD(HttpUrl, toString)
 {
 	if (SUCCESS == zend_parse_parameters_none()) {
diff --git a/php_http_url.h b/php_http_url.h
index 3216403..db7a32e 100644
--- a/php_http_url.h
+++ b/php_http_url.h
@@ -161,6 +161,7 @@ extern zend_function_entry php_http_url_method_entry[];
 #define php_http_url_object_new_ex php_http_object_new_ex
 
 PHP_METHOD(HttpUrl, __construct);
+PHP_METHOD(HttpUrl, mod);
 PHP_METHOD(HttpUrl, toString);
 
 extern PHP_MINIT_FUNCTION(http_url);