X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_functions.c;h=f7ecd7af76f8b087e237c0e170db9d0c8a1f7eae;hb=9cffeb53e0c4b03192092d2f58965bb35f599cab;hp=aa495186e9b8aa72454214b188f4c762b0846bed;hpb=0acbfc76b5a3e4122a6d06d64bd834a810806656;p=m6w6%2Fext-http

diff --git a/http_functions.c b/http_functions.c
index aa49518..f7ecd7a 100644
--- a/http_functions.c
+++ b/http_functions.c
@@ -15,33 +15,30 @@
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
 #endif
-#include "php.h"
 
-#include "zend_operators.h"
+#define HTTP_WANT_CURL
+#include "php_http.h"
 
 #include "SAPI.h"
 #include "php_ini.h"
 #include "ext/standard/info.h"
 #include "ext/standard/php_string.h"
+#include "zend_operators.h"
+
 #if defined(HAVE_PHP_SESSION) && !defined(COMPILE_DL_SESSION)
 #	include "ext/session/php_session.h"
 #endif
 
-#include "php_http.h"
-#include "php_http_std_defs.h"
 #include "php_http_api.h"
-#include "php_http_request_api.h"
 #include "php_http_cache_api.h"
-#include "php_http_request_method_api.h"
-#include "php_http_request_api.h"
 #include "php_http_date_api.h"
+#include "php_http_encoding_api.h"
 #include "php_http_headers_api.h"
 #include "php_http_message_api.h"
+#include "php_http_request_api.h"
+#include "php_http_request_method_api.h"
 #include "php_http_send_api.h"
 #include "php_http_url_api.h"
-#include "php_http_encoding_api.h"
-
-#include "phpstr/phpstr.h"
 
 ZEND_EXTERN_MODULE_GLOBALS(http)
 
@@ -977,6 +974,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.
@@ -1066,11 +1082,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;
 }
 /* }}} */
 
@@ -1100,11 +1115,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;
 }
 /* }}} */
 
@@ -1140,11 +1154,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;
 }
 /* }}} */
 
@@ -1180,12 +1193,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;
 }
 /* }}} */
 
@@ -1231,12 +1244,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;
 }
 /* }}} */
 
@@ -1280,11 +1293,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 */