- implement feature request: 'bodyonly' request option;

  http_get(URL, array('bodyonly'=>1)) etc return only the response message body

diff --git a/http_functions.c b/http_functions.c
index c094e640a56d11c918ed9e4d3156492a1286f78f..90350e2d23dec09c880fec6048522a0200ba5806 100644 (file)
--- a/http_functions.c
+++ b/http_functions.c
@@ -974,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.
@@ -1063,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;
 }
 /* }}} */
 
@@ -1097,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;
 }
 /* }}} */
 
@@ -1137,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;
 }
 /* }}} */
 
@@ -1177,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;
 }
 /* }}} */
 
@@ -1228,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;
 }
 /* }}} */
 
@@ -1277,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 */

diff --git a/package2.xml b/package2.xml
index 358d5f3c61cd7c9c355ef7ba751490e78bf3f538..93e0a1a8a73d67b3413cd18ccf1e388fa66836f9 100644 (file)
--- a/package2.xml
+++ b/package2.xml
@@ -33,8 +33,8 @@ HttpUtil, HttpMessage, HttpRequest, HttpRequestPool; HttpResponse (PHP-5.1)
  </lead>
  <date>2005-00-00</date>
  <version>
-  <release>0.19.0</release>
-  <api>0.19.0</api>
+  <release>0.20.0</release>
+  <api>0.20.0</api>
  </version>
  <stability>
   <release>beta</release>
@@ -42,16 +42,7 @@ HttpUtil, HttpMessage, HttpRequest, HttpRequestPool; HttpResponse (PHP-5.1)
  </stability>
  <license>BSD, revised</license>
  <notes><![CDATA[
-+ Added http_negotiate_content_type()
-
-* Fixed bug in http_negotiate_*() when client sends spaces within accept headers
-
-- Removed support for etag hashing through libmhash
-- Removed HTTP_ETAG_* and HttpResponse::ETAG_* constants
-- Changed http.etag_mode INI setting to acccept a string specifying the
-  hash algorithm to use for generating etags.
-  CRC32, MD5 and SHA1 are available out of the box with MD5 being the default. 
-  If pecl/hash is available, any algorithm this extension provides can be used.
++ Added 'bodyonly' request option
 ]]></notes>
  <contents>
   <dir name="/">

diff --git a/php_http.h b/php_http.h
index 1801943a64d2488941343b6cb355c85d1e51bb38..8e724af7ba09dcd259b6d08f46754dcbcd4ece4c 100644 (file)
--- a/php_http.h
+++ b/php_http.h
@@ -15,7 +15,7 @@
 #ifndef PHP_EXT_HTTP_H
 #define PHP_EXT_HTTP_H
 
-#define PHP_EXT_HTTP_VERSION "0.19.0"
+#define PHP_EXT_HTTP_VERSION "0.20.0dev"
 
 #include "php.h"
 #include "php_http_std_defs.h"