X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_functions.c;h=e894b19ebe4ec892a94e3fb7fab5f0c1533c5b5b;hp=2675fbcae41ad9a850ba40de481c958380d41f83;hb=dbc4ec02cd319000b5c8589910047cfe6d5738be;hpb=f1f5432c95075dc3160d31d087bbaa00bdccca5c

diff --git a/http_functions.c b/http_functions.c
index 2675fbc..e894b19 100644
--- a/http_functions.c
+++ b/http_functions.c
@@ -62,7 +62,7 @@ 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[, array &new_url]]]])
  *
  * Build an URL.
  *
@@ -77,7 +77,7 @@ PHP_FUNCTION(http_date)
  * <pre>
  *	- HTTP_URL_REPLACE:        (default) set parts of the second url will replace the parts in the first
  *	- HTTP_URL_JOIN_PATH:      the path of the second url will be merged into the one of the first
- *	- HTTP_URL_JOIN_QUERY:     the two querystrings will be merged naivly; no replacements are done
+ *	- HTTP_URL_JOIN_QUERY:     the two querystrings will be merged recursively
  *	- HTTP_URL_STRIP_USER:     the user part will not appear in the result
  *	- HTTP_URL_STRIP_PASS:     the password part will not appear in the result
  *	- HTTP_URL_STRIP_AUTH:     neither the user nor the password part will appear in the result
