/* $Id$ */
-#define _WINSOCKAPI_
-#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
-
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include "php.h"
#include "php_http.h"
+#include "php_http_std_defs.h"
#include "php_http_api.h"
+#include "php_http_cache_api.h"
#include "php_http_curl_api.h"
-#include "php_http_std_defs.h"
+#include "php_http_date_api.h"
+#include "php_http_headers_api.h"
+#include "php_http_send_api.h"
+#include "php_http_url_api.h"
-#include "ext/standard/php_smart_str.h"
+#include "php_http_message_object.h"
+#include "php_http_response_object.h"
+#include "php_http_request_object.h"
+#include "php_http_exception_object.h"
#ifdef ZEND_ENGINE_2
-/* {{{ HTTPi_Response */
+/* {{{ HttpResponse */
-/* {{{ proto void HTTPi_Response::__construct(bool cache, bool gzip)
+/* {{{ proto void HttpResponse::__construct(bool cache, bool gzip)
*
- * Instantiates a new HTTPi_Response object, which can be used to send
+ * Instantiates a new HttpResponse object, which can be used to send
* any data/resource/file to an HTTP client with caching and multiple
* ranges/resuming support.
*
* NOTE: GZIPping is not implemented yet.
*/
-PHP_METHOD(HTTPi_Response, __construct)
+PHP_METHOD(HttpResponse, __construct)
{
zend_bool do_cache = 0, do_gzip = 0;
- getObject(httpi_response_object, obj);
+ getObject(http_response_object, obj);
- if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|bb", &do_cache, &do_gzip)) {
- // throw exception
- return;
+ SET_EH_THROW_HTTP();
+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|bb", &do_cache, &do_gzip)) {
+ UPD_PROP(obj, long, cache, do_cache);
+ UPD_PROP(obj, long, gzip, do_gzip);
}
-
- UPD_PROP(obj, long, cache, do_cache);
- UPD_PROP(obj, long, gzip, do_gzip);
+ SET_EH_NORMAL();
}
/* }}} */
-/* {{{ proto bool HTTPi_Response::setCache(bool cache)
+/* {{{ proto bool HttpResponse::setCache(bool cache)
*
* Whether it sould be attempted to cache the entitity.
* This will result in necessary caching headers and checks of clients
* NOTE: If you're using sessions, be shure that you set session.cache_limiter
* to something more appropriate than "no-cache"!
*/
-PHP_METHOD(HTTPi_Response, setCache)
+PHP_METHOD(HttpResponse, setCache)
{
zend_bool do_cache = 0;
- getObject(httpi_response_object, obj);
+ getObject(http_response_object, obj);
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "b", &do_cache)) {
RETURN_FALSE;
}
/* }}} */
-/* {{{ proto bool HTTPi_Response::getCache()
+/* {{{ proto bool HttpResponse::getCache()
*
* Get current caching setting.
*/
-PHP_METHOD(HTTPi_Response, getCache)
+PHP_METHOD(HttpResponse, getCache)
{
zval *do_cache = NULL;
- getObject(httpi_response_object, obj);
+ getObject(http_response_object, obj);
NO_ARGS;
}
/* }}}*/
-/* {{{ proto bool HTTPi_Response::setGzip(bool gzip)
+/* {{{ proto bool HttpResponse::setGzip(bool gzip)
*
* Enable on-thy-fly gzipping of the sent entity. NOT IMPLEMENTED YET.
*/
-PHP_METHOD(HTTPi_Response, setGzip)
+PHP_METHOD(HttpResponse, setGzip)
{
zend_bool do_gzip = 0;
- getObject(httpi_response_object, obj);
+ getObject(http_response_object, obj);
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "b", &do_gzip)) {
RETURN_FALSE;
}
/* }}} */
-/* {{{ proto bool HTTPi_Response::getGzip()
+/* {{{ proto bool HttpResponse::getGzip()
*
* Get current gzipping setting.
*/
-PHP_METHOD(HTTPi_Response, getGzip)
+PHP_METHOD(HttpResponse, getGzip)
{
zval *do_gzip = NULL;
- getObject(httpi_response_object, obj);
+ getObject(http_response_object, obj);
NO_ARGS;
}
/* }}} */
-/* {{{ proto bool HTTPi_Response::setCacheControl(string control[, bool raw = false])
+/* {{{ proto bool HttpResponse::setCacheControl(string control[, bool raw = false])
*
* Set a custom cache-control header, usually being "private" or "public"; if
* $raw is set to true the header will be sent as-is.
*/
-PHP_METHOD(HTTPi_Response, setCacheControl)
+PHP_METHOD(HttpResponse, setCacheControl)
{
char *ccontrol;
int cc_len;
zend_bool raw = 0;
- getObject(httpi_response_object, obj);
+ getObject(http_response_object, obj);
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|b", &ccontrol, &cc_len, &raw)) {
RETURN_FALSE;
}
/* }}} */
-/* {{{ proto string HTTPi_Response::getCacheControl()
+/* {{{ proto string HttpResponse::getCacheControl()
*
* Get current Cache-Control header setting.
*/
-PHP_METHOD(HTTPi_Response, getCacheControl)
+PHP_METHOD(HttpResponse, getCacheControl)
{
zval *ccontrol;
- getObject(httpi_response_object, obj);
+ getObject(http_response_object, obj);
NO_ARGS;
}
/* }}} */
-/* {{{ proto bool HTTPi_Response::setContentType(string content_type)
+/* {{{ proto bool HttpResponse::setContentType(string content_type)
*
* Set the content-type of the sent entity.
*/
-PHP_METHOD(HTTPi_Response, setContentType)
+PHP_METHOD(HttpResponse, setContentType)
{
char *ctype;
int ctype_len;
- getObject(httpi_response_object, obj);
+ getObject(http_response_object, obj);
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &ctype, &ctype_len)) {
RETURN_FALSE;
}
/* }}} */
-/* {{{ proto string HTTPi_Response::getContentType()
+/* {{{ proto string HttpResponse::getContentType()
*
* Get current Content-Type header setting.
*/
-PHP_METHOD(HTTPi_Response, getContentType)
+PHP_METHOD(HttpResponse, getContentType)
{
zval *ctype;
- getObject(httpi_response_object, obj);
+ getObject(http_response_object, obj);
NO_ARGS;
}
/* }}} */
-/* {{{ proto bool HTTPi_Response::setContentDisposition(string filename[, bool inline = false])
+/* {{{ proto bool HttpResponse::setContentDisposition(string filename[, bool inline = false])
*
* Set the Content-Disposition of the sent entity. This setting aims to suggest
* the receiveing user agent how to handle the sent entity; usually the client
* will show the user a "Save As..." popup.
*/
-PHP_METHOD(HTTPi_Response, setContentDisposition)
+PHP_METHOD(HttpResponse, setContentDisposition)
{
char *file;
int file_len;
zend_bool is_inline = 0;
- getObject(httpi_response_object, obj);
+ getObject(http_response_object, obj);
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|b", &file, &file_len, &is_inline)) {
RETURN_FALSE;
}
/* }}} */
-/* {{{ proto array HTTPi_Response::getContentDisposition()
+/* {{{ proto array HttpResponse::getContentDisposition()
*
* Get current Content-Disposition setting.
* Will return an associative array like:
* )
* </pre>
*/
-PHP_METHOD(HTTPi_Response, getContentDisposition)
+PHP_METHOD(HttpResponse, getContentDisposition)
{
zval *file;
zval *is_inline;
- getObject(httpi_response_object, obj);
+ getObject(http_response_object, obj);
if (ZEND_NUM_ARGS()) {
WRONG_PARAM_COUNT;
}
/* }}} */
-/* {{{ proto bool HTTPi_Response::setETag(string etag)
+/* {{{ proto bool HttpResponse::setETag(string etag)
*
* Set a custom ETag. Use this only if you know what you're doing.
*/
-PHP_METHOD(HTTPi_Response, setETag)
+PHP_METHOD(HttpResponse, setETag)
{
char *etag;
int etag_len;
- getObject(httpi_response_object, obj);
+ getObject(http_response_object, obj);
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &etag, &etag_len)) {
RETURN_FALSE;
}
/* }}} */
-/* {{{ proto string HTTPi_Response::getETag()
+/* {{{ proto string HttpResponse::getETag()
*
* Get the previously set custom ETag.
*/
-PHP_METHOD(HTTPi_Response, getETag)
+PHP_METHOD(HttpResponse, getETag)
{
zval *etag;
- getObject(httpi_response_object, obj);
+ getObject(http_response_object, obj);
NO_ARGS;
}
/* }}} */
-/* {{{ proto bool HTTPi_Response::setData(string data)
+/* {{{ proto bool HttpResponse::setData(string data)
*
* Set the data to be sent.
*/
-PHP_METHOD(HTTPi_Response, setData)
+PHP_METHOD(HttpResponse, setData)
{
zval *the_data;
- getObject(httpi_response_object, obj);
+ getObject(http_response_object, obj);
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &the_data)) {
RETURN_FALSE;
}
/* }}} */
-/* {{{ proto string HTTPi_Response::getData()
+/* {{{ proto string HttpResponse::getData()
*
* Get the previously set data to be sent.
*/
-PHP_METHOD(HTTPi_Response, getData)
+PHP_METHOD(HttpResponse, getData)
{
zval *the_data;
- getObject(httpi_response_object, obj);
+ getObject(http_response_object, obj);
NO_ARGS;
}
/* }}} */
-/* {{{ proto bool HTTPi_Response::setStream(resource stream)
+/* {{{ proto bool HttpResponse::setStream(resource stream)
*
* Set the resource to be sent.
*/
-PHP_METHOD(HTTPi_Response, setStream)
+PHP_METHOD(HttpResponse, setStream)
{
zval *the_stream;
php_stream *the_real_stream;
- getObject(httpi_response_object, obj);
+ getObject(http_response_object, obj);
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &the_stream)) {
RETURN_FALSE;
}
/* }}} */
-/* {{{ proto resource HTTPi_Response::getStream()
+/* {{{ proto resource HttpResponse::getStream()
*
* Get the previously set resource to be sent.
*/
-PHP_METHOD(HTTPi_Response, getStream)
+PHP_METHOD(HttpResponse, getStream)
{
zval *the_stream;
- getObject(httpi_response_object, obj);
+ getObject(http_response_object, obj);
NO_ARGS;
}
/* }}} */
-/* {{{ proto bool HTTPi_Response::setFile(string file)
+/* {{{ proto bool HttpResponse::setFile(string file)
*
* Set the file to be sent.
*/
-PHP_METHOD(HTTPi_Response, setFile)
+PHP_METHOD(HttpResponse, setFile)
{
zval *the_file;
- getObject(httpi_response_object, obj);
+ getObject(http_response_object, obj);
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &the_file)) {
RETURN_FALSE;
}
/* }}} */
-/* {{{ proto string HTTPi_Response::getFile()
+/* {{{ proto string HttpResponse::getFile()
*
* Get the previously set file to be sent.
*/
-PHP_METHOD(HTTPi_Response, getFile)
+PHP_METHOD(HttpResponse, getFile)
{
zval *the_file;
- getObject(httpi_response_object, obj);
+ getObject(http_response_object, obj);
NO_ARGS;
}
/* }}} */
-/* {{{ proto bool HTTPi_Response::send()
+/* {{{ proto bool HttpResponse::send()
*
* Finally send the entity.
*
* Example:
* <pre>
* <?php
- * $r = new HTTPi_Response(true);
+ * $r = new HttpResponse(true);
* $r->setFile('../hidden/contract.pdf');
* $r->setContentType('application/pdf');
* $r->send();
* </pre>
*
*/
-PHP_METHOD(HTTPi_Response, send)
+PHP_METHOD(HttpResponse, send)
{
zval *do_cache, *do_gzip;
- getObject(httpi_response_object, obj);
+ getObject(http_response_object, obj);
NO_ARGS;
do_cache = GET_PROP(obj, cache);
do_gzip = GET_PROP(obj, gzip);
+ /* gzip */
+ if (Z_LVAL_P(do_gzip)) {
+ php_start_ob_buffer_named("ob_gzhandler", 0, 1 TSRMLS_CC);
+ }
+
/* caching */
if (Z_LVAL_P(do_cache)) {
zval *cctrl, *etag, *lmod, *ccraw;
}
}
- /* gzip */
- if (Z_LVAL_P(do_gzip)) {
- /* ... */
- }
-
/* content type */
{
zval *ctype = GET_PROP(obj, contentType);
zval *dispo_file = GET_PROP(obj, dispoFile);
if (Z_STRLEN_P(dispo_file)) {
zval *dispo_inline = GET_PROP(obj, dispoInline);
- http_send_content_disposition(Z_STRVAL_P(dispo_file), Z_STRLEN_P(dispo_file), Z_LVAL_P(dispo_inline));
+ http_send_content_disposition(Z_STRVAL_P(dispo_file), Z_STRLEN_P(dispo_file), (zend_bool) Z_LVAL_P(dispo_inline));
}
}
/* }}} */
/* }}} */
-#ifdef HTTP_HAVE_CURL
-/* {{{ HTTPi_Request */
+/* {{{ HttpMessage */
-/* {{{ proto void HTTPi_Request::__construct([string url[, long request_method = HTTP_GET]])
+/* {{{ static HttpMessage HttpMessage::fromString(string raw_message)
*
- * Instantiate a new HTTPi_Request object which can be used to issue HEAD, GET
- * and POST (including posting files) HTTP requests.
+ * Create an HttpMessage object from a string.
*/
-PHP_METHOD(HTTPi_Request, __construct)
+PHP_METHOD(HttpMessage, fromString)
{
- char *URL = NULL;
- int URL_len;
- long meth = -1;
- getObject(httpi_request_object, obj);
+ char *string = NULL;
+ int length = 0;
+ http_message *msg = NULL;
+
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &string, &length)) {
+ RETURN_NULL();
+ }
+
+ if (!(msg = http_message_parse(string, length))) {
+ RETURN_NULL();
+ }
- if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sl", &URL, &URL_len, &meth)) {
+ Z_TYPE_P(return_value) = IS_OBJECT;
+ return_value->value.obj = http_message_object_from_msg(msg);
+}
+/* }}} */
+
+/* {{{ void HttpMessage::__construct([string raw_message])
+ *
+ * Instantiate a new HttpMessage object based on the optionally provided
+ * raw message. An HTTP Message can be either a response or a request.
+ */
+PHP_METHOD(HttpMessage, __construct)
+{
+ zval *message = NULL;
+ getObject(http_message_object, obj);
+
+ SET_EH_THROW_HTTP();
+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|z/", &message)) {
+ if (message) {
+ convert_to_string(message);
+ SET_PROP(obj, raw, message);
+ }
+ }
+ SET_EH_NORMAL();
+}
+/* }}} */
+
+/* {{{ void HttpMessage::setRaw(string raw_message)
+ *
+ * Parse a new raw message.
+ */
+PHP_METHOD(HttpMessage, setRaw)
+{
+ zval *message;
+ getObject(http_message_object, obj);
+
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z/", &message)) {
return;
}
- INIT_PARR(obj, options);
- INIT_PARR(obj, responseInfo);
- INIT_PARR(obj, responseData);
- INIT_PARR(obj, postData);
- INIT_PARR(obj, postFiles);
+ convert_to_string(message);
+ SET_PROP(obj, raw, message);
+}
+/* }}} */
+
+/* {{{ string HttpMessage::getBody()
+ *
+ * Get the body of the parsed Message.
+ */
+PHP_METHOD(HttpMessage, getBody)
+{
+ zval *body;
+ getObject(http_message_object, obj);
+
+ NO_ARGS;
+
+ body = GET_PROP(obj, body);
+ RETURN_STRINGL(Z_STRVAL_P(body), Z_STRLEN_P(body), 1);
+}
+/* }}} */
+
+/* {{{ array HttpMessage::getHeaders()
+ *
+ * Get Message Headers.
+ */
+PHP_METHOD(HttpMessage, getHeaders)
+{
+ zval *headers;
+ getObject(http_message_object, obj);
+
+ NO_ARGS;
- if (URL) {
- UPD_PROP(obj, string, url, URL);
+ headers = GET_PROP(obj, headers);
+ array_init(return_value);
+ array_copy(headers, return_value);
+}
+/* }}} */
+
+/* {{{ long HttpMessage::getType()
+ *
+ * Get Message Type. (HTTP_MSG_NONE|HTTP_MSG_REQUEST|HTTP_MSG_RESPONSE)
+ */
+PHP_METHOD(HttpMessage, getType)
+{
+ zval *type;
+ getObject(http_message_object, obj);
+
+ NO_ARGS;
+
+ type = GET_PROP(obj, type);
+ RETURN_LONG(Z_LVAL_P(type));
+}
+/* }}} */
+
+/* {{{ int HttpMessage::getResponseCode()
+ *
+ * Get the Response Code of the Message.
+ */
+PHP_METHOD(HttpMessage, getResponseCode)
+{
+ zval *status;
+ getObject(http_message_object, obj);
+
+ NO_ARGS;
+
+ if (obj->message->type != HTTP_MSG_RESPONSE) {
+ RETURN_NULL();
}
- if (meth > -1) {
- UPD_PROP(obj, long, method, meth);
+
+ status = GET_PROP(obj, responseCode);
+ RETURN_LONG(Z_LVAL_P(status));
+}
+/* }}} */
+
+/* {{{ string HttpMessage::getRequestMethod()
+ *
+ * Get the Request Method of the Message.
+ */
+PHP_METHOD(HttpMessage, getRequestMethod)
+{
+ zval *method;
+ getObject(http_message_object, obj);
+
+ NO_ARGS;
+
+ if (obj->message->type != HTTP_MSG_REQUEST) {
+ RETURN_NULL();
+ }
+
+ method = GET_PROP(obj, requestMethod);
+ RETURN_STRINGL(Z_STRVAL_P(method), Z_STRLEN_P(method), 1);
+}
+/* }}} */
+
+/* {{{ string HttpMessage::getRequestUri()
+ *
+ * Get the Request URI of the Message.
+ */
+PHP_METHOD(HttpMessage, getRequestUri)
+{
+ zval *uri;
+ getObject(http_message_object, obj);
+
+ NO_ARGS;
+
+ if (obj->message->type != HTTP_MSG_REQUEST) {
+ RETURN_NULL();
+ }
+
+ uri = GET_PROP(obj, requestUri);
+ RETURN_STRINGL(Z_STRVAL_P(uri), Z_STRLEN_P(uri), 1);
+}
+/* }}} */
+
+/* {{{ string HttpMessage::getHttpVersion()
+ *
+ * Get the HTTP Protocol Version of the Message.
+ */
+PHP_METHOD(HttpMessage, getHttpVersion)
+{
+ zval *version;
+ char ver[4] = {0};
+ getObject(http_message_object, obj);
+
+ NO_ARGS;
+
+ version = GET_PROP(obj, httpVersion);
+
+ if (Z_TYPE_P(version) == IS_NULL) {
+ RETURN_NULL();
+ }
+
+ sprintf(ver, "1.1f", Z_DVAL_P(version));
+ RETURN_STRINGL(ver, 3, 1);
+}
+/* }}} */
+
+/* {{{ string HttpMessage::toString()
+ *
+ * Get the string representation of the Message.
+ */
+PHP_METHOD(HttpMessage, toString)
+{
+ char *string;
+ size_t length;
+ getObject(http_message_object, obj);
+
+ NO_ARGS;
+
+ http_message_tostring(obj->message, &string, &length);
+ RETURN_STRINGL(string, length, 0);
+}
+/* }}} */
+
+/* }}} */
+
+#ifdef HTTP_HAVE_CURL
+/* {{{ HttpRequest */
+
+/* {{{ proto void HttpRequest::__construct([string url[, long request_method = HTTP_GET]])
+ *
+ * Instantiate a new HttpRequest object which can be used to issue HEAD, GET
+ * and POST (including posting files) HTTP requests.
+ */
+PHP_METHOD(HttpRequest, __construct)
+{
+ char *URL = NULL;
+ int URL_len;
+ long meth = -1;
+ getObject(http_request_object, obj);
+
+ SET_EH_THROW_HTTP();
+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sl", &URL, &URL_len, &meth)) {
+ INIT_PARR(obj, options);
+ INIT_PARR(obj, responseInfo);
+ INIT_PARR(obj, responseData);
+ INIT_PARR(obj, postData);
+ INIT_PARR(obj, postFiles);
+
+ if (URL) {
+ UPD_PROP(obj, string, url, URL);
+ }
+ if (meth > -1) {
+ UPD_PROP(obj, long, method, meth);
+ }
}
+ SET_EH_NORMAL();
}
/* }}} */
-/* {{{ proto void HTTPi_Request::__destruct()
+/* {{{ proto void HttpRequest::__destruct()
*
- * Destroys the HTTPi_Request object.
+ * Destroys the HttpRequest object.
*/
-PHP_METHOD(HTTPi_Request, __destruct)
+PHP_METHOD(HttpRequest, __destruct)
{
- getObject(httpi_request_object, obj);
+ getObject(http_request_object, obj);
NO_ARGS;
}
/* }}} */
-/* {{{ proto bool HTTPi_Request::setOptions(array options)
+/* {{{ proto bool HttpRequest::setOptions(array options)
*
* Set the request options to use. See http_get() for a full list of available options.
*/
-PHP_METHOD(HTTPi_Request, setOptions)
+PHP_METHOD(HttpRequest, setOptions)
{
char *key = NULL;
long idx = 0;
zval *opts, *old_opts, **opt;
- getObject(httpi_request_object, obj);
+ getObject(http_request_object, obj);
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/", &opts)) {
RETURN_FALSE;
}
/* }}} */
-/* {{{ proto array HTTPi_Request::getOptions()
+/* {{{ proto array HttpRequest::getOptions()
*
* Get current set options.
*/
-PHP_METHOD(HTTPi_Request, getOptions)
+PHP_METHOD(HttpRequest, getOptions)
{
zval *opts;
- getObject(httpi_request_object, obj);
+ getObject(http_request_object, obj);
NO_ARGS;
}
/* }}} */
-/* {{{ proto bool HTTPi_Request::setURL(string url)
+/* {{{ proto void HttpRequest::unsetOptions()
+ *
+ * Unset all options/headers/cookies.
+ */
+PHP_METHOD(HttpRequest, unsetOptions)
+{
+ getObject(http_request_object, obj);
+
+ NO_ARGS;
+
+ FREE_PARR(obj, options);
+ INIT_PARR(obj, options);
+}
+/* }}} */
+
+/* {{{ proto bool HttpRequest::setSslOptions(array options)
+ *
+ * Set additional SSL options.
+ */
+PHP_METHOD(HttpRequest, setSslOptions)
+{
+ zval *opts, *old_opts, **ssl_options;
+ getObject(http_request_object, obj);
+
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/", &opts)) {
+ RETURN_FALSE;
+ }
+
+ old_opts = GET_PROP(obj, options);
+
+ if (SUCCESS == zend_hash_find(Z_ARRVAL_P(old_opts), "ssl", sizeof("ssl"), (void **) &ssl_options)) {
+ array_merge(opts, *ssl_options);
+ } else {
+ zval_add_ref(&opts);
+ add_assoc_zval(old_opts, "ssl", opts);
+ }
+
+ RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto array HttpRequest::getSslOtpions()
+ *
+ * Get previously set SSL options.
+ */
+PHP_METHOD(HttpRequest, getSslOptions)
+{
+ zval *opts, **ssl_options;
+ getObject(http_request_object, obj);
+
+ NO_ARGS;
+
+ opts = GET_PROP(obj, options);
+
+ array_init(return_value);
+
+ if (SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), "ssl", sizeof("ssl"), (void **) &ssl_options)) {
+ array_copy(*ssl_options, return_value);
+ }
+}
+/* }}} */
+
+/* {{{ proto void HttpRequest::unsetSslOptions()
+ *
+ * Unset previously set SSL options.
+ */
+PHP_METHOD(HttpRequest, unsetSslOptions)
+{
+ zval *opts;
+ getObject(http_request_object, obj);
+
+ NO_ARGS;
+
+ opts = GET_PROP(obj, options);
+ zend_hash_del(Z_ARRVAL_P(opts), "ssl", sizeof("ssl"));
+}
+/* }}} */
+
+/* {{{ proto bool HttpRequest::addHeaders(array headers)
+ *
+ * Add request header name/value pairs.
+ */
+PHP_METHOD(HttpRequest, addHeaders)
+{
+ zval *opts, **headers, *new_headers;
+ getObject(http_request_object, obj);
+
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/", &new_headers)) {
+ RETURN_FALSE;
+ }
+
+ opts = GET_PROP(obj, options);
+
+ if (SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), "headers", sizeof("headers"), (void **) &headers)) {
+ array_merge(new_headers, *headers);
+ } else {
+ zval_add_ref(&new_headers);
+ add_assoc_zval(opts, "headers", new_headers);
+ }
+
+ RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto array HttpRequest::getHeaders()
+ *
+ * Get previously set request headers.
+ */
+PHP_METHOD(HttpRequest, getHeaders)
+{
+ zval *opts, **headers;
+ getObject(http_request_object, obj);
+
+ NO_ARGS;
+
+ opts = GET_PROP(obj, options);
+
+ array_init(return_value);
+
+ if (SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), "headers", sizeof("headers"), (void **) &headers)) {
+ array_copy(*headers, return_value);
+ }
+}
+/* }}} */
+
+/* {{{ proto void HttpRequest::unsetHeaders()
+ *
+ * Unset previously set request headers.
+ */
+PHP_METHOD(HttpRequest, unsetHeaders)
+{
+ zval *opts;
+ getObject(http_request_object, obj);
+
+ NO_ARGS;
+
+ opts = GET_PROP(obj, options);
+ zend_hash_del(Z_ARRVAL_P(opts), "headers", sizeof("headers"));
+}
+/* }}} */
+
+/* {{{ proto bool HttpRequest::addCookies(array cookies)
+ *
+ * Add cookies.
+ */
+PHP_METHOD(HttpRequest, addCookies)
+{
+ zval *opts, **cookies, *new_cookies;
+ getObject(http_request_object, obj);
+
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/", &new_cookies)) {
+ RETURN_FALSE;
+ }
+
+ opts = GET_PROP(obj, options);
+
+ if (SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), "cookies", sizeof("cookies"), (void **) &cookies)) {
+ array_merge(new_cookies, *cookies);
+ } else {
+ zval_add_ref(&new_cookies);
+ add_assoc_zval(opts, "cookies", new_cookies);
+ }
+
+ RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto array HttpRequest::getCookies()
+ *
+ * Get previously set cookies.
+ */
+PHP_METHOD(HttpRequest, getCookies)
+{
+ zval *opts, **cookies;
+ getObject(http_request_object, obj);
+
+ NO_ARGS;
+
+ opts = GET_PROP(obj, options);
+
+ array_init(return_value);
+
+ if (SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), "cookies", sizeof("cookies"), (void **) &cookies)) {
+ array_copy(*cookies, return_value);
+ }
+}
+/* }}} */
+
+/* {{{ proto void HttpRequest::unsetCookies()
+ *
+ */
+PHP_METHOD(HttpRequest, unsetCookies)
+{
+ zval *opts;
+ getObject(http_request_object, obj);
+
+ NO_ARGS;
+
+ opts = GET_PROP(obj, options);
+ zend_hash_del(Z_ARRVAL_P(opts), "cookies", sizeof("cookies"));
+}
+/* }}} */
+
+/* {{{ proto bool HttpRequest::setURL(string url)
*
* Set the request URL.
*/
-PHP_METHOD(HTTPi_Request, setURL)
+PHP_METHOD(HttpRequest, setURL)
{
char *URL = NULL;
int URL_len;
- getObject(httpi_request_object, obj);
+ getObject(http_request_object, obj);
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &URL, &URL_len)) {
RETURN_FALSE;
}
/* }}} */
-/* {{{ proto string HTTPi_Request::getUrl()
+/* {{{ proto string HttpRequest::getUrl()
*
* Get the previously set request URL.
*/
-PHP_METHOD(HTTPi_Request, getURL)
+PHP_METHOD(HttpRequest, getURL)
{
zval *URL;
- getObject(httpi_request_object, obj);
+ getObject(http_request_object, obj);
NO_ARGS;
}
/* }}} */
-/* {{{ proto bool HTTPi_Request::setMethod(long request_method)
+/* {{{ proto bool HttpRequest::setMethod(long request_method)
*
* Set the request methods; one of the <tt>HTTP_HEAD</tt>, <tt>HTTP_GET</tt> or
* <tt>HTTP_POST</tt> constants.
*/
-PHP_METHOD(HTTPi_Request, setMethod)
+PHP_METHOD(HttpRequest, setMethod)
{
long meth;
- getObject(httpi_request_object, obj);
+ getObject(http_request_object, obj);
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &meth)) {
RETURN_FALSE;
}
/* }}} */
-/* {{{ proto long HTTPi_Request::getMethod()
+/* {{{ proto long HttpRequest::getMethod()
*
* Get the previously set request method.
*/
-PHP_METHOD(HTTPi_Request, getMethod)
+PHP_METHOD(HttpRequest, getMethod)
{
zval *meth;
- getObject(httpi_request_object, obj);
+ getObject(http_request_object, obj);
NO_ARGS;
}
/* }}} */
-/* {{{ proto bool HTTPi_Request::setContentType(string content_type)
+/* {{{ proto bool HttpRequest::setContentType(string content_type)
*
* Set the content type the post request should have.
* Use this only if you know what you're doing.
*/
-PHP_METHOD(HTTPi_Request, setContentType)
+PHP_METHOD(HttpRequest, setContentType)
{
char *ctype;
int ct_len;
- getObject(httpi_request_object, obj);
+ getObject(http_request_object, obj);
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &ctype, &ct_len)) {
RETURN_FALSE;
}
/* }}} */
-/* {{{ proto string HTTPi_Request::getContentType()
+/* {{{ proto string HttpRequest::getContentType()
*
* Get the previously content type.
*/
-PHP_METHOD(HTTPi_Request, getContentType)
+PHP_METHOD(HttpRequest, getContentType)
{
zval *ctype;
- getObject(httpi_request_object, obj);
+ getObject(http_request_object, obj);
NO_ARGS;
}
/* }}} */
-/* {{{ proto bool HTTPi_Request::setQueryData(mixed query_data)
+/* {{{ proto bool HttpRequest::setQueryData(mixed query_data)
*
* Set the URL query parameters to use.
* Overwrites previously set query parameters.
* Affects any request types.
*/
-PHP_METHOD(HTTPi_Request, setQueryData)
+PHP_METHOD(HttpRequest, setQueryData)
{
zval *qdata;
char *query_data = NULL;
- getObject(httpi_request_object, obj);
+ getObject(http_request_object, obj);
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &qdata)) {
RETURN_FALSE;
}
/* }}} */
-/* {{{ proto string HTTPi_Request::getQueryData()
+/* {{{ proto string HttpRequest::getQueryData()
*
* Get the current query data in form of an urlencoded query string.
*/
-PHP_METHOD(HTTPi_Request, getQueryData)
+PHP_METHOD(HttpRequest, getQueryData)
{
zval *qdata;
- getObject(httpi_request_object, obj);
+ getObject(http_request_object, obj);
NO_ARGS;
}
/* }}} */
-/* {{{ proto bool HTTPi_Request::addQueryData(array query_params)
+/* {{{ proto bool HttpRequest::addQueryData(array query_params)
*
* Add parameters to the query parameter list.
* Affects any request type.
*/
-PHP_METHOD(HTTPi_Request, addQueryData)
+PHP_METHOD(HttpRequest, addQueryData)
{
zval *qdata, *old_qdata;
char *query_data = NULL;
- getObject(httpi_request_object, obj);
+ getObject(http_request_object, obj);
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a", &qdata)) {
RETURN_FALSE;
}
/* }}} */
-/* {{{ proto void HTTPi_Request::unsetQueryData()
+/* {{{ proto void HttpRequest::unsetQueryData()
*
* Clean the query parameters.
* Affects any request type.
*/
-PHP_METHOD(HTTPi_Request, unsetQueryData)
+PHP_METHOD(HttpRequest, unsetQueryData)
{
- getObject(httpi_request_object, obj);
+ getObject(http_request_object, obj);
NO_ARGS;
}
/* }}} */
-/* {{{ proto bool HTTPi_Request::addPostData(array post_data)
+/* {{{ proto bool HttpRequest::addPostData(array post_data)
*
* Adds POST data entries.
* Affects only POST requests.
*/
-PHP_METHOD(HTTPi_Request, addPostData)
+PHP_METHOD(HttpRequest, addPostData)
{
zval *post, *post_data;
- getObject(httpi_request_object, obj);
+ getObject(http_request_object, obj);
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a", &post_data)) {
RETURN_FALSE;
}
/* }}} */
-/* {{{ proto bool HTTPi_Request::setPostData(array post_data)
+/* {{{ proto bool HttpRequest::setPostData(array post_data)
*
* Set the POST data entries.
* Overwrites previously set POST data.
* Affects only POST requests.
*/
-PHP_METHOD(HTTPi_Request, setPostData)
+PHP_METHOD(HttpRequest, setPostData)
{
zval *post, *post_data;
- getObject(httpi_request_object, obj);
+ getObject(http_request_object, obj);
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a", &post_data)) {
RETURN_FALSE;
}
/* }}}*/
-/* {{{ proto array HTTPi_Request::getPostData()
+/* {{{ proto array HttpRequest::getPostData()
*
* Get previously set POST data.
*/
-PHP_METHOD(HTTPi_Request, getPostData)
+PHP_METHOD(HttpRequest, getPostData)
{
zval *post_data;
- getObject(httpi_request_object, obj);
+ getObject(http_request_object, obj);
NO_ARGS;
}
/* }}} */
-/* {{{ proto void HTTPi_Request::unsetPostData()
+/* {{{ proto void HttpRequest::unsetPostData()
*
* Clean POST data entires.
* Affects only POST requests.
*/
-PHP_METHOD(HTTPi_Request, unsetPostData)
+PHP_METHOD(HttpRequest, unsetPostData)
{
zval *post_data;
- getObject(httpi_request_object, obj);
+ getObject(http_request_object, obj);
NO_ARGS;
}
/* }}} */
-/* {{{ proto bool HTTPi_Request::addPostFile(string name, string file[, string content_type = "application/x-octetstream"])
+/* {{{ proto bool HttpRequest::addPostFile(string name, string file[, string content_type = "application/x-octetstream"])
*
* Add a file to the POST request.
* Affects only POST requests.
*/
-PHP_METHOD(HTTPi_Request, addPostFile)
+PHP_METHOD(HttpRequest, addPostFile)
{
zval *files, *entry;
char *name, *file, *type = NULL;
int name_len, file_len, type_len = 0;
- getObject(httpi_request_object, obj);
+ getObject(http_request_object, obj);
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|s", &name, &name_len, &file, &file_len, &type, &type_len)) {
RETURN_FALSE;
}
/* }}} */
-/* {{{ proto array HTTPi_Request::getPostFiles()
+/* {{{ proto array HttpRequest::getPostFiles()
*
* Get all previously added POST files.
*/
-PHP_METHOD(HTTPi_Request, getPostFiles)
+PHP_METHOD(HttpRequest, getPostFiles)
{
zval *files;
- getObject(httpi_request_object, obj);
+ getObject(http_request_object, obj);
NO_ARGS;
}
/* }}} */
-/* {{{ proto void HTTPi_Request::unsetPostFiles()
+/* {{{ proto void HttpRequest::unsetPostFiles()
*
* Unset the POST files list.
* Affects only POST requests.
*/
-PHP_METHOD(HTTPi_Request, unsetPostFiles)
+PHP_METHOD(HttpRequest, unsetPostFiles)
{
zval *files;
- getObject(httpi_request_object, obj);
+ getObject(http_request_object, obj);
NO_ARGS;
}
/* }}} */
-/* {{{ proto array HTTPi_Request::getResponseData()
+/* {{{ proto array HttpRequest::getResponseData()
*
* Get all response data after the request has been sent.
*/
-PHP_METHOD(HTTPi_Request, getResponseData)
+PHP_METHOD(HttpRequest, getResponseData)
{
zval *data;
- getObject(httpi_request_object, obj);
+ getObject(http_request_object, obj);
NO_ARGS;
}
/* }}} */
-/* {{{ proto string HTTPi_Request::getResponseHeader([string name])
+/* {{{ proto mixed HttpRequest::getResponseHeader([string name])
*
* Get response header(s) after the request has been sent.
*/
-PHP_METHOD(HTTPi_Request, getResponseHeader)
+PHP_METHOD(HttpRequest, getResponseHeader)
{
zval *data, **headers, **header;
char *header_name = NULL;
int header_len = 0;
- getObject(httpi_response_object, obj);
+ getObject(http_response_object, obj);
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &header_name, &header_len)) {
RETURN_FALSE;
RETURN_FALSE;
}
}
+/* }}} */
-/* {{{ proto string HTTPi_Request::getResponseBody()
+/* {{{ proto array HttpRequest::getResponseCookie([string name])
+ *
+ * Get response cookie(s) after the request has been sent.
+ */
+PHP_METHOD(HttpRequest, getResponseCookie)
+{
+ zval *data, **headers;
+ char *cookie_name = NULL;
+ int cookie_len = 0;
+ getObject(http_request_object, obj);
+
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &cookie_name, &cookie_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)) {
+ ulong idx = 0;
+ char *key = NULL;
+ zval **header = NULL;
+
+ FOREACH_HASH_KEYVAL(Z_ARRVAL_PP(headers), key, idx, header) {
+ if (key && !strcasecmp(key, "Set-Cookie")) {
+ /* several cookies? */
+ if (Z_TYPE_PP(header) == IS_ARRAY) {
+ zval **cookie;
+
+ FOREACH_HASH_VAL(Z_ARRVAL_PP(header), cookie) {
+ zval *cookie_hash;
+ MAKE_STD_ZVAL(cookie_hash);
+ array_init(cookie_hash);
+
+ if (SUCCESS == http_parse_cookie(Z_STRVAL_PP(cookie), Z_ARRVAL_P(cookie_hash))) {
+ if (!cookie_len) {
+ add_next_index_zval(return_value, cookie_hash);
+ } else {
+ zval **name;
+
+ if ( (SUCCESS == zend_hash_find(Z_ARRVAL_P(cookie_hash), "name", sizeof("name"), (void **) &name)) &&
+ (!strcmp(Z_STRVAL_PP(name), cookie_name))) {
+ add_next_index_zval(return_value, cookie_hash);
+ return; /* <<< FOUND >>> */
+ } else {
+ zval_dtor(cookie_hash);
+ efree(cookie_hash);
+ }
+ }
+ } else {
+ zval_dtor(cookie_hash);
+ efree(cookie_hash);
+ }
+ }
+ } else {
+ zval *cookie_hash;
+ MAKE_STD_ZVAL(cookie_hash);
+ array_init(cookie_hash);
+
+ if (SUCCESS == http_parse_cookie(Z_STRVAL_PP(header), Z_ARRVAL_P(cookie_hash))) {
+ if (!cookie_len) {
+ add_next_index_zval(return_value, cookie_hash);
+ } else {
+ zval **name;
+
+ if ( (SUCCESS == zend_hash_find(Z_ARRVAL_P(cookie_hash), "name", sizeof("name"), (void **) &name)) &&
+ (!strcmp(Z_STRVAL_PP(name), cookie_name))) {
+ add_next_index_zval(return_value, cookie_hash);
+ } else {
+ zval_dtor(cookie_hash);
+ efree(cookie_hash);
+ }
+ }
+ } else {
+ zval_dtor(cookie_hash);
+ efree(cookie_hash);
+ }
+ }
+ break;
+ }
+ /* reset key */
+ key = NULL;
+ }
+ }
+}
+/* }}} */
+
+/* {{{ proto string HttpRequest::getResponseBody()
*
* Get the response body after the request has been sent.
*/
-PHP_METHOD(HTTPi_Request, getResponseBody)
+PHP_METHOD(HttpRequest, getResponseBody)
{
zval *data, **body;
- getObject(httpi_request_object, obj);
+ getObject(http_request_object, obj);
NO_ARGS;
}
/* }}} */
-/* {{{ proto int HTTPi_Request::getResponseCode()
+/* {{{ proto int HttpRequest::getResponseCode()
*
* Get the response code after the request has been sent.
*/
-PHP_METHOD(HTTPi_Request, getResponseCode)
+PHP_METHOD(HttpRequest, getResponseCode)
{
zval **code, **hdrs, *data;
- getObject(httpi_request_object, obj);
+ getObject(http_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))) {
+ (SUCCESS == zend_hash_find(Z_ARRVAL_PP(hdrs), "Response Status", sizeof("Response Status"), (void **) &code))) {
RETVAL_STRINGL(Z_STRVAL_PP(code), Z_STRLEN_PP(code), 1);
convert_to_long(return_value);
} else {
}
/* }}} */
-/* {{{ proto array HTTPi_Request::getResponseInfo([string name])
+/* {{{ proto array HttpRequest::getResponseInfo([string name])
*
* Get response info after the request has been sent.
* See http_get() for a full list of returned info.
*/
-PHP_METHOD(HTTPi_Request, getResponseInfo)
+PHP_METHOD(HttpRequest, getResponseInfo)
{
zval *info, **infop;
char *info_name = NULL;
int info_len = 0;
- getObject(httpi_request_object, obj);
+ getObject(http_request_object, obj);
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &info_name, &info_len)) {
RETURN_FALSE;
}
/* }}}*/
-/* {{{ proto bool HTTPi_Request::send()
+/* {{{ proto bool HttpRequest::send()
*
* Send the HTTP request.
*
* GET example:
* <pre>
* <?php
- * $r = new HTTPi_Request('http://example.com/feed.rss', HTTP_GET);
+ * $r = new HttpRequest('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) {
* POST example:
* <pre>
* <?php
- * $r = new HTTPi_Request('http://example.com/form.php', HTTP_POST);
+ * $r = new HttpRequest('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');
* ?>
* </pre>
*/
-PHP_METHOD(HTTPi_Request, send)
+PHP_METHOD(HttpRequest, send)
{
STATUS status = FAILURE;
zval *meth, *URL, *qdata, *opts, *info, *resp;
char *response_data, *request_uri;
size_t response_len;
- getObject(httpi_request_object, obj);
+ getObject(http_request_object, obj);
NO_ARGS;
+ SET_EH_THROW_HTTP();
+
if ((!obj->ch) && (!(obj->ch = curl_easy_init()))) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not initilaize cURL");
RETURN_FALSE;
efree(request_uri);
/* final data handling */
- if (status != SUCCESS) {
- RETURN_FALSE;
- } else {
+ if (status == SUCCESS) {
char *body = NULL;
size_t body_len = 0;
zval *zheaders;
RETURN_TRUE;
}
- /* */
+
+ SET_EH_NORMAL();
+ RETURN_SUCCESS(status);
}
/* }}} */
/* }}} */
projects / m6w6 / ext-http / blobdiff