X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_url.c;h=4a5d20d65d314ffbd1d8319ba7be367a11dd3e2b;hp=58250234751bb2c15bd481313dc5df8856c0ba0d;hb=4d68865693332389b875e4466f8b5368c0876e15;hpb=dedad9f35cbeaee56e7cca145e378cc6548198e3

diff --git a/php_http_url.c b/php_http_url.c
index 5825023..4a5d20d 100644
--- a/php_http_url.c
+++ b/php_http_url.c
@@ -6,16 +6,11 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id: http_url_api.c 292841 2009-12-31 08:48:57Z mike $ */
-
-#include "php_http.h"
-
-#include <main/SAPI.h>
-#include <ext/standard/php_string.h>
+#include "php_http_api.h"
 
 static inline char *localhostname(void)
 {
@@ -248,7 +243,7 @@ PHP_HTTP_API void php_http_url(int flags, const php_url *old_url, const php_url
 						/* .. at the end */
 						ptr[1] = '\0';
 					}
-					/* fallthrough */
+					/* no break */
 				
 				default:
 					/* something else */
@@ -337,7 +332,7 @@ PHP_HTTP_API STATUS php_http_url_encode_hash(HashTable *hash, const char *pre_en
 		php_http_buffer_append(qstr, pre_encoded_str, pre_encoded_len);
 	}
 
-	if (SUCCESS != php_http_url_encode_hash_ex(hash, qstr, arg_sep_str, arg_sep_len, ZEND_STRS("="), NULL, 0 TSRMLS_CC)) {
+	if (SUCCESS != php_http_url_encode_hash_ex(hash, qstr, arg_sep_str, arg_sep_len, ZEND_STRL("="), NULL, 0 TSRMLS_CC)) {
 		php_http_buffer_free(&qstr);
 		return FAILURE;
 	}
@@ -447,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
@@ -520,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()) {