X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_functions.c;h=f7f73f75afd5b957368ee8951a6df83e96c1f386;hp=2c849c1215c7e1a2d9ea1b35432bed108960a6c9;hb=8cac80cefc90322b900d568b4e1af97f291cceb3;hpb=2e7c2f8c1d14dab23de8be7efb33d74155d97f71

diff --git a/http_functions.c b/http_functions.c
index 2c849c1..f7f73f7 100644
--- a/http_functions.c
+++ b/http_functions.c
@@ -56,13 +56,13 @@ PHP_FUNCTION(http_date)
 }
 /* }}} */
 
-/* {{{ proto string http_build_url([mixed url[, mixed parts[, int flags = HTTP_URL_REPLACE[, array &new_url]]]])
+/* {{{ proto string http_build_url([mixed url[, mixed parts[, int flags = HTTP_URL_REPLACE|HTTP_URL_FROM_ENV[, array &new_url]]]])
 	Build an URL. */
 PHP_FUNCTION(http_build_url)
 {
 	char *url_str = NULL;
 	size_t url_len = 0;
-	long flags = HTTP_URL_REPLACE;
+	long flags = HTTP_URL_REPLACE|HTTP_URL_FROM_ENV;
 	zval *z_old_url = NULL, *z_new_url = NULL, *z_composed_url = NULL;
 	php_url *old_url = NULL, *new_url = NULL, *composed_url = NULL;
 
@@ -148,6 +148,17 @@ PHP_FUNCTION(http_build_str)
 }
 /* }}} */
 
+#define HTTP_DO_NEGOTIATE_DEFAULT(supported) \
+	{ \
+		zval **value; \
+		 \
+		zend_hash_internal_pointer_reset(Z_ARRVAL_P(supported)); \
+		if (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(supported), (void *) &value)) { \
+			RETVAL_ZVAL(*value, 1, 0); \
+		} else { \
+			RETVAL_NULL(); \
+		} \
+	}
 #define HTTP_DO_NEGOTIATE(type, supported, rs_array) \
 { \
 	HashTable *result; \
@@ -156,10 +167,10 @@ PHP_FUNCTION(http_build_str)
 		uint key_len; \
 		ulong idx; \
 		 \
-		if (HASH_KEY_IS_STRING == zend_hash_get_current_key_ex(result, &key, &key_len, &idx, 1, NULL)) { \
+		if (zend_hash_num_elements(result) && HASH_KEY_IS_STRING == zend_hash_get_current_key_ex(result, &key, &key_len, &idx, 1, NULL)) { \
 			RETVAL_STRINGL(key, key_len-1, 0); \
 		} else { \
-			RETVAL_NULL(); \
+			HTTP_DO_NEGOTIATE_DEFAULT(supported); \
 		} \
 		\
 		if (rs_array) { \
@@ -170,14 +181,7 @@ PHP_FUNCTION(http_build_str)
 		FREE_HASHTABLE(result); \
 		\
 	} else { \
-		zval **value; \
-		 \
-		zend_hash_internal_pointer_reset(Z_ARRVAL_P(supported)); \
-		if (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(supported), (void *) &value)) { \
-			RETVAL_ZVAL(*value, 1, 0); \
-		} else { \
-			RETVAL_NULL(); \
-		} \
+		HTTP_DO_NEGOTIATE_DEFAULT(supported); \
 		\
 		if (rs_array) { \
 			HashPosition pos; \
@@ -488,7 +492,7 @@ PHP_FUNCTION(http_redirect)
 		}
 	}
 
-	URI = http_absolute_url(url);
+	URI = http_absolute_url_ex(url, HTTP_URL_FROM_ENV);
 
 	if (query_len) {
 		spprintf(&LOC, 0, "Location: %s?%s", URI, query);
@@ -729,15 +733,18 @@ PHP_FUNCTION(http_parse_params)
 		RETURN_FALSE;
 	}
 	
-	params = ecalloc(1, sizeof(zval));
+	MAKE_STD_ZVAL(params);
 	array_init(params);
 	if (SUCCESS != http_parse_params(param, flags, Z_ARRVAL_P(params))) {
-		zval_dtor(params);
-		FREE_ZVAL(params);
+		zval_ptr_dtor(&params);
 		RETURN_FALSE;
 	}
+	
 	object_init(return_value);
 	add_property_zval(return_value, "params", params);
+#ifdef ZEND_ENGINE_2
+	zval_ptr_dtor(&params);
+#endif
 }
 /* }}} */
 
@@ -849,7 +856,7 @@ PHP_FUNCTION(http_persistent_handles_ident)
 		zval **bodyonly; \
 		 \
 		/* check if only the body should be returned */ \
-		if (options && (SUCCESS == zend_hash_find(Z_ARRVAL_P(options), "bodyonly", sizeof("bodyonly"), (void *) &bodyonly)) && zval_is_true(*bodyonly)) { \
+		if (options && (SUCCESS == zend_hash_find(Z_ARRVAL_P(options), "bodyonly", sizeof("bodyonly"), (void *) &bodyonly)) && i_zend_is_true(*bodyonly)) { \
 			http_message *msg = http_message_parse(PHPSTR_VAL(&request.conv.response), PHPSTR_LEN(&request.conv.response)); \
 			 \
 			if (msg) { \