@@ -112,13 +112,13 @@ PHP_FUNCTION(http_build_url)
 	zval *z_old_url = NULL, *z_new_url = NULL, *z_composed_url = NULL;
 	php_url *old_url = NULL, *new_url = NULL, *composed_url = NULL;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z/|z/lz", &z_old_url, &z_new_url, &flags, &z_composed_url) != SUCCESS) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|z!/z!/lz", &z_old_url, &z_new_url, &flags, &z_composed_url) != SUCCESS) {
 		RETURN_FALSE;
 	}
 	
 	if (z_new_url) {
 		if (Z_TYPE_P(z_new_url) == IS_ARRAY || Z_TYPE_P(z_new_url) == IS_OBJECT) {
-			new_url = array2url(HASH_OF(z_new_url));
+			new_url = http_url_from_struct(NULL, HASH_OF(z_new_url));
 		} else {
 			convert_to_string(z_new_url);
 			if (!(new_url = php_url_parse_ex(Z_STRVAL_P(z_new_url), Z_STRLEN_P(z_new_url)))) {
@@ -128,48 +128,24 @@ PHP_FUNCTION(http_build_url)
 		}
 	}
 	
-	if (Z_TYPE_P(z_old_url) == IS_ARRAY || Z_TYPE_P(z_old_url) == IS_OBJECT) {
-		old_url = array2url(HASH_OF(z_old_url));
-	} else {
-		convert_to_string(z_old_url);
-		if (!(old_url = php_url_parse_ex(Z_STRVAL_P(z_old_url), Z_STRLEN_P(z_old_url)))) {
-			if (new_url) {
-				php_url_free(new_url);
+	if (z_old_url) {
+		if (Z_TYPE_P(z_old_url) == IS_ARRAY || Z_TYPE_P(z_old_url) == IS_OBJECT) {
+			old_url = http_url_from_struct(NULL, HASH_OF(z_old_url));
+		} else {
+			convert_to_string(z_old_url);
+			if (!(old_url = php_url_parse_ex(Z_STRVAL_P(z_old_url), Z_STRLEN_P(z_old_url)))) {
+				if (new_url) {
+					php_url_free(new_url);
+				}
+				http_error_ex(HE_WARNING, HTTP_E_URL, "Could not parse URL (%s)", Z_STRVAL_P(z_old_url));
+				RETURN_FALSE;
 			}
-			http_error_ex(HE_WARNING, HTTP_E_URL, "Could not parse URL (%s)", Z_STRVAL_P(z_old_url));
-			RETURN_FALSE;
 		}
 	}
 	
 	if (z_composed_url) {
 		http_build_url(flags, old_url, new_url, &composed_url, &url_str, &url_len);
-		
-		zval_dtor(z_composed_url);
-		array_init(z_composed_url);
-		if (composed_url->scheme) {
-			add_assoc_string(z_composed_url, "scheme", composed_url->scheme, 1);
-		}
-		if (composed_url->user) {
-			add_assoc_string(z_composed_url, "user", composed_url->user, 1);
-		}
-		if (composed_url->pass) {
-			add_assoc_string(z_composed_url, "pass", composed_url->pass, 1);
-		}
-		if (composed_url->host) {
-			add_assoc_string(z_composed_url, "host", composed_url->host, 1);
-		}
-		if (composed_url->port) {
-			add_assoc_long(z_composed_url, "port", composed_url->port);
-		}
-		if (composed_url->path) {
-			add_assoc_string(z_composed_url, "path", composed_url->path, 1);
-		}
-		if (composed_url->query) {
-			add_assoc_string(z_composed_url, "query", composed_url->query, 1);
-		}
-		if (composed_url->fragment) {
-			add_assoc_string(z_composed_url, "fragment", composed_url->fragment, 1);
-		}
+		http_url_tostruct(composed_url, z_composed_url);
 		php_url_free(composed_url);
 	} else {
 		http_build_url(flags, old_url, new_url, NULL, &url_str, &url_len);
@@ -178,7 +154,9 @@ PHP_FUNCTION(http_build_url)
 	if (new_url) {
 		php_url_free(new_url);
 	}
-	php_url_free(old_url);
+	if (old_url) {
+		php_url_free(old_url);
+	}
 	
 	RETURN_STRINGL(url_str, url_len, 0);
 }
@@ -739,7 +717,7 @@ PHP_FUNCTION(http_throttle)
  */
 PHP_FUNCTION(http_redirect)
 {
-	int url_len;
+	int url_len = 0;
 	size_t query_len = 0;
 	zend_bool session = 0, free_params = 0;
 	zval *params = NULL;
@@ -803,20 +781,18 @@ PHP_FUNCTION(http_redirect)
 		FREE_ZVAL(params);
 	}
 	
-	switch (status)
-	{
+	switch (status) {
 		case 300:
 			RETVAL_SUCCESS(http_send_status_header(status, LOC));
 			efree(LOC);
 			return;
-		break;
 		
 		case HTTP_REDIRECT_PERM:
 		case HTTP_REDIRECT_FOUND:
 		case HTTP_REDIRECT_POST:
 		case HTTP_REDIRECT_PROXY:
 		case HTTP_REDIRECT_TEMP:
-		break;
+			break;
 		
 		case 306:
 		default:
@@ -829,7 +805,7 @@ PHP_FUNCTION(http_redirect)
 			} else {
 				status = HTTP_REDIRECT_FOUND;
 			}
-		break;
+			break;
 	}
 	
 	RETURN_SUCCESS(http_exit_ex(status, LOC, RED, 1));
@@ -1113,6 +1089,33 @@ PHP_FUNCTION(http_parse_cookie)
 	}
 }
 
+/* {{{ proto object http_parse_params(string param[, int flags = HTTP_PARAMS_DEFAULT])
+ *
+ * Parse parameter list.
+ */
+PHP_FUNCTION(http_parse_params)
+{
+	char *param;
+	int param_len;
+	zval *params;
+	long flags = HTTP_PARAMS_DEFAULT;
+	
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &param, &param_len, &flags)) {
+		RETURN_FALSE;
+	}
+	
+	params = ecalloc(1, sizeof(zval));
+	array_init(params);
+	if (SUCCESS != http_parse_params(param, flags, Z_ARRVAL_P(params))) {
+		zval_dtor(params);
+		FREE_ZVAL(params);
+		RETURN_FALSE;
+	}
+	object_init(return_value);
+	add_property_zval(return_value, "params", params);
+}
+/* }}} */
+
 /* {{{ proto array http_get_request_headers(void)
  *
  * Get a list of incoming HTTP headers.
@@ -1246,9 +1249,8 @@ PHP_FUNCTION(http_match_request_header)
  *  - cookies:          array, list of cookies as associative array
  *                      like array("cookie" => "value")
  *  - encodecookies:    bool, whether to urlencode the cookies (default: true)
- *  - resetcookies:     bool, wheter to reset the cookies
  *  - cookiestore:      string, path to a file where cookies are/will be stored
- *  - cookiesession:    bool, accept (true) or reset (false) sessioncookies
+ *  - cookiesession:    bool, don't load session cookies from cookiestore if TRUE
  *  - resume:           int, byte offset to start the download from;
  *                      if the server supports ranges
  *  - range:            array, array of arrays, each containing two integers,
@@ -1668,12 +1670,6 @@ PHP_FUNCTION(http_request)
 }
 /* }}} */
 
