- implement feature request: 'bodyonly' request option;

[m6w6/ext-http] / http_functions.c

diff --git a/http_functions.c b/http_functions.c
index e731d9af041343c08112d467568f228d7d7a9f75..90350e2d23dec09c880fec6048522a0200ba5806 100644 (file)
--- 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,24 @@ 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); \
+                               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 +1081,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 +1114,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 +1153,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 +1192,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 +1243,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 +1292,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 */
@@ -1649,8 +1660,6 @@ PHP_FUNCTION(http_uncompress)
  *       and SSL requests can be issued 
  *  <li> HTTP_SUPPORT_ENCODINGS: whether ext/http was linked against zlib,
  *       and compressed HTTP responses can be decoded
- *  <li> HTTP_SUPPORT_MHASHETAGS: whether ext/http was linked against libmhash,
- *       and ETags can be generated with the available mhash algorithms
  *  <li> HTTP_SUPPORT_MAGICMIME: whether ext/http was linked against libmagic,
  *       and the HttpResponse::guessContentType() method is usable
  * </ul>