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;
}
char *string = NULL;
int length = 0;
http_message *msg = NULL;
+ http_message_object obj;
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &string, &length)) {
RETURN_NULL();
}
/* }}} */
-/* {{{ proto void HttpMessage::__construct([string raw_message])
+/* {{{ proto void HttpMessage::__construct([string 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();
}
/* }}} */
-/* {{{ proto 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;
- }
-
- convert_to_string(message);
- SET_PROP(obj, raw, message);
-}
-/* }}} */
-
/* {{{ proto string HttpMessage::getBody()
*
* Get the body of the parsed Message.
NO_ARGS;
- body = GET_PROP(obj, body);
- RETURN_STRINGL(Z_STRVAL_P(body), Z_STRLEN_P(body), 1);
+ RETURN_PHPSTR(&obj->message->body, PHPSTR_FREE_NOT, 1);
}
/* }}} */
*/
PHP_METHOD(HttpMessage, getHeaders)
{
- zval *headers;
+ zval headers;
getObject(http_message_object, obj);
NO_ARGS;
- headers = GET_PROP(obj, headers);
+ Z_ARRVAL(headers) = &obj->message->hdrs;
array_init(return_value);
- array_copy(headers, return_value);
+ array_copy(&headers, return_value);
}
/* }}} */
*/
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);
}
/* }}} */
*/
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);
}
/* }}} */
*/
PHP_METHOD(HttpMessage, getType)
{
- zval *type;
getObject(http_message_object, obj);
NO_ARGS;
- type = GET_PROP(obj, type);
- RETURN_LONG(Z_LVAL_P(type));
+ RETURN_LONG(obj->message->type);
}
/* }}} */
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);
}
/* }}} */
*/
PHP_METHOD(HttpMessage, getResponseCode)
{
- zval *status;
getObject(http_message_object, obj);
NO_ARGS;
- if (obj->message->type != HTTP_MSG_RESPONSE) {
+ 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);
}
/* }}} */
RETURN_FALSE;
}
- UPD_PROP(obj, long, responseCode, code);
+ obj->message->info.response.code = code;
RETURN_TRUE;
}
/* }}} */
*/
PHP_METHOD(HttpMessage, getRequestMethod)
{
- zval *method;
getObject(http_message_object, obj);
NO_ARGS;
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);
}
/* }}} */
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);
+ if (obj->message->info.request.method) {
+ efree(obj->message->info.request.method);
+ }
+ obj->message->info.request.method = estrndup(method, method_len);
RETURN_TRUE;
}
/* }}} */
NO_ARGS;
if (obj->message->type != HTTP_MSG_REQUEST) {
+ 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);
}
/* }}} */
RETURN_FALSE;
}
- UPD_PROP(obj, string, requestUri, URI);
+ if (obj->message->info.request.URI) {
+ efree(obj->message->info.request.URI);
+ }
+ obj->message->info.request.URI = estrndup(URI, URIlen);
RETURN_TRUE;
}
/* }}} */
*/
PHP_METHOD(HttpMessage, getHttpVersion)
{
- zval *version;
char ver[4] = {0};
+ float version;
getObject(http_message_object, obj);
NO_ARGS;
- version = GET_PROP(obj, httpVersion);
+ switch (obj->message->type)
+ {
+ case HTTP_MSG_RESPONSE:
+ version = obj->message->info.response.http_version;
+ break;
- if (Z_TYPE_P(version) == IS_NULL) {
- RETURN_NULL();
- }
+ case HTTP_MSG_REQUEST:
+ version = obj->message->info.request.http_version;
+ break;
- sprintf(ver, "1.1f", Z_DVAL_P(version));
+ case HTTP_MSG_NONE:
+ default:
+ RETURN_NULL();
+ }
+ sprintf(ver, "%1.1f", version);
RETURN_STRINGL(ver, 3, 1);
}
/* }}} */
zval *zv, *version;
getObject(http_message_object, obj);
- if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &zv)) {
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z/", &zv)) {
return;
}
+ if (obj->message->type == HTTP_MSG_NONE) {
+ http_error(E_WARNING, HTTP_E_MSG, "Message is neither of type HTTP_MSG_RESPONSE nor HTTP_MSG_REQUEST");
+ RETURN_FALSE;
+ }
+
convert_to_double_ex(&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 version (1.0 or 1.1): %s", v);
+ http_error_ex(E_WARNING, HTTP_E_PARAM, "Invalid HTTP protocol version (1.0 or 1.1): %s", v);
RETURN_FALSE;
}
- SET_PROP(obj, httpVersion, zv);
+ if (obj->message->type == HTTP_MSG_RESPONSE) {
+ 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;
+}
+/* }}} */
+
+/* {{{ proto HttpMessage HttpMessage::getParentMessage()
+ *
+ * Get parent Message.
+ */
+PHP_METHOD(HttpMessage, getParentMessage)
+{
+ getObject(http_message_object, obj);
+
+ NO_ARGS;
+
+ if (obj->message->parent) {
+ RETVAL_OBJVAL(obj->parent);
+ } else {
+ RETVAL_NULL();
+ }
}
/* }}} */
-/* {{{ proto string HttpMessage::toString()
+/* {{{ proto bool HttpMessage::send()
+ *
+ * Send the Message according to its type as Response or Request.
+ */
+PHP_METHOD(HttpMessage, send)
+{
+ getObject(http_message_object, obj);
+
+ NO_ARGS;
+
+ RETURN_SUCCESS(http_message_send(obj->message));
+}
+/* }}} */
+
+/* {{{ proto string HttpMessage::toString([bool include_parent = true])
*
* Get the string representation of the Message.
*/
{
char *string;
size_t length;
+ zend_bool include_parent = 1;
getObject(http_message_object, obj);
- NO_ARGS;
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &include_parent)) {
+ RETURN_FALSE;
+ }
- http_message_tostring(obj->message, &string, &length);
+ if (include_parent) {
+ http_message_serialize(obj->message, &string, &length);
+ } else {
+ http_message_tostring(obj->message, &string, &length);
+ }
RETURN_STRINGL(string, length, 0);
}
/* }}} */
projects / m6w6 / ext-http / blobdiff