-/* {{{ proto string http_request_body_encode(array fields, array files)
- *
- * Generate x-www-form-urlencoded resp. form-data encoded request body.
- *
- * Returns encoded string on success, or FALSE on failure.
- */
 static char *file_get_contents(char *file, size_t *len TSRMLS_DC)
 {
 	php_stream *s = NULL;
@@ -1694,6 +1690,13 @@ struct FormData {
 	size_t length;
 };
 CURLcode Curl_getFormData(struct FormData **, struct curl_httppost *post, curl_off_t *size);
+
+/* {{{ proto string http_request_body_encode(array fields, array files)
+ *
+ * Generate x-www-form-urlencoded resp. form-data encoded request body.
+ *
+ * Returns encoded string on success, or FALSE on failure.
+ */
 PHP_FUNCTION(http_request_body_encode)
 {
 	zval *fields = NULL, *files = NULL;
@@ -1717,8 +1720,7 @@ PHP_FUNCTION(http_request_body_encode)
 		RETURN_FALSE;
 	}
 	
-	switch (body.type)
-	{
+	switch (body.type) {
 		case HTTP_REQUEST_BODY_CURLPOST:
 			if (CURLE_OK != (rc = Curl_getFormData(&data, body.data, &size))) {
 				http_error_ex(HE_WARNING, HTTP_E_RUNTIME, "Could not encode request body: %s", curl_easy_strerror(rc));
@@ -1749,16 +1751,16 @@ PHP_FUNCTION(http_request_body_encode)
 				}
 			}
 			http_request_body_dtor(&body);
-		break;
+			break;
 		
 		case HTTP_REQUEST_BODY_CSTRING:
 			RETVAL_STRINGL(body.data, body.size, 0);
-		break;
+			break;
 		
 		default:
 			http_request_body_dtor(&body);
 			RETVAL_FALSE;
-		break;
+			break;
 	}
 }
 #endif /* HTTP_HAVE_CURL */
@@ -1805,8 +1807,7 @@ PHP_FUNCTION(http_request_method_unregister)
 		RETURN_FALSE;
 	}
 
-	switch (Z_TYPE_P(method))
-	{
+	switch (Z_TYPE_P(method)) {
 		case IS_OBJECT:
 			convert_to_string(method);
 		case IS_STRING:
@@ -1838,15 +1839,14 @@ PHP_FUNCTION(http_request_method_unregister)
  */
 PHP_FUNCTION(http_request_method_exists)
 {
-	IF_RETVAL_USED {
+	if (return_value_used) {
 		zval *method;
 
 		if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z/", &method)) {
 			RETURN_FALSE;
 		}
 
-		switch (Z_TYPE_P(method))
-		{
+		switch (Z_TYPE_P(method)) {
 			case IS_OBJECT:
 				convert_to_string(method);
 			case IS_STRING:
@@ -1874,7 +1874,7 @@ PHP_FUNCTION(http_request_method_exists)
  */
 PHP_FUNCTION(http_request_method_name)
 {
-	IF_RETVAL_USED {
+	if (return_value_used) {
 		long method;
 
 		if ((SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &method)) || (method < 0)) {