* pre-include winsock2.h

[m6w6/ext-http] / http_methods.c

diff --git a/http_methods.c b/http_methods.c
index 45a5c61812816b6b983f639d74716bdcb66d742d..1365fcf4c6a15c7630908ecc1e6f91094e3cc6b1 100644 (file)
--- a/http_methods.c
+++ b/http_methods.c
@@ -15,9 +15,6 @@
 
 /* $Id$ */
 
-#define _WINSOCKAPI_
-#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
-
 #ifdef HAVE_CONFIG_H
 #      include "config.h"
 #endif
@@ -989,7 +986,7 @@ PHP_METHOD(HTTPi_Request, unsetPostFiles)
 
 /* {{{ proto array HTTPi_Request::getResponseData()
  *
- * Get all resposonse data after sending the request.
+ * Get all response data after the request has been sent.
  */
 PHP_METHOD(HTTPi_Request, getResponseData)
 {
@@ -1004,28 +1001,39 @@ PHP_METHOD(HTTPi_Request, getResponseData)
 }
 /* }}} */
 
-/* {{{ proto array HTTPi_Request::getResponseHeaders()
+/* {{{ proto string HTTPi_Request::getResponseHeader([string name])
  *
- * Get the response headers after sending the request.
+ * Get response header(s) after the request has been sent.
  */
-PHP_METHOD(HTTPi_Request, getResponseHeaders)
+PHP_METHOD(HTTPi_Request, getResponseHeader)
 {
-       zval *data, **headers;
-       getObject(httpi_request_object, obj);
+       zval *data, **headers, **header;
+       char *header_name = NULL;
+       int header_len = 0;
+       getObject(httpi_response_object, obj);
 
-       NO_ARGS;
+       if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &header_name, &header_len)) {
+               RETURN_FALSE;
+       }
 
-       array_init(return_value);
        data = GET_PROP(obj, responseData);
-       if (SUCCESS == zend_hash_find(Z_ARRVAL_P(data), "headers", sizeof("headers"), (void **) &headers)) {
+       if (SUCCESS != zend_hash_find(Z_ARRVAL_P(data), "headers", sizeof("headers"), (void **) &headers)) {
+               RETURN_FALSE;
+       }
+
+       if (!header_len || !header_name) {
+               array_init(return_value);
                array_copy(*headers, return_value);
+       } else if (SUCCESS == zend_hash_find(Z_ARRVAL_PP(headers), pretty_key(header_name, header_len, 1, 1), header_len + 1, (void **) &header)) {
+               RETURN_STRINGL(Z_STRVAL_PP(header), Z_STRLEN_PP(header), 1);
+       } else {
+               RETURN_FALSE;
        }
 }
-/* }}} */
 
 /* {{{ proto string HTTPi_Request::getResponseBody()
  *
- * Get the response body after sending the request.
+ * Get the response body after the request has been sent.
  */
 PHP_METHOD(HTTPi_Request, getResponseBody)
 {
@@ -1038,32 +1046,93 @@ PHP_METHOD(HTTPi_Request, getResponseBody)
        if (SUCCESS == zend_hash_find(Z_ARRVAL_P(data), "body", sizeof("body"), (void **) &body)) {
                RETURN_STRINGL(Z_STRVAL_PP(body), Z_STRLEN_PP(body), 1);
        } else {
-               Z_TYPE_P(return_value) = IS_NULL;
+               RETURN_FALSE;
+       }
+}
+/* }}} */
+
+/* {{{ proto int HTTPi_Request::getResponseCode()
+ *
+ * Get the response code after the request has been sent.
+ */
+PHP_METHOD(HTTPi_Request, getResponseCode)
+{
+       zval **code, **hdrs, *data;
+       getObject(httpi_request_object, obj);
+
+       NO_ARGS;
+
+       data = GET_PROP(obj, responseData);
+       if (    (SUCCESS == zend_hash_find(Z_ARRVAL_P(data), "headers", sizeof("headers"), (void **) &hdrs)) &&
+                       (SUCCESS == zend_hash_find(Z_ARRVAL_PP(hdrs), "Status", sizeof("Status"), (void **) &code))) {
+               RETVAL_STRINGL(Z_STRVAL_PP(code), Z_STRLEN_PP(code), 1);
+               convert_to_long(return_value);
+       } else {
+               RETURN_FALSE;
        }
 }
 /* }}} */
 
-/* {{{ proto array HTTPi_Request::getResponseInfo()
+/* {{{ proto array HTTPi_Request::getResponseInfo([string name])
  *
- * Get response info after sending the request.
+ * Get response info after the request has been sent.
  * See http_get() for a full list of returned info.
  */
 PHP_METHOD(HTTPi_Request, getResponseInfo)
 {
-       zval *info;
+       zval *info, **infop;
+       char *info_name = NULL;
+       int info_len = 0;
        getObject(httpi_request_object, obj);
 
-       NO_ARGS;
+       if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &info_name, &info_len)) {
+               RETURN_FALSE;
+       }
 
        info = GET_PROP(obj, responseInfo);
-       array_init(return_value);
-       array_copy(info, return_value);
+
+       if (info_len && info_name) {
+               if (SUCCESS == zend_hash_find(Z_ARRVAL_P(info), pretty_key(info_name, info_len, 0, 0), info_len + 1, (void **) &infop)) {
+                       RETURN_ZVAL(*infop, 1, ZVAL_PTR_DTOR);
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Could not find response info named %s", info_name);
+                       RETURN_FALSE;
+               }
+       } else {
+               array_init(return_value);
+               array_copy(info, return_value);
+       }
 }
 /* }}}*/
 
 /* {{{ proto bool HTTPi_Request::send()
  *
  * Send the HTTP request.
+ *
+ * GET example:
+ * <pre>
+ * <?php
+ * $r = new HTTPi_Request('http://example.com/feed.rss', HTTP_GET);
+ * $r->setOptions(array('lastmodified' => filemtime('local.rss')));
+ * $r->addQueryData(array('category' => 3));
+ * if ($r->send() && $r->getResponseCode() == 200) {
+ *     file_put_contents('local.rss', $r->getResponseBody());
+ * }
+ * ?>
+ * </pre>
+ *
+ * POST example:
+ * <pre>
+ * <?php
+ * $r = new HTTPi_Request('http://example.com/form.php', HTTP_POST);
+ * $r->setOptions(array('cookies' => array('lang' => 'de')));
+ * $r->addPostData(array('user' => 'mike', 'pass' => 's3c|r3t'));
+ * $r->addPostFile('image', 'profile.jpg', 'image/jpeg');
+ * if ($r->send()) {
+ *     echo $r->getResponseBody();
+ * }
+ * ?>
+ * </pre>
  */
 PHP_METHOD(HTTPi_Request, send)
 {