X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_url.h;h=938cf07de1314fd00f465032fee6c9421721aa3d;hp=7b16c0119f17e723fd5f1cd6087d9fe0ae9e4b52;hb=0b83632b2b0a03eeca090f993259ccd95ab646fb;hpb=d2aca1740aad980f8ec182c2f9ffac20f15a4a54

diff --git a/php_http_url.h b/php_http_url.h
index 7b16c01..938cf07 100644
--- a/php_http_url.h
+++ b/php_http_url.h
@@ -6,12 +6,10 @@
     | 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-2013, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id: php_http_url_api.h 292841 2009-12-31 08:48:57Z mike $ */
-
 #ifndef PHP_HTTP_URL_H
 #define PHP_HTTP_URL_H
 
@@ -35,12 +33,80 @@
 	PHP_HTTP_URL_STRIP_FRAGMENT \
 )
 #define PHP_HTTP_URL_FROM_ENV		0x1000
+#define PHP_HTTP_URL_SANITIZE_PATH	0x2000
 
 PHP_HTTP_API void php_http_url(int flags, const php_url *old_url, const php_url *new_url, php_url **url_ptr, char **url_str, size_t *url_len TSRMLS_DC);
-PHP_HTTP_API char *php_http_url_absolute(const char *url, int flags TSRMLS_DC);
 
-PHP_HTTP_API STATUS php_http_url_encode_hash(HashTable *hash, zend_bool override_argsep, char *pre_encoded_data, size_t pre_encoded_len, char **encoded_data, size_t *encoded_len TSRMLS_DC);
-PHP_HTTP_API STATUS php_http_url_encode_hash_recursive(HashTable *ht, php_http_buffer_t *str, const char *arg_sep, size_t arg_sep_len, const char *prefix, size_t prefix_len TSRMLS_DC);
+PHP_HTTP_API STATUS php_http_url_encode_hash(HashTable *hash, const char *pre_encoded_str, size_t pre_encoded_len, char **encoded_str, size_t *encoded_len TSRMLS_DC);
+PHP_HTTP_API STATUS php_http_url_encode_hash_ex(HashTable *hash, php_http_buffer_t *qstr, const char *arg_sep_str, size_t arg_sep_len, const char *val_sep_str, size_t val_sep_len, const char *pre_encoded_str, size_t pre_encoded_len TSRMLS_DC);
+
+static inline void php_http_url_argsep(const char **str, size_t *len TSRMLS_DC)
+{
+	if (SUCCESS != php_http_ini_entry(ZEND_STRL("arg_separator.output"), str, len, 0 TSRMLS_CC) || !*len) {
+		*str = PHP_HTTP_URL_ARGSEP;
+		*len = lenof(PHP_HTTP_URL_ARGSEP);
+	}
+}
+
+static inline void php_http_url_to_string(php_url *url, char **url_str, size_t *url_len TSRMLS_DC)
+{
+	php_http_buffer_t buf;
+
+	php_http_buffer_init(&buf);
+
+	if (url->scheme && *url->scheme) {
+		php_http_buffer_appendl(&buf, url->scheme);
+		php_http_buffer_appends(&buf, "://");
+	} else {
+		php_http_buffer_appends(&buf, "//");
+	}
+
+	if (url->user && *url->user) {
+		php_http_buffer_appendl(&buf, url->user);
+		if (url->pass && *url->pass) {
+			php_http_buffer_appends(&buf, ":");
+			php_http_buffer_appendl(&buf, url->pass);
+		}
+		php_http_buffer_appends(&buf, "@");
+	}
+
+	if (url->host && *url->host) {
+		php_http_buffer_appendl(&buf, url->host);
+	} else {
+		php_http_buffer_appends(&buf, "localhost");
+	}
+
+	if (url->port) {
+		php_http_buffer_appendf(&buf, ":%hu", url->port);
+	}
+
+	if (url->path && *url->path) {
+		php_http_buffer_appendl(&buf, url->path);
+	}
+
+	if (url->query && *url->query) {
+		php_http_buffer_appends(&buf, "?");
+		php_http_buffer_appendl(&buf, url->query);
+	}
+
+	if (url->fragment && *url->fragment) {
+		php_http_buffer_appends(&buf, "#");
+		php_http_buffer_appendl(&buf, url->fragment);
+	}
+
+	php_http_buffer_shrink(&buf);
+	php_http_buffer_fix(&buf);
+
+	if (url_len) {
+		*url_len = buf.used;
+	}
+
+	if (url_str) {
+		*url_str = buf.data;
+	} else {
+		php_http_buffer_dtor(&buf);
+	}
+}
 
 static inline php_url *php_http_url_from_struct(php_url *url, HashTable *ht TSRMLS_DC)
 {
@@ -104,9 +170,11 @@ static inline HashTable *php_http_url_to_struct(php_url *url, zval *strct TSRMLS
 			default:
 				zval_dtor(strct);
 				array_init(strct);
+				/* no break */
 			case IS_ARRAY:
 			case IS_OBJECT:
 				INIT_PZVAL_ARRAY((&arr), HASH_OF(strct));
+				break;
 		}
 	} else {
 		INIT_PZVAL(&arr);
@@ -143,17 +211,12 @@ static inline HashTable *php_http_url_to_struct(php_url *url, zval *strct TSRMLS
 	return Z_ARRVAL(arr);
 }
 
-extern zend_class_entry *php_http_url_class_entry;
-extern zend_function_entry php_http_url_method_entry[];
+PHP_HTTP_API zend_class_entry *php_http_url_class_entry;
+PHP_MINIT_FUNCTION(http_url);
 
 #define php_http_url_object_new php_http_object_new
 #define php_http_url_object_new_ex php_http_object_new_ex
 
-PHP_METHOD(HttpUrl, __construct);
-PHP_METHOD(HttpUrl, toString);
-
-extern PHP_MINIT_FUNCTION(http_url);
-
 #endif
 
 /*