X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_functions.c;h=5cb8a16a400c5cb5d3590c6171b838ed4e56243b;hp=c094e640a56d11c918ed9e4d3156492a1286f78f;hb=f9d92cff35589f414e369228502c91f35a4e3643;hpb=edc84b40eb2c5be04492fa98fec5833a030782eb

diff --git a/http_functions.c b/http_functions.c
index c094e64..5cb8a16 100644
--- a/http_functions.c
+++ b/http_functions.c
@@ -79,7 +79,7 @@ PHP_FUNCTION(http_date)
  * If a port is pecified in either the url or as sperate parameter,
  * it will be added if it differs from te default port for HTTP(S).
  * 
- * Returns the absolute URI as string.
+ * Returns the absolute URI as string on success or false on failure.
  * 
  * Examples:
  * <pre>
@@ -90,7 +90,7 @@ PHP_FUNCTION(http_date)
  */
 PHP_FUNCTION(http_build_uri)
 {
-	char *url = NULL, *proto = NULL, *host = NULL;
+	char *url = NULL, *proto = NULL, *host = NULL, *built = NULL;
 	int url_len = 0, proto_len = 0, host_len = 0;
 	long port = 0;
 
@@ -98,7 +98,10 @@ PHP_FUNCTION(http_build_uri)
 		RETURN_FALSE;
 	}
 
-	RETURN_STRING(http_absolute_uri_ex(url, url_len, proto, proto_len, host, host_len, port), 0);
+	if ((built = http_absolute_uri_ex(url, url_len, proto, proto_len, host, host_len, port))) {
+		RETURN_STRING(built, 0);
+	}
+	RETURN_FALSE;
 }
 /* }}} */
 
@@ -974,6 +977,25 @@ PHP_FUNCTION(http_match_request_header)
 /* {{{ HAVE_CURL */
 #ifdef HTTP_HAVE_CURL
 
+#define RETURN_RESPONSE_OR_BODY(response) \
+	{ \
+		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)) { \
+			http_message *msg = http_message_parse(PHPSTR_VAL(&response), PHPSTR_LEN(&response)); \
+			 \
+			if (msg) { \
+				RETVAL_STRINGL(PHPSTR_VAL(&msg->body), PHPSTR_LEN(&msg->body), 1); \
+				http_message_free(&msg); \
+				phpstr_dtor(&response); \
+				return; \
+			} \
+		} else { \
+			RETURN_PHPSTR_VAL(&response); \
+		} \
+	}
+
 /* {{{ proto string http_get(string url[, array options[, array &info]])
  *
  * Performs an HTTP GET request on the supplied url.
@@ -1063,11 +1085,10 @@ PHP_FUNCTION(http_get)
 
 	phpstr_init_ex(&response, HTTP_CURLBUF_SIZE, 0);
 	if (SUCCESS == http_get(URL, options ? Z_ARRVAL_P(options) : NULL, info ? Z_ARRVAL_P(info) : NULL, &response)) {
-		RETURN_PHPSTR_VAL(&response);
-	} else {
-		phpstr_dtor(&response);
-		RETURN_FALSE;
+		RETURN_RESPONSE_OR_BODY(response);
 	}
+	phpstr_dtor(&response);
+	RETURN_FALSE;
 }
 /* }}} */
 
@@ -1097,11 +1118,10 @@ PHP_FUNCTION(http_head)
 
 	phpstr_init_ex(&response, HTTP_CURLBUF_SIZE, 0);
 	if (SUCCESS == http_head(URL, options ? Z_ARRVAL_P(options) : NULL, info ? Z_ARRVAL_P(info) : NULL, &response)) {
-		RETURN_PHPSTR_VAL(&response);
-	} else {
-		phpstr_dtor(&response);
-		RETURN_FALSE;
+		RETURN_RESPONSE_OR_BODY(response);
 	}
+	phpstr_dtor(&response);
+	RETURN_FALSE;
 }
 /* }}} */
 
@@ -1137,11 +1157,10 @@ PHP_FUNCTION(http_post_data)
 
 	phpstr_init_ex(&response, HTTP_CURLBUF_SIZE, 0);
 	if (SUCCESS == http_post(URL, &body, options ? Z_ARRVAL_P(options) : NULL, info ? Z_ARRVAL_P(info) : NULL, &response)) {
-		RETVAL_PHPSTR_VAL(&response);
-	} else {
-		phpstr_dtor(&response);
-		RETVAL_FALSE;
+		RETURN_RESPONSE_OR_BODY(response);
 	}
+	phpstr_dtor(&response);
+	RETVAL_FALSE;
 }
 /* }}} */
 
@@ -1177,12 +1196,12 @@ PHP_FUNCTION(http_post_fields)
 
 	phpstr_init_ex(&response, HTTP_CURLBUF_SIZE, 0);
 	if (SUCCESS == http_post(URL, &body, options ? Z_ARRVAL_P(options) : NULL, info ? Z_ARRVAL_P(info) : NULL, &response)) {
-		RETVAL_PHPSTR_VAL(&response);
-	} else {
-		phpstr_dtor(&response);
-		RETVAL_FALSE;
+		http_request_body_dtor(&body);
+		RETURN_RESPONSE_OR_BODY(response);
 	}
 	http_request_body_dtor(&body);
+	phpstr_dtor(&response);
+	RETURN_FALSE;
 }
 /* }}} */
 
@@ -1228,12 +1247,12 @@ PHP_FUNCTION(http_put_file)
 
 	phpstr_init_ex(&response, HTTP_CURLBUF_SIZE, 0);
 	if (SUCCESS == http_put(URL, &body, options ? Z_ARRVAL_P(options) : NULL, info ? Z_ARRVAL_P(info) : NULL, &response)) {
-		RETVAL_PHPSTR_VAL(&response);
-	} else {
-		phpstr_dtor(&response);
-		RETVAL_FALSE;
+		http_request_body_dtor(&body);
+		RETURN_RESPONSE_OR_BODY(response);
 	}
 	http_request_body_dtor(&body);
+	phpstr_dtor(&response);
+	RETURN_FALSE;
 }
 /* }}} */
 
@@ -1277,11 +1296,10 @@ PHP_FUNCTION(http_put_stream)
 
 	phpstr_init_ex(&response, HTTP_CURLBUF_SIZE, 0);
 	if (SUCCESS == http_put(URL, &body, options ? Z_ARRVAL_P(options) : NULL, info ? Z_ARRVAL_P(info) : NULL, &response)) {
-		RETURN_PHPSTR_VAL(&response);
-	} else {
-		phpstr_dtor(&response);
-		RETURN_NULL();
+		RETURN_RESPONSE_OR_BODY(response);
 	}
+	phpstr_dtor(&response);
+	RETURN_FALSE;
 }
 /* }}} */
 #endif /* HTTP_HAVE_CURL */