#endif
#include "php.h"
+#include "php_streams.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_request_api.h"
+#include "php_http_request_pool_api.h"
#include "php_http_date_api.h"
#include "php_http_headers_api.h"
#include "php_http_message_api.h"
#include "php_http_message_object.h"
#include "php_http_response_object.h"
#include "php_http_request_object.h"
+#include "php_http_requestpool_object.h"
#include "php_http_exception_object.h"
#ifdef ZEND_ENGINE_2
+#include "missing.h"
+
+ZEND_EXTERN_MODULE_GLOBALS(http)
+
/* {{{ HttpResponse */
/* {{{ proto void HttpResponse::__construct(bool cache, bool gzip)
*/
PHP_METHOD(HttpResponse, getCache)
{
- zval *do_cache = NULL;
- getObject(http_response_object, obj);
-
NO_ARGS;
- do_cache = GET_PROP(obj, cache);
- RETURN_BOOL(Z_LVAL_P(do_cache));
+ IF_RETVAL_USED {
+ zval *do_cache = NULL;
+ getObject(http_response_object, obj);
+
+ do_cache = GET_PROP(obj, cache);
+ RETURN_BOOL(Z_LVAL_P(do_cache));
+ }
}
/* }}}*/
*/
PHP_METHOD(HttpResponse, getGzip)
{
- zval *do_gzip = NULL;
- getObject(http_response_object, obj);
-
NO_ARGS;
- do_gzip = GET_PROP(obj, gzip);
- RETURN_BOOL(Z_LVAL_P(do_gzip));
+ IF_RETVAL_USED {
+ zval *do_gzip;
+ getObject(http_response_object, obj);
+
+ do_gzip = GET_PROP(obj, gzip);
+ RETURN_BOOL(Z_LVAL_P(do_gzip));
+ }
}
/* }}} */
*/
PHP_METHOD(HttpResponse, getCacheControl)
{
- zval *ccontrol;
- getObject(http_response_object, obj);
-
NO_ARGS;
- ccontrol = GET_PROP(obj, cacheControl);
- RETURN_STRINGL(Z_STRVAL_P(ccontrol), Z_STRLEN_P(ccontrol), 1);
+ IF_RETVAL_USED {
+ zval *ccontrol;
+ getObject(http_response_object, obj);
+
+ ccontrol = GET_PROP(obj, cacheControl);
+ RETURN_STRINGL(Z_STRVAL_P(ccontrol), Z_STRLEN_P(ccontrol), 1);
+ }
}
/* }}} */
*/
PHP_METHOD(HttpResponse, getContentType)
{
- zval *ctype;
- getObject(http_response_object, obj);
-
NO_ARGS;
- ctype = GET_PROP(obj, contentType);
- RETURN_STRINGL(Z_STRVAL_P(ctype), Z_STRLEN_P(ctype), 1);
+ IF_RETVAL_USED {
+ zval *ctype;
+ getObject(http_response_object, obj);
+
+ ctype = GET_PROP(obj, contentType);
+ RETURN_STRINGL(Z_STRVAL_P(ctype), Z_STRLEN_P(ctype), 1);
+ }
}
/* }}} */
*/
PHP_METHOD(HttpResponse, getContentDisposition)
{
- zval *file;
- zval *is_inline;
- getObject(http_response_object, obj);
+ NO_ARGS;
- if (ZEND_NUM_ARGS()) {
- WRONG_PARAM_COUNT;
- }
+ IF_RETVAL_USED {
+ zval *file, *is_inline;
+ getObject(http_response_object, obj);
- file = GET_PROP(obj, dispoFile);
- is_inline = GET_PROP(obj, dispoInline);
+ file = GET_PROP(obj, dispoFile);
+ is_inline = GET_PROP(obj, dispoInline);
- array_init(return_value);
- add_assoc_stringl(return_value, "filename", Z_STRVAL_P(file), Z_STRLEN_P(file), 1);
- add_assoc_bool(return_value, "inline", Z_LVAL_P(is_inline));
+ array_init(return_value);
+ add_assoc_stringl(return_value, "filename", Z_STRVAL_P(file), Z_STRLEN_P(file), 1);
+ add_assoc_bool(return_value, "inline", Z_LVAL_P(is_inline));
+ }
}
/* }}} */
*/
PHP_METHOD(HttpResponse, getETag)
{
- zval *etag;
- getObject(http_response_object, obj);
+ NO_ARGS;
+
+ IF_RETVAL_USED {
+ zval *etag;
+ getObject(http_response_object, obj);
+
+ etag = GET_PROP(obj, eTag);
+ RETURN_STRINGL(Z_STRVAL_P(etag), Z_STRLEN_P(etag), 1);
+ }
+}
+/* }}} */
+/* {{{ proto void HttpResponse::setThrottleDelay(double seconds)
+ *
+ */
+PHP_METHOD(HttpResponse, setThrottleDelay)
+{
+ double seconds;
+
+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "d", &seconds)) {
+ getObject(http_response_object, obj);
+
+ UPD_PROP(obj, double, throttleDelay, seconds);
+ }
+}
+/* }}} */
+
+/* {{{ proto double HttpResponse::getThrottleDelay()
+ *
+ */
+PHP_METHOD(HttpResponse, getThrottleDelay)
+{
+ NO_ARGS;
+
+ IF_RETVAL_USED {
+ zval *seconds;
+ getObject(http_response_object, obj);
+
+ seconds = GET_PROP(obj, throttleDelay);
+ RETURN_DOUBLE(Z_DVAL_P(seconds));
+ }
+}
+/* }}} */
+
+/* {{{ proto void HttpResponse::setSendBuffersize(long bytes)
+ *
+ */
+PHP_METHOD(HttpResponse, setSendBuffersize)
+{
+ long bytes;
+
+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &bytes)) {
+ getObject(http_response_object, obj);
+
+ UPD_PROP(obj, long, sendBuffersize, bytes);
+ }
+}
+/* }}} */
+
+/* {{{ proto long HttpResponse::getSendBuffersize()
+ *
+ */
+PHP_METHOD(HttpResponse, getSendBuffersize)
+{
NO_ARGS;
- etag = GET_PROP(obj, eTag);
- RETURN_STRINGL(Z_STRVAL_P(etag), Z_STRLEN_P(etag), 1);
+ IF_RETVAL_USED {
+ zval *bytes;
+ getObject(http_response_object, obj);
+
+ bytes = GET_PROP(obj, sendBuffersize);
+ RETURN_LONG(Z_LVAL_P(bytes));
+ }
}
/* }}} */
zval *the_data;
getObject(http_response_object, obj);
- if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &the_data)) {
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z/", &the_data)) {
RETURN_FALSE;
}
convert_to_string_ex(&the_data);
SET_PROP(obj, data, the_data);
- UPD_PROP(obj, long, lastModified, http_lmod(the_data, SEND_DATA));
+ UPD_PROP(obj, long, lastModified, http_last_modified(the_data, SEND_DATA));
UPD_PROP(obj, long, send_mode, SEND_DATA);
RETURN_TRUE;
}
*/
PHP_METHOD(HttpResponse, getData)
{
- zval *the_data;
- getObject(http_response_object, obj);
-
NO_ARGS;
- the_data = GET_PROP(obj, data);
- RETURN_STRINGL(Z_STRVAL_P(the_data), Z_STRLEN_P(the_data), 1);
+ IF_RETVAL_USED {
+ zval *the_data;
+ getObject(http_response_object, obj);
+
+ the_data = GET_PROP(obj, data);
+ RETURN_STRINGL(Z_STRVAL_P(the_data), Z_STRLEN_P(the_data), 1);
+ }
}
/* }}} */
php_stream_from_zval(the_real_stream, &the_stream);
SET_PROP(obj, stream, the_stream);
- UPD_PROP(obj, long, lastModified, http_lmod(the_real_stream, SEND_RSRC));
+ UPD_PROP(obj, long, lastModified, http_last_modified(the_real_stream, SEND_RSRC));
UPD_PROP(obj, long, send_mode, SEND_RSRC);
RETURN_TRUE;
}
*/
PHP_METHOD(HttpResponse, getStream)
{
- zval *the_stream;
- getObject(http_response_object, obj);
-
NO_ARGS;
- the_stream = GET_PROP(obj, stream);
- RETURN_RESOURCE(Z_LVAL_P(the_stream));
+ IF_RETVAL_USED {
+ zval *the_stream;
+ getObject(http_response_object, obj);
+
+ the_stream = GET_PROP(obj, stream);
+ RETURN_RESOURCE(Z_LVAL_P(the_stream));
+ }
}
/* }}} */
convert_to_string_ex(&the_file);
UPD_PROP(obj, string, file, Z_STRVAL_P(the_file));
- UPD_PROP(obj, long, lastModified, http_lmod(the_file, -1));
+ UPD_PROP(obj, long, lastModified, http_last_modified(the_file, -1));
UPD_PROP(obj, long, send_mode, -1);
RETURN_TRUE;
}
*/
PHP_METHOD(HttpResponse, getFile)
{
- zval *the_file;
- getObject(http_response_object, obj);
-
NO_ARGS;
- the_file = GET_PROP(obj, file);
- RETURN_STRINGL(Z_STRVAL_P(the_file), Z_STRLEN_P(the_file), 1);
+ IF_RETVAL_USED {
+ zval *the_file;
+ getObject(http_response_object, obj);
+
+ the_file = GET_PROP(obj, file);
+ RETURN_STRINGL(Z_STRVAL_P(the_file), Z_STRLEN_P(the_file), 1);
+ }
}
/* }}} */
-/* {{{ proto bool HttpResponse::send()
+/* {{{ proto bool HttpResponse::send([bool clean_ob = true])
*
* Finally send the entity.
*
*/
PHP_METHOD(HttpResponse, send)
{
+ zend_bool clean_ob = 1;
zval *do_cache, *do_gzip;
getObject(http_response_object, obj);
- NO_ARGS;
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &clean_ob)) {
+ RETURN_FALSE;
+ }
do_cache = GET_PROP(obj, cache);
do_gzip = GET_PROP(obj, gzip);
+ if (clean_ob) {
+ /* interrupt on-the-fly etag generation */
+ HTTP_G(etag).started = 0;
+ /* discard previous output buffers */
+ php_end_ob_buffers(0 TSRMLS_CC);
+ }
+
/* 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)) {
+ char *cc_hdr;
+ int cc_len;
zval *cctrl, *etag, *lmod, *ccraw;
etag = GET_PROP(obj, eTag);
ccraw = GET_PROP(obj, raw_cache_header);
if (Z_LVAL_P(ccraw)) {
- http_cache_etag(Z_STRVAL_P(etag), Z_STRLEN_P(etag), Z_STRVAL_P(cctrl), Z_STRLEN_P(cctrl));
- http_cache_last_modified(Z_LVAL_P(lmod), Z_LVAL_P(lmod) ? Z_LVAL_P(lmod) : time(NULL), Z_STRVAL_P(cctrl), Z_STRLEN_P(cctrl));
+ cc_hdr = Z_STRVAL_P(cctrl);
+ cc_len = Z_STRLEN_P(cctrl);
} else {
char cc_header[42] = {0};
sprintf(cc_header, "%s, must-revalidate, max-age=0", Z_STRVAL_P(cctrl));
- http_cache_etag(Z_STRVAL_P(etag), Z_STRLEN_P(etag), cc_header, strlen(cc_header));
- http_cache_last_modified(Z_LVAL_P(lmod), Z_LVAL_P(lmod) ? Z_LVAL_P(lmod) : time(NULL), cc_header, strlen(cc_header));
+ cc_hdr = cc_header;
+ cc_len = Z_STRLEN_P(cctrl) + lenof(", must-revalidate, max-age=0");
}
+
+ http_cache_etag(Z_STRVAL_P(etag), Z_STRLEN_P(etag), cc_hdr, cc_len);
+ http_cache_last_modified(Z_LVAL_P(lmod), Z_LVAL_P(lmod) ? Z_LVAL_P(lmod) : time(NULL), cc_hdr, cc_len);
}
/* content type */
if (Z_STRLEN_P(ctype)) {
http_send_content_type(Z_STRVAL_P(ctype), Z_STRLEN_P(ctype));
} else {
- http_send_content_type("application/x-octetstream", sizeof("application/x-octetstream") - 1);
+ http_send_content_type("application/x-octetstream", lenof("application/x-octetstream"));
}
}
}
}
+ /* throttling */
+ {
+ zval *send_buffersize, *throttle_delay;
+ send_buffersize = GET_PROP(obj, sendBuffersize);
+ throttle_delay = GET_PROP(obj, throttleDelay);
+ HTTP_G(send).buffer_size = Z_LVAL_P(send_buffersize);
+ HTTP_G(send).throttle_delay = Z_DVAL_P(throttle_delay);
+ }
+
/* send */
{
zval *send_mode = GET_PROP(obj, send_mode);
/* {{{ HttpMessage */
-/* {{{ static HttpMessage HttpMessage::fromString(string raw_message)
+/* {{{ proto void HttpMessage::__construct([string message])
*
- * Create an HttpMessage object from a string.
- */
-PHP_METHOD(HttpMessage, fromString)
-{
- 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();
- }
-
- 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.
+ * Instantiate a new HttpMessage object.
*/
PHP_METHOD(HttpMessage, __construct)
{
- zval *message = NULL;
+ char *message = NULL;
+ int length = 0;
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);
+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &message, &length) && message && length) {
+ if (obj->message = http_message_parse(message, length)) {
+ if (obj->message->parent) {
+ obj->parent = http_message_object_from_msg(obj->message->parent);
+ }
}
+ } else if (!obj->message) {
+ obj->message = http_message_new();
}
SET_EH_NORMAL();
}
/* }}} */
-/* {{{ void HttpMessage::setRaw(string raw_message)
+/* {{{ proto static HttpMessage HttpMessage::fromString(string raw_message)
*
- * Parse a new raw message.
+ * Create an HttpMessage object from a string.
*/
-PHP_METHOD(HttpMessage, setRaw)
+PHP_METHOD(HttpMessage, fromString)
{
- zval *message;
- getObject(http_message_object, obj);
+ char *string = NULL;
+ int length = 0;
+ http_message *msg = NULL;
- if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z/", &message)) {
- return;
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &string, &length)) {
+ RETURN_NULL();
+ }
+
+ if (!(msg = http_message_parse(string, length))) {
+ RETURN_NULL();
}
- convert_to_string(message);
- SET_PROP(obj, raw, message);
+ Z_TYPE_P(return_value) = IS_OBJECT;
+ return_value->value.obj = http_message_object_from_msg(msg);
}
/* }}} */
-/* {{{ string HttpMessage::getBody()
+/* {{{ proto 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);
+ IF_RETVAL_USED {
+ getObject(http_message_object, obj);
+ RETURN_PHPSTR(&obj->message->body, PHPSTR_FREE_NOT, 1);
+ }
}
/* }}} */
-/* {{{ array HttpMessage::getHeaders()
+/* {{{ proto array HttpMessage::getHeaders()
*
* Get Message Headers.
*/
PHP_METHOD(HttpMessage, getHeaders)
{
- zval *headers;
- getObject(http_message_object, obj);
-
NO_ARGS;
- headers = GET_PROP(obj, headers);
- array_init(return_value);
- array_copy(headers, return_value);
+ IF_RETVAL_USED {
+ zval headers;
+ getObject(http_message_object, obj);
+
+ Z_ARRVAL(headers) = &obj->message->hdrs;
+ array_init(return_value);
+ array_copy(&headers, return_value);
+ }
}
/* }}} */
-/* {{{ void HttpMessage::setHeaders(array headers)
+/* {{{ proto void HttpMessage::setHeaders(array headers)
*
* Sets new headers.
*/
PHP_METHOD(HttpMessage, setHeaders)
{
- zval *headers;
+ zval *new_headers, old_headers;
getObject(http_message_object, obj);
- if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/", &headers)) {
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/", &new_headers)) {
return;
}
- SET_PROP(obj, headers, headers);
+ zend_hash_clean(&obj->message->hdrs);
+ Z_ARRVAL(old_headers) = &obj->message->hdrs;
+ array_copy(new_headers, &old_headers);
}
/* }}} */
-/* {{{ void HttpMessage::addHeaders(array headers[, bool append = false])
+/* {{{ proto void HttpMessage::addHeaders(array headers[, bool append = false])
*
* Add headers. If append is true, headers with the same name will be separated, else overwritten.
*/
PHP_METHOD(HttpMessage, addHeaders)
{
- zval *old_headers, *new_headers;
+ zval old_headers, *new_headers;
zend_bool append = 0;
getObject(http_message_object, obj);
return;
}
- old_headers = GET_PROP(obj, headers);
+ Z_ARRVAL(old_headers) = &obj->message->hdrs;
if (append) {
- array_append(new_headers, old_headers);
+ array_append(new_headers, &old_headers);
} else {
- array_merge(new_headers, old_headers);
+ array_merge(new_headers, &old_headers);
}
- SET_PROP(obj, headers, old_headers);
}
/* }}} */
-/* {{{ long HttpMessage::getType()
+/* {{{ proto 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));
+ IF_RETVAL_USED {
+ getObject(http_message_object, obj);
+ RETURN_LONG(obj->message->type);
+ }
}
/* }}} */
-/* {{{ void HttpMessage::setType(long type)
+/* {{{ proto void HttpMessage::setType(long type)
*
* Set Message Type. (HTTP_MSG_NONE|HTTP_MSG_REQUEST|HTTP_MSG_RESPONSE)
*/
{
long type;
getObject(http_message_object, obj);
-
+
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &type)) {
return;
}
- UPD_PROP(obj, long, type, type);
+ http_message_set_type(obj->message, type);
}
/* }}} */
-/* {{{ long HttpMessage::getResponseCode()
+/* {{{ proto long 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) {
- http_error(E_NOTICE, HTTP_E_MSG, "HttpMessage is not of type HTTP_MSG_RESPONSE");
- RETURN_NULL();
- }
+ IF_RETVAL_USED {
+ getObject(http_message_object, obj);
+
+ if (!HTTP_MSG_TYPE(RESPONSE, obj->message)) {
+ http_error(E_NOTICE, HTTP_E_MSG, "HttpMessage is not of type HTTP_MSG_RESPONSE");
+ RETURN_NULL();
+ }
- status = GET_PROP(obj, responseCode);
- RETURN_LONG(Z_LVAL_P(status));
+ RETURN_LONG(obj->message->info.response.code);
+ }
}
/* }}} */
-/* {{{ bool HttpMessage::setResponseCode(long code)
+/* {{{ proto bool HttpMessage::setResponseCode(long code)
*
* Set the response code of an HTTP Response Message.
- * Returns false if the Message is not of type HTTP_MSG_RESPONSE,
+ * Returns false if the Message is not of type HTTP_MSG_RESPONSE,
* or if the response code is out of range (100-510).
*/
PHP_METHOD(HttpMessage, setResponseCode)
long code;
getObject(http_message_object, obj);
- if (obj->message->type != HTTP_MSG_RESPONSE) {
+ if (!HTTP_MSG_TYPE(RESPONSE, obj->message)) {
http_error(E_WARNING, HTTP_E_MSG, "HttpMessage is not of type HTTP_MSG_RESPONSE");
RETURN_FALSE;
}
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &code)) {
RETURN_FALSE;
}
- if (code < 100 && code > 510) {
+ if (code < 100 || code > 510) {
http_error_ex(E_WARNING, HTTP_E_PARAM, "Invalid response code (100-510): %ld", code);
RETURN_FALSE;
}
- UPD_PROP(obj, long, responseCode, code);
+ obj->message->info.response.code = code;
RETURN_TRUE;
}
/* }}} */
-/* {{{ string HttpMessage::getRequestMethod()
+/* {{{ proto string HttpMessage::getRequestMethod()
*
* Get the Request Method of the Message.
* Returns false if the Message is not of type HTTP_MSG_REQUEST.
*/
PHP_METHOD(HttpMessage, getRequestMethod)
{
- zval *method;
- getObject(http_message_object, obj);
-
NO_ARGS;
- if (obj->message->type != HTTP_MSG_REQUEST) {
- http_error(E_NOTICE, HTTP_E_MSG, "HttpMessage is not of type HTTP_MSG_REQUEST");
- RETURN_NULL();
- }
+ IF_RETVAL_USED {
+ getObject(http_message_object, obj);
+
+ if (!HTTP_MSG_TYPE(REQUEST, obj->message)) {
+ http_error(E_NOTICE, HTTP_E_MSG, "HttpMessage is not of type HTTP_MSG_REQUEST");
+ RETURN_NULL();
+ }
- method = GET_PROP(obj, requestMethod);
- RETURN_STRINGL(Z_STRVAL_P(method), Z_STRLEN_P(method), 1);
+ RETURN_STRING(obj->message->info.request.method, 1);
+ }
}
/* }}} */
-/* {{{ bool HttpMessage::setRequestMethod(string method)
+/* {{{ proto bool HttpMessage::setRequestMethod(string method)
*
* Set the Request Method of the HTTP Message.
* Returns false if the Message is not of type HTTP_MSG_REQUEST.
int method_len;
getObject(http_message_object, obj);
- if (obj->message->type != HTTP_MSG_REQUEST) {
+ if (!HTTP_MSG_TYPE(REQUEST, obj->message)) {
http_error(E_WARNING, HTTP_E_MSG, "HttpMessage is not of type HTTP_MSG_REQUEST");
RETURN_FALSE;
}
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &method, &method_len)) {
RETURN_FALSE;
}
+ if (method_len < 1) {
+ http_error(E_WARNING, HTTP_E_PARAM, "Cannot set HttpMessage::requestMethod to an empty string");
+ RETURN_FALSE;
+ }
+ if (SUCCESS != http_check_method(method)) {
+ http_error_ex(E_WARNING, HTTP_E_PARAM, "Unkown request method: %s", method);
+ RETURN_FALSE;
+ }
- UPD_PROP(obj, string, requestMethod, method);
+ STR_SET(obj->message->info.request.method, estrndup(method, method_len));
RETURN_TRUE;
}
/* }}} */
-/* {{{ string HttpMessage::getRequestUri()
+/* {{{ proto 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();
- }
+ IF_RETVAL_USED {
+ getObject(http_message_object, obj);
+
+ if (!HTTP_MSG_TYPE(REQUEST, obj->message)) {
+ http_error(E_WARNING, HTTP_E_MSG, "HttpMessage is not of type HTTP_MSG_REQUEST");
+ RETURN_NULL();
+ }
- uri = GET_PROP(obj, requestUri);
- RETURN_STRINGL(Z_STRVAL_P(uri), Z_STRLEN_P(uri), 1);
+ RETURN_STRING(obj->message->info.request.URI, 1);
+ }
}
/* }}} */
-/* {{{ bool HttpMessage::setRequestUri(string URI)
+/* {{{ proto bool HttpMessage::setRequestUri(string URI)
*
* Set the Request URI of the HTTP Message.
* Returns false if the Message is not of type HTTP_MSG_REQUEST,
int URIlen;
getObject(http_message_object, obj);
- if (obj->message->type != HTTP_MSG_REQUEST) {
+ if (!HTTP_MSG_TYPE(REQUEST, obj->message)) {
http_error(E_WARNING, HTTP_E_MSG, "HttpMessage is not of type HTTP_MSG_REQUEST");
RETURN_FALSE;
}
RETURN_FALSE;
}
if (URIlen < 1) {
- http_error(E_WARNING, HTTP_E_PARAM, "Cannot set HttpMessage::requestMethod to an empty string");
+ http_error(E_WARNING, HTTP_E_PARAM, "Cannot set HttpMessage::requestUri to an empty string");
RETURN_FALSE;
}
- UPD_PROP(obj, string, requestUri, URI);
+ STR_SET(obj->message->info.request.URI, estrndup(URI, URIlen));
RETURN_TRUE;
}
/* }}} */
-/* {{{ string HttpMessage::getHttpVersion()
+/* {{{ proto 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_RETVAL_USED {
+ char ver[4] = {0};
+ float version;
+ getObject(http_message_object, obj);
- if (Z_TYPE_P(version) == IS_NULL) {
- RETURN_NULL();
- }
+ switch (obj->message->type)
+ {
+ case HTTP_MSG_RESPONSE:
+ version = obj->message->info.response.http_version;
+ break;
+
+ case HTTP_MSG_REQUEST:
+ version = obj->message->info.request.http_version;
+ break;
- sprintf(ver, "1.1f", Z_DVAL_P(version));
- RETURN_STRINGL(ver, 3, 1);
+ case HTTP_MSG_NONE:
+ default:
+ RETURN_NULL();
+ }
+ sprintf(ver, "%1.1f", version);
+ RETURN_STRINGL(ver, 3, 1);
+ }
}
/* }}} */
-/* {{{ bool HttpMessage::setHttpVersion(string version)
- *
+/* {{{ proto bool HttpMessage::setHttpVersion(string version)
+ *
* Set the HTTP Protocol version of the Message.
* Returns false if version is invalid (1.0 and 1.1).
*/
PHP_METHOD(HttpMessage, setHttpVersion)
{
- zval *v;
- zval *version;
+ char v[4];
+ zval *zv;
getObject(http_message_object, obj);
-
- if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &v)) {
+
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z/", &zv)) {
return;
}
- convert_to_string_ex(&v);
- if (strcmp(Z_STRVAL_P(v), "1.0") && strcmp(Z_STRVAL_P(v), "1.1")) {
- http_error_ex(E_WARNING, HTTP_E_PARAM, "Invalid HTTP version (1.0 or 1.1): %s", Z_STRVAL_P(v));
+ if (HTTP_MSG_TYPE(NONE, obj->message)) {
+ http_error(E_WARNING, HTTP_E_MSG, "Message is neither of type HTTP_MSG_RESPONSE nor HTTP_MSG_REQUEST");
+ RETURN_FALSE;
+ }
+
+ convert_to_double(zv);
+ sprintf(v, "%1.1f", Z_DVAL_P(zv));
+ if (strcmp(v, "1.0") && strcmp(v, "1.1")) {
+ http_error_ex(E_WARNING, HTTP_E_PARAM, "Invalid HTTP protocol version (1.0 or 1.1): %s", v);
RETURN_FALSE;
}
- convert_to_double_ex(&v);
- SET_PROP(obj, httpVersion, v);
+ if (HTTP_MSG_TYPE(RESPONSE, obj->message)) {
+ obj->message->info.response.http_version = (float) Z_DVAL_P(zv);
+ } else {
+ obj->message->info.request.http_version = (float) Z_DVAL_P(zv);
+ }
+ RETURN_TRUE;
}
/* }}} */
-/* {{{ string HttpMessage::toString()
+/* {{{ proto HttpMessage HttpMessage::getParentMessage()
*
- * Get the string representation of the Message.
+ * Get parent Message.
*/
-PHP_METHOD(HttpMessage, toString)
+PHP_METHOD(HttpMessage, getParentMessage)
+{
+ NO_ARGS;
+
+ IF_RETVAL_USED {
+ getObject(http_message_object, obj);
+
+ if (obj->message->parent) {
+ RETVAL_OBJVAL(obj->parent);
+ } else {
+ RETVAL_NULL();
+ }
+ }
+}
+/* }}} */
+
+/* {{{ proto bool HttpMessage::send()
+ *
+ * Send the Message according to its type as Response or Request.
+ */
+PHP_METHOD(HttpMessage, send)
{
- char *string;
- size_t length;
getObject(http_message_object, obj);
NO_ARGS;
- http_message_tostring(obj->message, &string, &length);
- RETURN_STRINGL(string, length, 0);
+ RETURN_SUCCESS(http_message_send(obj->message));
+}
+/* }}} */
+
+/* {{{ proto string HttpMessage::toString([bool include_parent = true])
+ *
+ * Get the string representation of the Message.
+ */
+PHP_METHOD(HttpMessage, toString)
+{
+ IF_RETVAL_USED {
+ char *string;
+ size_t length;
+ zend_bool include_parent = 1;
+ getObject(http_message_object, obj);
+
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &include_parent)) {
+ RETURN_FALSE;
+ }
+
+ if (include_parent) {
+ http_message_serialize(obj->message, &string, &length);
+ } else {
+ http_message_tostring(obj->message, &string, &length);
+ }
+ RETURN_STRINGL(string, length, 0);
+ }
}
/* }}} */
INIT_PARR(obj, options);
INIT_PARR(obj, responseInfo);
INIT_PARR(obj, responseData);
- INIT_PARR(obj, postData);
+ INIT_PARR(obj, postFields);
INIT_PARR(obj, postFiles);
if (URL) {
FREE_PARR(obj, options);
FREE_PARR(obj, responseInfo);
FREE_PARR(obj, responseData);
- FREE_PARR(obj, postData);
+ FREE_PARR(obj, postFields);
FREE_PARR(obj, postFiles);
}
/* }}} */
PHP_METHOD(HttpRequest, setOptions)
{
char *key = NULL;
- long idx = 0;
+ ulong idx = 0;
zval *opts, *old_opts, **opt;
getObject(http_request_object, obj);
*/
PHP_METHOD(HttpRequest, getOptions)
{
- zval *opts;
- getObject(http_request_object, obj);
-
NO_ARGS;
- opts = GET_PROP(obj, options);
- array_init(return_value);
- array_copy(opts, return_value);
+ IF_RETVAL_USED {
+ zval *opts;
+ getObject(http_request_object, obj);
+
+ opts = GET_PROP(obj, options);
+ array_init(return_value);
+ array_copy(opts, return_value);
+ }
}
/* }}} */
*/
PHP_METHOD(HttpRequest, getSslOptions)
{
- zval *opts, **ssl_options;
- getObject(http_request_object, obj);
-
NO_ARGS;
- opts = GET_PROP(obj, options);
+ IF_RETVAL_USED {
+ zval *opts, **ssl_options;
+ getObject(http_request_object, obj);
- array_init(return_value);
+ opts = GET_PROP(obj, options);
- if (SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), "ssl", sizeof("ssl"), (void **) &ssl_options)) {
- array_copy(*ssl_options, return_value);
+ 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);
+ }
}
}
/* }}} */
*/
PHP_METHOD(HttpRequest, getHeaders)
{
- zval *opts, **headers;
- getObject(http_request_object, obj);
-
NO_ARGS;
- opts = GET_PROP(obj, options);
+ IF_RETVAL_USED {
+ zval *opts, **headers;
+ getObject(http_request_object, obj);
- array_init(return_value);
+ opts = GET_PROP(obj, options);
- if (SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), "headers", sizeof("headers"), (void **) &headers)) {
- array_copy(*headers, return_value);
+ array_init(return_value);
+
+ if (SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), "headers", sizeof("headers"), (void **) &headers)) {
+ array_copy(*headers, return_value);
+ }
}
}
/* }}} */
*/
PHP_METHOD(HttpRequest, getCookies)
{
- zval *opts, **cookies;
- getObject(http_request_object, obj);
-
NO_ARGS;
- opts = GET_PROP(obj, options);
+ IF_RETVAL_USED {
+ zval *opts, **cookies;
+ getObject(http_request_object, obj);
- array_init(return_value);
+ opts = GET_PROP(obj, options);
- if (SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), "cookies", sizeof("cookies"), (void **) &cookies)) {
- array_copy(*cookies, return_value);
+ array_init(return_value);
+
+ if (SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), "cookies", sizeof("cookies"), (void **) &cookies)) {
+ array_copy(*cookies, return_value);
+ }
}
}
/* }}} */
*/
PHP_METHOD(HttpRequest, getURL)
{
- zval *URL;
- getObject(http_request_object, obj);
-
NO_ARGS;
- URL = GET_PROP(obj, url);
- RETURN_STRINGL(Z_STRVAL_P(URL), Z_STRLEN_P(URL), 1);
+ IF_RETVAL_USED {
+ zval *URL;
+ getObject(http_request_object, obj);
+
+ URL = GET_PROP(obj, url);
+ RETURN_STRINGL(Z_STRVAL_P(URL), Z_STRLEN_P(URL), 1);
+ }
}
/* }}} */
*/
PHP_METHOD(HttpRequest, getMethod)
{
- zval *meth;
- getObject(http_request_object, obj);
-
NO_ARGS;
- meth = GET_PROP(obj, method);
- RETURN_LONG(Z_LVAL_P(meth));
+ IF_RETVAL_USED {
+ zval *meth;
+ getObject(http_request_object, obj);
+
+ meth = GET_PROP(obj, method);
+ RETURN_LONG(Z_LVAL_P(meth));
+ }
}
/* }}} */
*/
PHP_METHOD(HttpRequest, getContentType)
{
- zval *ctype;
- getObject(http_request_object, obj);
-
NO_ARGS;
- ctype = GET_PROP(obj, contentType);
- RETURN_STRINGL(Z_STRVAL_P(ctype), Z_STRLEN_P(ctype), 1);
+ IF_RETVAL_USED {
+ zval *ctype;
+ getObject(http_request_object, obj);
+
+ ctype = GET_PROP(obj, contentType);
+ RETURN_STRINGL(Z_STRVAL_P(ctype), Z_STRLEN_P(ctype), 1);
+ }
}
/* }}} */
*/
PHP_METHOD(HttpRequest, getQueryData)
{
- zval *qdata;
- getObject(http_request_object, obj);
-
NO_ARGS;
- qdata = GET_PROP(obj, queryData);
- RETURN_STRINGL(Z_STRVAL_P(qdata), Z_STRLEN_P(qdata), 1);
+ IF_RETVAL_USED {
+ zval *qdata;
+ getObject(http_request_object, obj);
+
+ qdata = GET_PROP(obj, queryData);
+ RETURN_STRINGL(Z_STRVAL_P(qdata), Z_STRLEN_P(qdata), 1);
+ }
}
/* }}} */
}
/* }}} */
-/* {{{ proto bool HttpRequest::addPostData(array post_data)
+/* {{{ proto bool HttpRequest::addPostFields(array post_data)
*
* Adds POST data entries.
* Affects only POST requests.
*/
-PHP_METHOD(HttpRequest, addPostData)
+PHP_METHOD(HttpRequest, addPostFields)
{
zval *post, *post_data;
getObject(http_request_object, obj);
RETURN_FALSE;
}
- post = GET_PROP(obj, postData);
+ post = GET_PROP(obj, postFields);
array_merge(post_data, post);
RETURN_TRUE;
}
/* }}} */
-/* {{{ proto bool HttpRequest::setPostData(array post_data)
+/* {{{ proto bool HttpRequest::setPostFields(array post_data)
*
* Set the POST data entries.
* Overwrites previously set POST data.
* Affects only POST requests.
*/
-PHP_METHOD(HttpRequest, setPostData)
+PHP_METHOD(HttpRequest, setPostFields)
{
zval *post, *post_data;
getObject(http_request_object, obj);
RETURN_FALSE;
}
- post = GET_PROP(obj, postData);
+ post = GET_PROP(obj, postFields);
zend_hash_clean(Z_ARRVAL_P(post));
array_copy(post_data, post);
}
/* }}}*/
-/* {{{ proto array HttpRequest::getPostData()
+/* {{{ proto array HttpRequest::getPostFields()
*
* Get previously set POST data.
*/
-PHP_METHOD(HttpRequest, getPostData)
+PHP_METHOD(HttpRequest, getPostFields)
{
- zval *post_data;
- getObject(http_request_object, obj);
-
NO_ARGS;
- post_data = GET_PROP(obj, postData);
- array_init(return_value);
- array_copy(post_data, return_value);
+ IF_RETVAL_USED {
+ zval *post_data;
+ getObject(http_request_object, obj);
+
+ post_data = GET_PROP(obj, postFields);
+ array_init(return_value);
+ array_copy(post_data, return_value);
+ }
}
/* }}} */
-/* {{{ proto void HttpRequest::unsetPostData()
+/* {{{ proto void HttpRequest::unsetPostFields()
*
* Clean POST data entires.
* Affects only POST requests.
*/
-PHP_METHOD(HttpRequest, unsetPostData)
+PHP_METHOD(HttpRequest, unsetPostFields)
{
zval *post_data;
getObject(http_request_object, obj);
NO_ARGS;
- post_data = GET_PROP(obj, postData);
+ post_data = GET_PROP(obj, postFields);
zend_hash_clean(Z_ARRVAL_P(post_data));
}
/* }}} */
}
/* }}} */
+/* {{{ proto bool HttpRequest::setPostFiles()
+ *
+ * Set files to post.
+ * Overwrites previously set post files.
+ * Affects only POST requests.
+ */
+PHP_METHOD(HttpRequest, setPostFiles)
+{
+ zval *files, *pFiles;
+ getObject(http_request_object, obj);
+
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a", &files)) {
+ RETURN_FALSE;
+ }
+
+ pFiles = GET_PROP(obj, postFiles);
+ zend_hash_clean(Z_ARRVAL_P(pFiles));
+ array_copy(files, pFiles);
+
+ RETURN_TRUE;
+}
+/* }}} */
+
/* {{{ proto array HttpRequest::getPostFiles()
*
* Get all previously added POST files.
*/
PHP_METHOD(HttpRequest, getPostFiles)
{
- zval *files;
- getObject(http_request_object, obj);
-
NO_ARGS;
- files = GET_PROP(obj, postFiles);
+ IF_RETVAL_USED {
+ zval *files;
+ getObject(http_request_object, obj);
+
+ files = GET_PROP(obj, postFiles);
- array_init(return_value);
- array_copy(files, return_value);
+ array_init(return_value);
+ array_copy(files, return_value);
+ }
}
/* }}} */
}
/* }}} */
+/* {{{ proto bool HttpRequest::SetPutFile(string file)
+ *
+ * Set file to put.
+ * Affects only PUT requests.
+ */
+PHP_METHOD(HttpRequest, setPutFile)
+{
+ char *file;
+ int file_len;
+ getObject(http_request_object, obj);
+
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &file, &file_len)) {
+ RETURN_FALSE;
+ }
+
+ UPD_PROP(obj, string, putFile, file);
+ RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto string HttpRequest::getPutFile()
+ *
+ * Get previously set put file.
+ */
+PHP_METHOD(HttpRequest, getPutFile)
+{
+ NO_ARGS;
+
+ IF_RETVAL_USED {
+ zval *putfile;
+ getObject(http_request_object, obj);
+
+ putfile = GET_PROP(obj, putFile);
+ RETVAL_STRINGL(Z_STRVAL_P(putfile), Z_STRLEN_P(putfile), 1);
+ }
+}
+/* }}} */
+
+/* {{{ proto void HttpRequest::unsetPutFile()
+ *
+ * Unset file to put.
+ * Affects only PUT requests.
+ */
+PHP_METHOD(HttpRequest, unsetPutFile)
+{
+ getObject(http_request_object, obj);
+
+ NO_ARGS;
+
+ UPD_PROP(obj, string, putFile, "");
+}
+/* }}} */
+
/* {{{ proto array HttpRequest::getResponseData()
*
* Get all response data after the request has been sent.
*/
PHP_METHOD(HttpRequest, getResponseData)
{
- zval *data;
- getObject(http_request_object, obj);
-
NO_ARGS;
- data = GET_PROP(obj, responseData);
- array_init(return_value);
- array_copy(data, return_value);
+ IF_RETVAL_USED {
+ zval *data;
+ getObject(http_request_object, obj);
+
+ data = GET_PROP(obj, responseData);
+ array_init(return_value);
+ array_copy(data, return_value);
+ }
}
/* }}} */
*/
PHP_METHOD(HttpRequest, getResponseHeader)
{
- zval *data, **headers, **header;
- char *header_name = NULL;
- int header_len = 0;
- getObject(http_response_object, obj);
+ IF_RETVAL_USED {
+ zval *data, **headers, **header;
+ char *header_name = NULL;
+ int header_len = 0;
+ getObject(http_response_object, obj);
- if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &header_name, &header_len)) {
- RETURN_FALSE;
- }
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &header_name, &header_len)) {
+ RETURN_FALSE;
+ }
- data = GET_PROP(obj, responseData);
- if (SUCCESS != zend_hash_find(Z_ARRVAL_P(data), "headers", sizeof("headers"), (void **) &headers)) {
- RETURN_FALSE;
- }
+ data = GET_PROP(obj, responseData);
+ 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;
+ 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;
+ }
}
}
/* }}} */
*/
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);
+ IF_RETVAL_USED {
+ zval *data, **headers;
+ char *cookie_name = NULL;
+ int cookie_len = 0;
+ getObject(http_request_object, obj);
- 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;
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &cookie_name, &cookie_len)) {
+ RETURN_FALSE;
+ }
- 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;
+ array_init(return_value);
- FOREACH_HASH_VAL(Z_ARRVAL_PP(header), cookie) {
+ 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(cookie), Z_ARRVAL_P(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 {
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);
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;
}
- break;
+ /* reset key */
+ key = NULL;
}
- /* reset key */
- key = NULL;
}
}
}
*/
PHP_METHOD(HttpRequest, getResponseBody)
{
- zval *data, **body;
- getObject(http_request_object, obj);
-
NO_ARGS;
- data = GET_PROP(obj, responseData);
- 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 {
- RETURN_FALSE;
+ IF_RETVAL_USED {
+ zval *data, **body;
+ getObject(http_request_object, obj);
+
+ data = GET_PROP(obj, responseData);
+ 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 {
+ RETURN_FALSE;
+ }
}
}
/* }}} */
*/
PHP_METHOD(HttpRequest, getResponseCode)
{
- zval *code;
- getObject(http_request_object, obj);
-
NO_ARGS;
- code = GET_PROP(obj, responseCode);
- RETURN_LONG(Z_LVAL_P(code));
+ IF_RETVAL_USED {
+ zval *code;
+ getObject(http_request_object, obj);
+
+ code = GET_PROP(obj, responseCode);
+ RETURN_LONG(Z_LVAL_P(code));
+ }
}
/* }}} */
*/
PHP_METHOD(HttpRequest, getResponseInfo)
{
- zval *info, **infop;
- char *info_name = NULL;
- int info_len = 0;
- getObject(http_request_object, obj);
+ IF_RETVAL_USED {
+ zval *info, **infop;
+ char *info_name = NULL;
+ int info_len = 0;
+ getObject(http_request_object, obj);
- if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &info_name, &info_len)) {
- RETURN_FALSE;
- }
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &info_name, &info_len)) {
+ RETURN_FALSE;
+ }
- info = GET_PROP(obj, responseInfo);
+ info = GET_PROP(obj, responseInfo);
- 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);
+ 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 {
+ http_error_ex(E_NOTICE, HTTP_E_PARAM, "Could not find response info named %s", info_name);
+ RETURN_FALSE;
+ }
} else {
- http_error_ex(E_NOTICE, HTTP_E_PARAM, "Could not find response info named %s", info_name);
- RETURN_FALSE;
+ array_init(return_value);
+ array_copy(info, return_value);
}
- } else {
- array_init(return_value);
- array_copy(info, return_value);
}
}
/* }}}*/
*/
PHP_METHOD(HttpRequest, getResponseMessage)
{
- zval *message;
- getObject(http_request_object, obj);
-
NO_ARGS;
- message = GET_PROP(obj, responseMessage);
- Z_TYPE_P(return_value) = IS_OBJECT;
- return_value->is_ref = 1;
- return_value->value.obj = message->value.obj;
- zval_add_ref(&return_value);
+ IF_RETVAL_USED {
+ zval *message;
+ getObject(http_request_object, obj);
+
+ message = GET_PROP(obj, responseMessage);
+ if (Z_TYPE_P(message) == IS_OBJECT) {
+ RETVAL_OBJECT(message);
+ } else {
+ RETURN_NULL();
+ }
+ }
}
+/* }}} */
/* {{{ proto bool HttpRequest::send()
*
* <?php
* $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->addpostFields(array('user' => 'mike', 'pass' => 's3c|r3t'));
* $r->addPostFile('image', 'profile.jpg', 'image/jpeg');
* if ($r->send()) {
* echo $r->getResponseBody();
PHP_METHOD(HttpRequest, send)
{
STATUS status = FAILURE;
- zval *meth, *URL, *qdata, *opts, *info, *resp;
- char *request_uri;
+ http_request_body body = {0};
getObject(http_request_object, obj);
NO_ARGS;
SET_EH_THROW_HTTP();
- if ((!obj->ch) && (!(obj->ch = curl_easy_init()))) {
- http_error(E_WARNING, HTTP_E_CURL, "Could not initilaize curl");
+ if (obj->pool) {
+ http_error(E_WARNING, HTTP_E_CURL, "You cannot call HttpRequest::send() while attached to an HttpRequestPool");
RETURN_FALSE;
}
- meth = GET_PROP(obj, method);
- URL = GET_PROP(obj, url);
- qdata = GET_PROP(obj, queryData);
- opts = GET_PROP(obj, options);
- info = GET_PROP(obj, responseInfo);
- resp = GET_PROP(obj, responseData);
+ if (SUCCESS == (status = http_request_object_requesthandler(obj, getThis(), &body))) {
+ status = http_request_exec(obj->ch, NULL);
+ }
+ http_request_body_dtor(&body);
- // HTTP_URI_MAXLEN+1 long char *
- request_uri = http_absolute_uri_ex(Z_STRVAL_P(URL), Z_STRLEN_P(URL), NULL, 0, NULL, 0, 0);
+ /* final data handling */
+ if (SUCCESS == status) {
+ status = http_request_object_responsehandler(obj, getThis());
+ }
- if (Z_STRLEN_P(qdata) && (strlen(request_uri) < HTTP_URI_MAXLEN)) {
- if (!strchr(request_uri, '?')) {
- strcat(request_uri, "?");
- } else {
- strcat(request_uri, "&");
+ SET_EH_NORMAL();
+ RETURN_SUCCESS(status);
+}
+/* }}} */
+
+/* {{{ HttpRequestPool */
+
+/* {{{ proto void HttpRequestPool::__construct([HttpRequest request[, ...]])
+ *
+ * Instantiate a new HttpRequestPool object. An HttpRequestPool is
+ * able to send several HttpRequests in parallel.
+ *
+ * Example:
+ * <pre>
+ * <?php
+ * $urls = array('www.php.net', 'pecl.php.net', 'pear.php.net')
+ * $pool = new HttpRequestPool;
+ * foreach ($urls as $url) {
+ * $req[$url] = new HttpRequest("http://$url", HTTP_HEAD);
+ * $pool->attach($req[$url]);
+ * }
+ * $pool->send();
+ * foreach ($urls as $url) {
+ * printf("%s (%s) is %s\n",
+ * $url, $req[$url]->getResponseInfo('effective_url'),
+ * $r->getResponseCode() == 200 ? 'alive' : 'not alive'
+ * );
+ * }
+ * ?>
+ * </pre>
+ */
+PHP_METHOD(HttpRequestPool, __construct)
+{
+ int argc = ZEND_NUM_ARGS();
+ zval ***argv = safe_emalloc(argc, sizeof(zval *), 0);
+ getObject(http_requestpool_object, obj);
+
+ if (SUCCESS == zend_get_parameters_array_ex(argc, argv)) {
+ int i;
+
+ for (i = 0; i < argc; ++i) {
+ if (Z_TYPE_PP(argv[i]) == IS_OBJECT && instanceof_function(Z_OBJCE_PP(argv[i]), http_request_object_ce TSRMLS_CC)) {
+ http_request_pool_attach(&obj->pool, *(argv[i]));
+ }
}
- strncat(request_uri, Z_STRVAL_P(qdata), HTTP_URI_MAXLEN - strlen(request_uri));
}
+ efree(argv);
+}
+/* }}} */
- switch (Z_LVAL_P(meth))
- {
- case HTTP_GET:
- status = http_get_ex(obj->ch, request_uri, Z_ARRVAL_P(opts), Z_ARRVAL_P(info), &obj->response);
- break;
+/* {{{ proto void HttpRequestPool::__destruct()
+ *
+ * Clean up HttpRequestPool object.
+ */
+PHP_METHOD(HttpRequestPool, __destruct)
+{
+ getObject(http_requestpool_object, obj);
- case HTTP_HEAD:
- status = http_head_ex(obj->ch, request_uri, Z_ARRVAL_P(opts), Z_ARRVAL_P(info), &obj->response);
- break;
+ NO_ARGS;
- case HTTP_POST:
- {
- zval *post_files, *post_data;
-
- post_files = GET_PROP(obj, postFiles);
- post_data = GET_PROP(obj, postData);
-
- if (!zend_hash_num_elements(Z_ARRVAL_P(post_files))) {
-
- /* urlencoded post */
- status = http_post_array_ex(obj->ch, request_uri, Z_ARRVAL_P(post_data), Z_ARRVAL_P(opts), Z_ARRVAL_P(info), &obj->response);
-
- } else {
-
- /*
- * multipart post
- */
- char *key = NULL;
- long idx;
- zval **data;
- struct curl_httppost *http_post_data[2] = {NULL, NULL};
-
- /* normal data */
- FOREACH_KEYVAL(post_data, key, idx, data) {
- if (key) {
- convert_to_string_ex(data);
- curl_formadd(&http_post_data[0], &http_post_data[1],
- CURLFORM_COPYNAME, key,
- CURLFORM_COPYCONTENTS, Z_STRVAL_PP(data),
- CURLFORM_CONTENTSLENGTH, Z_STRLEN_PP(data),
- CURLFORM_END
- );
-
- /* reset */
- key = NULL;
- }
- }
+ http_request_pool_detach_all(&obj->pool);
+}
+/* }}} */
- /* file data */
- FOREACH_VAL(post_files, data) {
- zval **file, **type, **name;
+/* {{{ proto void HttpRequestPool::reset()
+ *
+ * Detach all attached HttpRequest objects.
+ */
+PHP_METHOD(HttpRequestPool, reset)
+{
+ getObject(http_requestpool_object, obj);
- if ( SUCCESS == zend_hash_find(Z_ARRVAL_PP(data), "name", sizeof("name"), (void **) &name) &&
- SUCCESS == zend_hash_find(Z_ARRVAL_PP(data), "type", sizeof("type"), (void **) &type) &&
- SUCCESS == zend_hash_find(Z_ARRVAL_PP(data), "file", sizeof("file"), (void **) &file)) {
+ NO_ARGS;
- curl_formadd(&http_post_data[0], &http_post_data[1],
- CURLFORM_COPYNAME, Z_STRVAL_PP(name),
- CURLFORM_FILE, Z_STRVAL_PP(file),
- CURLFORM_CONTENTTYPE, Z_STRVAL_PP(type),
- CURLFORM_END
- );
- }
- }
+ http_request_pool_detach_all(&obj->pool);
+}
- status = http_post_curldata_ex(obj->ch, request_uri, http_post_data[0], Z_ARRVAL_P(opts), Z_ARRVAL_P(info), &obj->response);
- curl_formfree(http_post_data[0]);
- }
- }
- break;
+/* {{{ proto bool HttpRequestPool::attach(HttpRequest request)
+ *
+ * Attach an HttpRequest object to this HttpRequestPool.
+ * NOTE: set all options prior attaching!
+ */
+PHP_METHOD(HttpRequestPool, attach)
+{
+ zval *request;
+ STATUS status = FAILURE;
+ getObject(http_requestpool_object, obj);
- default:
- break;
+ SET_EH_THROW_HTTP();
+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &request, http_request_object_ce)) {
+ status = http_request_pool_attach(&obj->pool, request);
}
+ SET_EH_NORMAL();
+ RETURN_SUCCESS(status);
+}
+/* }}} */
- efree(request_uri);
+/* {{{ proto bool HttpRequestPool::detach(HttpRequest request)
+ *
+ * Detach an HttpRequest object from this HttpRequestPool.
+ */
+PHP_METHOD(HttpRequestPool, detach)
+{
+ zval *request;
+ STATUS status = FAILURE;
+ getObject(http_requestpool_object, obj);
- /* final data handling */
- if (status == SUCCESS) {
- http_message *msg;
+ SET_EH_THROW_HTTP();
+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &request, http_request_object_ce)) {
+ status = http_request_pool_detach(&obj->pool, request);
+ }
+ SET_EH_NORMAL();
+ RETURN_SUCCESS(status);
+}
+/* }}} */
+
+/* {{{ proto bool HttpRequestPool::send()
+ *
+ * Send all attached HttpRequest objects in parallel.
+ */
+PHP_METHOD(HttpRequestPool, send)
+{
+ STATUS status;
+ getObject(http_requestpool_object, obj);
+
+ NO_ARGS;
+
+ SET_EH_THROW_HTTP();
+ status = http_request_pool_send(&obj->pool);
+ SET_EH_NORMAL();
+
+ RETURN_SUCCESS(status);
+}
+/* }}} */
- if (msg = http_message_parse(PHPSTR_VAL(&obj->response), PHPSTR_LEN(&obj->response))) {
- zval *headers, *message;
- char *body;
- size_t body_len;
+/* {{{ proto protected bool HttpRequestPool::socketSend()
+ *
+ * Usage:
+ * <pre>
+ * <?php
+ * while ($pool->socketSend()) {
+ * do_something_else();
+ * if (!$pool->socketSelect()) {
+ * die('Socket error');
+ * }
+ * }
+ * $pool->socketRead();
+ * ?>
+ * </pre>
+ */
+PHP_METHOD(HttpRequestPool, socketSend)
+{
+ getObject(http_requestpool_object, obj);
- UPD_PROP(obj, long, responseCode, msg->info.response.code);
+ NO_ARGS;
- MAKE_STD_ZVAL(headers)
- array_init(headers);
+ RETURN_BOOL(0 < http_request_pool_perform(&obj->pool));
+}
+/* }}} */
- zend_hash_copy(Z_ARRVAL_P(headers), &msg->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
- phpstr_data(PHPSTR(msg), &body, &body_len);
+/* {{{ proto protected bool HttpRequestPool::socketSelect()
+ *
+ * See HttpRequestPool::socketSend().
+ */
+PHP_METHOD(HttpRequestPool, socketSelect)
+{
+ getObject(http_requestpool_object, obj);
- add_assoc_zval(resp, "headers", headers);
- add_assoc_stringl(resp, "body", body, body_len, 0);
+ NO_ARGS;
- message = GET_PROP(obj, responseMessage);
- zval_dtor(message);
- Z_TYPE_P(message) = IS_OBJECT;
- message->value.obj = http_message_object_from_msg(msg);
- SET_PROP(obj, responseMessage, message);
- } else {
- status = FAILURE;
- }
- }
+ RETURN_SUCCESS(http_request_pool_select(&obj->pool));
+}
+/* }}} */
- SET_EH_NORMAL();
- RETURN_SUCCESS(status);
+/* {{{ proto protected void HttpRequestPool::socketRead()
+ *
+ * See HttpRequestPool::socketSend().
+ */
+PHP_METHOD(HttpRequestPool, socketRead)
+{
+ getObject(http_requestpool_object, obj);
+
+ NO_ARGS;
+
+ zend_llist_apply(&obj->pool.handles, (llist_apply_func_t) http_request_pool_responsehandler TSRMLS_CC);
}
/* }}} */
+
+/* }}} */
+
/* }}} */
#endif /* HTTP_HAVE_CURL */
projects / m6w6 / ext-http / blobdiff